Be compatible with newer glib and in general more future proof, bug 212801

Package-Manager: portage-2.1.4.4

5 files changed, 34 insertions, 56 deletions

diff --git a/gnome-base/eel/ChangeLog b/gnome-base/eel/ChangeLog
index 2055d92dfbab..8f147e8203dd 100644
--- a/gnome-base/eel/ChangeLog
+++ b/gnome-base/eel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/eel
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/ChangeLog,v 1.192 2007/11/29 05:24:15 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/ChangeLog,v 1.193 2008/03/11 20:12:56 leio Exp $
+
+  11 Mar 2008; Mart Raudsepp <leio@gentoo.org> eel-2.18.0.1.ebuild,
+  -eel-2.18.3.ebuild, eel-2.20.0.ebuild:
+  Be compatible with newer glib and in general more future proof, bug 212801
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> eel-2.20.0.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/eel/Manifest b/gnome-base/eel/Manifest
index b9c1e7e85de9..71369f9392f4 100644
--- a/gnome-base/eel/Manifest
+++ b/gnome-base/eel/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST eel-2.18.0.1.tar.bz2 673044 RMD160 9f2342dceb083bdee9e0d911a7426ed7c54598b8 SHA1 61d3119890071f0e23b791ce279aac5eed4a40b5 SHA256 0025fb426b265f052432ddffd4c84f880973e7c04e500478afbc4fe87d32dd79
-DIST eel-2.18.3.tar.bz2 643862 RMD160 d74e6963266f12e053cebf475aabd3cd5b6f90c3 SHA1 03b841d6a542a527ecb689a0d550b57e84b33510 SHA256 ff84e4947638fa24e02aebb2d12d1f29c045e3a5384fbc346919a1558a016b6f
 DIST eel-2.20.0.tar.bz2 647919 RMD160 1b608e17b60f7949eb8b6ad8f77b9c7f73d93f5e SHA1 642348e57d02aba46a8f84240745b91577f3e4aa SHA256 ba35db646ce069ee66a92fa95d10aff583e00e6039b1b5bb0fa6036742fddd70
-EBUILD eel-2.18.0.1.ebuild 1124 RMD160 1a03fa4f66959e5c376ca7cfac7c61bbdff90da8 SHA1 64f4164ea20af66db5e77791e5ccfa9280a05f29 SHA256 984f6a618b82844a0edc1b634acf4738a27f20781df4ea9ac4870276113e550b
-EBUILD eel-2.18.3.ebuild 1127 RMD160 4f8e921bbeedced6370b646b09140bfb2cf3c227 SHA1 dd86227dd3f57bb2f622c599d7d8e3faf44ede11 SHA256 7c5beed3c409516646e087980e1e18f9cd6d404f4f096ff16a784d2dfc292137
-EBUILD eel-2.20.0.ebuild 1123 RMD160 56792c45d004635d72438ff3b8a456b93baadddf SHA1 de616bc63e6b2840b8118c0beea98e5a46cecf99 SHA256 a5963c347458b0400a78a5e873afa4f7c1216c4b2031e8fb415471338590bfe9
-MISC ChangeLog 20496 RMD160 daeffd00477ad12d5dd72461f4366b26c55de27a SHA1 263a3e45e0ac1953e26d085e7d6757af6881c33f SHA256 fe4664f8c11a0f24fb06cc96dc79f54e920d2fe8f4c900e18defa0e505c0f2ac
+EBUILD eel-2.18.0.1.ebuild 1390 RMD160 50799fb143c45cf9e35a3f434d2af0ad22c6c9a9 SHA1 3bb1c33dd58729a80c46568f27f6ab3e6e6e72e2 SHA256 035f3b2cb49d29327338f55a2b8524f29a05f2525a61d7db1f36e2442a9aa652
+EBUILD eel-2.20.0.ebuild 1388 RMD160 d1adbfc297b546bc56503721f77954a370668bfa SHA1 ae567842f50f8f68312dadc19551a97bb5bfb5a9 SHA256 49ae3610be7a021fe4d223133e407959de1762d9db8851499e4025f3b4b3a499
+MISC ChangeLog 20684 RMD160 6799913a98ac8ac8779edc725e76d25cc864c189 SHA1 bea21975a8f73a90f68cbffa72823609394010d8 SHA256 d14a61df6679d999b41ea20981b9a327488b43d1e2a5ab8949294879e3d52a05
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfUWW4ACgkQkeYb6olFHJePuwCfRKPakeSXSBJLW/U6lz+eCZp9
-lJcAoNZmJsW403roZDUPSAqHK4qnVC2b
-=sTKU
+iEYEARECAAYFAkfW55UACgkQkeYb6olFHJeS8ACfTOineuCjj/1HfdLmTg43IOq2
+gO4AnRk6DIq8pRSh2Zi6BdQ3eldCXg3U
+=QFXA
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/eel/eel-2.18.0.1.ebuild b/gnome-base/eel/eel-2.18.0.1.ebuild
index 47fe3dcd560f..c4d6f3bf5b47 100644
--- a/gnome-base/eel/eel-2.18.0.1.ebuild
+++ b/gnome-base/eel/eel-2.18.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.18.0.1.ebuild,v 1.9 2007/08/28 16:38:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.18.0.1.ebuild,v 1.10 2008/03/11 20:12:56 leio Exp $
 
 inherit virtualx gnome2
 
@@ -32,6 +32,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 212801
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/eel/Makefile.am" "${S}/eel/Makefile.in" \
+		"${S}/test/Makefile.am" "${S}/test/Makefile.in"
+}
+
 src_test() {
 	if hasq userpriv $FEATURES; then
 		einfo "Not running tests without userpriv"
diff --git a/gnome-base/eel/eel-2.18.3.ebuild b/gnome-base/eel/eel-2.18.3.ebuild
deleted file mode 100644
index 056067c32111..000000000000
--- a/gnome-base/eel/eel-2.18.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.18.3.ebuild,v 1.8 2007/11/06 17:01:30 armin76 Exp $
-
-inherit virtualx gnome2
-
-DESCRIPTION="The Eazel Extentions Library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libart_lgpl-2.3.8
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2.9.4
-	>=dev-libs/glib-2.6
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.8
-	>=gnome-base/gnome-vfs-2.10
-	>=dev-libs/libxml2-2.4.7
-	>=gnome-base/gail-0.16
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-desktop-2.1.4
-	>=gnome-base/gnome-menus-2.14.0
-	>=dev-util/desktop-file-utils-0.9"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-
-src_test() {
-	if hasq userpriv $FEATURES; then
-		einfo "Not running tests without userpriv"
-	else
-		addwrite "/root/.gnome2"
-		Xmake check || die "make check failed"
-	fi
-}
diff --git a/gnome-base/eel/eel-2.20.0.ebuild b/gnome-base/eel/eel-2.20.0.ebuild
index 79c545e5ee71..bb3d0ab2c04b 100644
--- a/gnome-base/eel/eel-2.20.0.ebuild
+++ b/gnome-base/eel/eel-2.20.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.20.0.ebuild,v 1.7 2007/11/29 05:24:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/eel/eel-2.20.0.ebuild,v 1.8 2008/03/11 20:12:56 leio Exp $
 
 inherit virtualx gnome2
 
@@ -32,6 +32,15 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 212801
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/eel/Makefile.am" "${S}/eel/Makefile.in" \
+		"${S}/test/Makefile.am" "${S}/test/Makefile.in"
+}
+
 src_test() {
 	if hasq userpriv $FEATURES; then
 		einfo "Not running tests without userpriv"