Pin glib/gtk+ dependencies to slot 2.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

4 files changed, 13 insertions, 48 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 9fb9953fd57f..24266d3749ba 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.205 2010/10/17 19:29:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.206 2010/10/21 20:08:52 eva Exp $
+
+  21 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gcalctool-5.26.3.ebuild, gcalctool-5.32.0.ebuild:
+  Pin glib/gtk+ dependencies to slot 2.
 
 *gcalctool-5.32.0 (17 Oct 2010)
 
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index cc4c37e22987..573961bb7004 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gcalctool-5.26.3.tar.bz2 2042869 RMD160 02852922cf88825c8473851bf32fbd33a59a03ff SHA1 311b7dda8569e6737af20c3ba61af73582e7ee3a SHA256 cd0e3190d322fbbdd494efbdec5ca82e52f92264ed393d842fbfcddba16530da
 DIST gcalctool-5.28.2.tar.bz2 2273145 RMD160 3f2db9213e483439afae2b555cd41b592ad7e06d SHA1 59f12100e3375aeb55e83a33c3dfdf2aaf948033 SHA256 1acd72b8b16e6f23636a3a685fe0732499470e0cb1905517ca7146b4fd059287
 DIST gcalctool-5.30.2.tar.bz2 1126899 RMD160 af3e031d370f2fc9a88cb821ebe59e9a5913ee2d SHA1 3d0d2f90695dc20fbd3eadddb49f9666fb9eebed SHA256 214580306a0029d8247b79e3e710a40328b9e022f8fcee1cd448c5d2467d8c4b
 DIST gcalctool-5.32.0.tar.bz2 1264606 RMD160 afe4e9b7f9c4a08f62911069c0b04c0e15a8bbfc SHA1 2beb95d6e134ef35f4fd5cfff540e5b4ee0a06ac SHA256 74c3c89c798a6bd686b38d3d06e81198c537d04c0a1771130f8d399d5234b463
-EBUILD gcalctool-5.26.3.ebuild 972 RMD160 2654041c82c73bc5d394833e0ea6c259ee688983 SHA1 91da840f0f102b16c1cb092b54985613c6d5ef55 SHA256 70b9c2bf26409204202e3b58e27d8cd8251f9b2a562f8bb2c1d3335414ba8e58
 EBUILD gcalctool-5.28.2.ebuild 960 RMD160 d87bdfba924972038c3ac89729f03407892c6793 SHA1 6269e38c90988c27e0a9701e1ba6ba202e100b9f SHA256 8079c28161db10262c460f0ea8e549df80770025bc6da3d1005f9041de37e681
 EBUILD gcalctool-5.30.2.ebuild 952 RMD160 3e9a215faf46ad3f2e8ad0a48723dd7be34e5e5a SHA1 757cbbd409a82eff47171e664c132b3f16904084 SHA256 ce55b088fb562529e5162904fb86135fe25b9af40a2be77418253813fcb218c6
-EBUILD gcalctool-5.32.0.ebuild 857 RMD160 239d6ea51ea02074fe2bbf4a1b32ee623a966136 SHA1 14ea09ecc61271525b71a644ef4426f389dcca2f SHA256 a2d132fca67ea29b7682bbf4aff263dc3847b25d6936297cb3d99c6b4301167e
-MISC ChangeLog 25673 RMD160 27ce2dabcf32c14ae4faf3533ca202c8db08291e SHA1 8b55d401670bb0d568305f22fc512ad6750b4947 SHA256 dc3b9c9dc144f759ff2fdb0ed1ecf4ad9a2f21a1faf91bae1b397e7bd57fd5de
+EBUILD gcalctool-5.32.0.ebuild 857 RMD160 7e27b6f78d1299eb8f58ac0188fed5a5b12e3668 SHA1 55b351a096f5b01fc7e2307b102a9cb0838d9dc4 SHA256 7d183630f6e3e6626d8977b2fa1dd324f29e35f6c20f3e25f43d7f9bcee53432
+MISC ChangeLog 25819 RMD160 cc5094a6d66a95f0e8e41bae67a10db714ffd744 SHA1 5c40af044adcf3ccc6077c95c7f35e8fc7b199e2 SHA256 3b6184b1355ef184639333ec87d102641e806558b2482355477a718bcec48a98
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky7TrQACgkQCaWpQKGI+9QTrgCfUWrvWQxAcT+Lf/CJgEJIjTfA
-6CkAn2FIP/HwKu8G42IHvWBFti9NL0k5
-=IDEX
+iEYEARECAAYFAkzAneQACgkQ1fmVwcYIWAazvgCgj2XgbVWBFvxFghQFVELFoVjo
+sDQAn1rTHyfCIKVltBsfyCCXq+onPzkx
+=PfY7
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gcalctool/gcalctool-5.26.3.ebuild b/gnome-extra/gcalctool/gcalctool-5.26.3.ebuild
deleted file mode 100644
index ede427ca4204..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.26.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.26.3.ebuild,v 1.10 2010/07/20 02:15:40 jer Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2
-	>=dev-libs/atk-1.5
-	>=gnome-base/gconf-2
-	gnome-base/libglade
-	!<gnome-extra/gnome-utils-2.3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
-
-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"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild b/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild
index 7b60d0c1b670..179f4b988090 100644
--- a/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild,v 1.1 2010/10/17 19:29:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.0.ebuild,v 1.2 2010/10/21 20:08:52 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.18.0
-	>=dev-libs/glib-2.25.10
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.25.10:2
 	dev-libs/libxml2
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${RDEPEND}