Fix gnome compilation #118591. Mark 0.94-r4 stable on ia64

Package-Manager: portage-2.1_pre4-r1

4 files changed, 73 insertions, 7 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 71163f4fce40..a022199bc818 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/dia
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.74 2005/11/02 14:07:25 obz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.75 2006/02/17 00:14:27 agriffis Exp $
+
+  17 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/dia-0.94-pkgconfig.patch, dia-0.94-r4.ebuild:
+  Fix gnome compilation #118591.  Mark 0.94-r4 stable on ia64
 
 *dia-0.94-r4 (02 Nov 2005)
 
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 4dfd6e73bd45..23c6cb399c9f 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -1,18 +1,67 @@
-MD5 5c1fc913a41a807ab3e428cec7b0b990 ChangeLog 9070
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 61d64bec4267222bed44e154126076ff ChangeLog 9243
+RMD160 bcdaa77ace85874d5354ef81eabbe6f13f8189ba ChangeLog 9243
+SHA256 fb18df5e2f11455884a44f6985e5fd7ebefb13d5cb1094068e9699561e729a21 ChangeLog 9243
 MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
+RMD160 b2e7736a28b1ab842711fa6b36749b81c3a090a6 dia-0.94-r1.ebuild 1479
+SHA256 2456ab6ff7f88311d848c8464fcd2ca230caaf8039a48095409ca726229cab82 dia-0.94-r1.ebuild 1479
 MD5 e64a64c8b1e5e3be5cf29d34c7374513 dia-0.94-r2.ebuild 1655
+RMD160 abca872d7da2f200ed1e230fd38ec166101b4c93 dia-0.94-r2.ebuild 1655
+SHA256 291221ea1348a6f7e45dccb59f94d8102b9e9d128d179c5ca18bf59c2cbddd19 dia-0.94-r2.ebuild 1655
 MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
-MD5 0246566e2cfd2158ad43ea52cb27c8c8 dia-0.94-r4.ebuild 2019
+RMD160 62f6829b628ae6e7f0797c66bb14a272149f17d9 dia-0.94-r3.ebuild 1738
+SHA256 c394502a732d376cf90eebca881264f9887f1567ea9d0a66d1595cf19602e56a dia-0.94-r3.ebuild 1738
+MD5 2bea828fe222c9372b7f7b545ef6c327 dia-0.94-r4.ebuild 2136
+RMD160 e6df4954b649d3d77e124d9136ad6122d51254d8 dia-0.94-r4.ebuild 2136
+SHA256 345353d519450b3f4b65c1abff611ae69a4460a852f7773f8b546a6958c51a11 dia-0.94-r4.ebuild 2136
 MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
+RMD160 01592615b8983621a9b22e934e10fe70aa9d25b2 files/0.94-disable_python_gtk_import.patch 313
+SHA256 8bbd4151586e302fdb35635469a640b82c4f4fa9b1a3595599d8bffc5f4d6989 files/0.94-disable_python_gtk_import.patch 313
 MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
+RMD160 dd68e88b0a2130b3cb186eea5b90aaead397d73d files/dia-0.94-db2man.patch 901
+SHA256 35ec88f147ac00052f04b3707004198466a453115ee2735a75a00705ca8ca6f9 files/dia-0.94-db2man.patch 901
 MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
+RMD160 2a876c7362845bdeeeb0468b2984b456bed75d5a files/dia-0.94-gcc4.patch 934
+SHA256 a3d24a60044fb0a5570634b39ccaaa16e299aa915178b2ea2764af558cf5c64a files/dia-0.94-gcc4.patch 934
 MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
+RMD160 2f98abc9472219278802786861a217bbf404c866 files/dia-0.94-help.patch 2766
+SHA256 e72c7f673572e83677dc8168890f9240f617c1df1089036702088deeefb952ed files/dia-0.94-help.patch 2766
 MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+RMD160 e8e9dc24fe95f6563d1180fd2ba4df7e332a000d files/dia-0.94-no_font_cache.patch 473
