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

(Portage version: 2.1.4.4)

4 files changed, 28 insertions, 48 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/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"