Fix glib dependency, drop old (#412583 by Tomas Psika).

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 12 insertions, 100 deletions

diff --git a/dev-libs/atk/ChangeLog b/dev-libs/atk/ChangeLog
index 328f834358f4..e5499cd39e56 100644
--- a/dev-libs/atk/ChangeLog
+++ b/dev-libs/atk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/atk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.238 2012/04/01 18:12:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.239 2012/04/19 08:58:13 pacho Exp $
+
+  19 Apr 2012; Pacho Ramos <pacho@gentoo.org> -atk-1.32.0.ebuild,
+  -atk-2.0.1.ebuild, atk-2.4.0.ebuild:
+  Fix glib dependency, drop old (#412583 by Tomas Psika).
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> atk-2.2.0.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #407643
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 8d513b03fd4f..9ceb682c8e99 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,20 +2,17 @@
 Hash: SHA1
 
 DIST atk-1.32.0.tar.bz2 688186 RMD160 22d267795a7c576b90353780a9520e89fc43ea37 SHA1 876e88e4259d07bb7905d66c085a50a47e37f9e4 SHA256 e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e
-DIST atk-2.0.1.tar.bz2 734314 RMD160 8161a41614bcd13d82b90ae654b24437a165d2c9 SHA1 f830ff27590e4dd486ebe6538e2b03484faee10a SHA256 3d81c7d70fc66e5b129567a7706b6f8ff5db18281a818b29d4dd5bcefa3d4a17
 DIST atk-2.2.0.tar.xz 600140 RMD160 7bec73703ed64a8dbfb21b5fa0181b757a2d69ee SHA1 b9808b77c7905eb46fc2b64587ef93beab37470a SHA256 8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d
 DIST atk-2.4.0.tar.xz 607156 RMD160 96cb3bb971b517d96286eee9ea3ffdc07a976e58 SHA1 ca13d01660bdcd5262ef6cedb8a64542ff8aa804 SHA256 091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d
 EBUILD atk-1.32.0-r1.ebuild 1337 RMD160 97eb3e186b95cc405c66108e56abec5ec4dd377f SHA1 65ce72025bdd2f0a7dc301b3f0fe203d697b53ba SHA256 3dd0e414b0cfff0be8c3c6fafb694614f9829312d641b3d03d3e6049c8726a3e
-EBUILD atk-1.32.0.ebuild 1332 RMD160 fe3068739d413e9bb5b9d12879fa40671f942978 SHA1 08429d05949c3e07b563d07d5b37c36c5ba59279 SHA256 04e3e97da899b5f044377884cde10b97964db7ba706b2423ed0bdf10624344c6
-EBUILD atk-2.0.1.ebuild 1389 RMD160 a73ec2cc3ee49846587efc794438dee0fed28690 SHA1 b65426710b60f00f79c458fd9f4c2953adeb8491 SHA256 8df53c59f105aeeb1695e66c82a11658dc02522984babb05bc7e45f5c03d921d
 EBUILD atk-2.2.0.ebuild 1357 RMD160 75d38099a0fe835176ded81ca13c6b502d756910 SHA1 0ec291481eb0636818ecb7ca54539bf4f5314bf3 SHA256 b485286f1b7816aa422c6ba39d320992116a177c0fc6b46a525e8cc4a4056823
-EBUILD atk-2.4.0.ebuild 1369 RMD160 1ac7c2a69f222b199bd206debe259a21809d7ab7 SHA1 cb08a03726a9d0e98992f3ddfea023e21e1d53f6 SHA256 639feed2031e600daa8c23fd8ddaa8fc7b383401447a86f683600bb8ef0488f6
-MISC ChangeLog 25650 RMD160 44a1b4b5a047dca994b3ed4ef5a8351509b9bed4 SHA1 80def1f1f3ab04732e4b3905729953e8769e6ef0 SHA256 30f0f457f24996f9a20e905d1164349e3eaba7b63c62fbdb8097df8965c46831
+EBUILD atk-2.4.0.ebuild 1374 RMD160 00c84f76368d9700c79486ae98993e723b1d096d SHA1 2686ac379e949e6fea6aac6c34ebe3754bfe5fb0 SHA256 a2da04fb7213a1156ad84ea79789a872b4b58cbe0d024f41d84d6950c1fab190
+MISC ChangeLog 25812 RMD160 77a222d78326b394b4c2ad4e63458a5b1d9a5f3a SHA1 a232a0ceb278a9d8df090d6bdc9e44b750e22663 SHA256 853bc1b6bb177ce7d32e93af19032263100edca2063e0f5d4137085be3980d91
 MISC metadata.xml 296 RMD160 099d462bba0d9cedbddb04483050a8e05d0f2fe0 SHA1 e3ff5bdadddb872b0a46290225a805c12a05fff0 SHA256 2e63eb63088116c86450ff230207f5f7a5c5536aabe14d6a0d30376655a23c28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk94mpgACgkQuQc30/atMkAD6gCfZfSyYsTcwj7viLTCSIs/Xyno
-4qUAnRRfzj6xl3Y8rRu46NnpgOPKy817
-=tMUv
+iEYEARECAAYFAk+P06sACgkQCaWpQKGI+9ToBgCdHKrrBUy65Z1MbHwQokpaB+4d
+9t8AnA3FXa+varD1BazWhUPu+jjwFHYZ
+=dZv0
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/atk/atk-1.32.0.ebuild b/dev-libs/atk/atk-1.32.0.ebuild
deleted file mode 100644
index f9603c3be8c9..000000000000
--- a/dev-libs/atk/atk-1.32.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-1.32.0.ebuild,v 1.9 2011/03/22 20:04:25 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="http://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
-
-RDEPEND="dev-libs/glib:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
-}
diff --git a/dev-libs/atk/atk-2.0.1.ebuild b/dev-libs/atk/atk-2.0.1.ebuild
deleted file mode 100644
index 250f8d3d9f5a..000000000000
--- a/dev-libs/atk/atk-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.0.1.ebuild,v 1.2 2011/08/19 14:02:27 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="http://projects.gnome.org/accessibility/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc +introspection nls"
-
-RDEPEND="dev-libs/glib:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	if ! use test; then
-		# don't waste time building tests (bug #226353)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Remove DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
-		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
-}
diff --git a/dev-libs/atk/atk-2.4.0.ebuild b/dev-libs/atk/atk-2.4.0.ebuild
index 77b21fe9d3ce..4080924a78f3 100644
--- a/dev-libs/atk/atk-2.4.0.ebuild
+++ b/dev-libs/atk/atk-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.4.0.ebuild,v 1.1 2012/03/28 00:54:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.4.0.ebuild,v 1.2 2012/04/19 08:58:13 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc +introspection nls"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND=">=dev-libs/glib-2.31.2:2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5