+SHA256 d4d523c894ca13326e34d2aa9f60df8718d50781988722ba1a53e4fb999e1634 files/dia-0.94-no_font_cache.patch 473
+MD5 b7b66d45324f178764257ee9d06e9b1a files/dia-0.94-pkgconfig.patch 296
+RMD160 83f99edc0c3ef8f84b2ee34bb569a2bf5e6488ad files/dia-0.94-pkgconfig.patch 296
+SHA256 e5bcf7c038e5a8e657d3aabc4acec50c6f80b036fe567d1084aa5580c789fff0 files/dia-0.94-pkgconfig.patch 296
 MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093
+RMD160 c6ef542b8b3bcd914b85b424bd55332b25c7aa5f files/dia-0.94-png.patch 3093
+SHA256 06794ba39eb526e6de4b0f706d00f1ef0377dd3890eded73606dee81ba3bb86c files/dia-0.94-png.patch 3093
 MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940
+RMD160 7344d197e440361963c41a5707de66077550cdc0 files/dia-0.94-secure-eval.patch 1940
+SHA256 8660ea736d240442dcbb1f9f8d5c4cd3e8576e730f3ed785634c9e2de084ee89 files/dia-0.94-secure-eval.patch 1940
 MD5 8905a098072f0dbd22a14ea86e790b85 files/dia-0.94-sheets-png.tar.bz2 5449
+RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc files/dia-0.94-sheets-png.tar.bz2 5449
+SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 files/dia-0.94-sheets-png.tar.bz2 5449
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
+RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r1 62
+SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r1 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62
+RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r2 62
+SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r2 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62
+RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r3 62
+SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r3 62
 MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r4 62
+RMD160 087b9766ff892f7361e9f2d925ce20c428494eae files/digest-dia-0.94-r4 62
+SHA256 c8ed6af0b82352f243b026bb2779e478eaab291b11c13857f6d12c05cd60d1df files/digest-dia-0.94-r4 62
 MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
+RMD160 d21582565c56a2ea47ab65b539e7af731b6488e4 metadata.xml 596
+SHA256 55d298ff46a3f47af7ab5f6b17e40820ef0cc092af0e57bbece469fa0bd077f3 metadata.xml 596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD9RVsJrHF4yAQTrARApW1AKDPq55FkItNQTyaazzbZFnHo5/4CACghsrj
+xMuXhKPKvophwM8I92Ruzus=
+=b7CR
+-----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild
index 5731ce2e6816..c5cd09b93283 100644
--- a/app-office/dia/dia-0.94-r4.ebuild
+++ b/app-office/dia/dia-0.94-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.1 2005/11/02 14:07:25 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.2 2006/02/17 00:14:27 agriffis Exp $
 
 inherit eutils gnome2 libtool
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/dia/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnome png python static zlib"
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -40,6 +40,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Patch to fix configure.in issues with gnome support, bug 118591
+	epatch ${FILESDIR}/dia-0.94-pkgconfig.patch
+
 	# Disable python -c 'import gtk' during compile to prevent using
 	# X being involved (#31589)
 	epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch
diff --git a/app-office/dia/files/dia-0.94-pkgconfig.patch b/app-office/dia/files/dia-0.94-pkgconfig.patch
new file mode 100644
index 000000000000..9859f6d89e64
--- /dev/null
+++ b/app-office/dia/files/dia-0.94-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- configure.in	2006/01/15 00:17:25	1.1
++++ configure.in	2006/01/15 00:17:38
+@@ -53,7 +53,6 @@ AC_SUBST(APP_LIBS)
+ dnl Checks for libraries
+ 
+ AM_PATH_GLIB_2_0(2.0.0)
+-AM_PATH_GTK_2_0(2.0.0)
+ 
+ GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0"
+ PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.1.5, ,