Pin glib/gtk+ to slot 2. Drop old revision.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 13 insertions, 57 deletions

diff --git a/dev-libs/gdl/ChangeLog b/dev-libs/gdl/ChangeLog
index 732465349422..21b2d84d1a5d 100644
--- a/dev-libs/gdl/ChangeLog
+++ b/dev-libs/gdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gdl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.52 2011/01/19 21:20:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/ChangeLog,v 1.53 2011/01/24 16:14:11 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> -gdl-2.28.2.ebuild,
+  gdl-2.30.1.ebuild:
+  Pin glib/gtk+ to slot 2. Drop old revision.
 
   19 Jan 2011; Markos Chandras <hwoarang@gentoo.org> gdl-2.30.1.ebuild:
   Stable on amd64 wrt bug #348987
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index 9ce6b65f048e..16986a565dfb 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gdl-2.28.2.tar.bz2 543823 RMD160 2c9fc3c895bddca8a900df853c2353a132a97e3a SHA1 eaedddc950c262c54713b6e65a3a2dbbe6adc1d4 SHA256 c389c4fa623ce00b5a6da1103f4f4a913e4641e9787d13ba37854f17b9efdcf7
 DIST gdl-2.30.0.tar.bz2 535941 RMD160 787c6c827589b9cc118b5be91fc404370e8b64ef SHA1 3047e8646552947174b8aa02470dc5b43c208e83 SHA256 c3ca19831384ae8570f1e6fc0e6be9b2a5ba0f14592b9f2bbb629be113791453
 DIST gdl-2.30.1.tar.bz2 569211 RMD160 56cdb623c627504bceaffba91d338cae5bbe2955 SHA1 c3b3e288fb84ddd9b81d8cae41699ec0828f689f SHA256 027dd1cd0191996fe1a0dc902da857698cc79564cb057ba13b09097e56e30cc1
-EBUILD gdl-2.28.2.ebuild 1128 RMD160 bb07996751dabde73654fe5f0cc7ae9f79f67552 SHA1 d5710917b55e2c4ca36402a339f3aeccb131cbec SHA256 6b7a57b377dd5570749b935f76a7ca6222e74e410f279bf3bb4d9ac9bc3d1fa6
 EBUILD gdl-2.30.0.ebuild 756 RMD160 b322440726def9225c6e7f95f3c0ae5add27164d SHA1 b7946c9affd8e446ad227aa39da0f896c2a876f7 SHA256 684b67e622ac2eea070e4b2756604f99a1b196e9de246ddd97a940eb7ce2949e
-EBUILD gdl-2.30.1.ebuild 762 RMD160 ab39b01c2bb307d2b0508ec715d927042793d89a SHA1 68b22222f6c784adc4d5578a38f666b62128f479 SHA256 8b05a54f28d2932150d6842714797ef21534600be993e81fd208fda62f99a39a
-MISC ChangeLog 6748 RMD160 a89a049d423f82356322312682dfe6d9fede5af5 SHA1 f8f5381c771462710d975168ae9197e8f5c97f46 SHA256 3e729b94dced69f1b2a2f9795e55432b75f3376f326e4739ba43c7bc2d1e0ba5
+EBUILD gdl-2.30.1.ebuild 761 RMD160 81e75316981cf5510a1a01e4805d7f4b67740668 SHA1 775314f5dcb45f654751d365207473aa64c35f5f SHA256 9b448442a0096d1c1f82fed74a393a46f2bbb4612bc4c2f34592c83dff19c065
+MISC ChangeLog 6885 RMD160 b2c01a88e0f7b0a78b475413604c69f316dc1c64 SHA1 bb35a41a6ef91078e4e8af520017877fcc01da24 SHA256 39f894f8caa6fa0bb33f5a5a924a2ce21d3e76cf189a6572b4cfa3f883564c44
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk03VVoACgkQ9/cejkQaxBAXdACeNbI2hJfzO7T+NcoVQYQG8tkH
-qgsAn27/pckU3h7l7kbd7dVwkeV6BG9n
-=7BuN
+iEYEARECAAYFAk09pWUACgkQ1fmVwcYIWAakFACgwuIbs2E4fZ94LDCf6g+iAd4j
+ZJAAoMNWfIVYDWBBEDsYtDBaPY5PFvFk
+=24jl
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gdl/gdl-2.28.2.ebuild b/dev-libs/gdl/gdl-2.28.2.ebuild
deleted file mode 100644
index 630861d5e6b2..000000000000
--- a/dev-libs/gdl/gdl-2.28.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-2.28.2.ebuild,v 1.6 2010/07/09 10:38:39 ssuominen Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="The Gnome Devtool Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.12
-	>=dev-libs/libxml2-2.4"
-DEPEND="${RDEPEND}
-	!<dev-python/gdl-python-2.19.1-r1
-	!<=dev-python/gnome-python-extras-2.19.1-r2
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgdl-1.so.0
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgdl-1.so.0
-}
diff --git a/dev-libs/gdl/gdl-2.30.1.ebuild b/dev-libs/gdl/gdl-2.30.1.ebuild
index 2b918b84aeec..15b855d72e74 100644
--- a/dev-libs/gdl/gdl-2.30.1.ebuild
+++ b/dev-libs/gdl/gdl-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-2.30.1.ebuild,v 1.3 2011/01/19 21:20:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdl/gdl-2.30.1.ebuild,v 1.4 2011/01/24 16:14:11 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.12
+RDEPEND=">=dev-libs/glib-2:2
+	>=x11-libs/gtk+-2.12:2
 	>=dev-libs/libxml2-2.4"
 DEPEND="${RDEPEND}
 	!<dev-python/gdl-python-2.19.1-r1