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

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 7 insertions, 92 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/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