Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

4 files changed, 8 insertions, 71 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index 76b292df00ec..a42372c42f94 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.182 2011/03/22 19:54:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.183 2011/03/27 13:03:17 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gtk-engines-2.18.5.ebuild, -gtk-engines-2.20.1-r1.ebuild,
+  gtk-engines-2.20.2.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gtk-engines-2.20.2.ebuild:
   Marking gtk-engines-2.20.2 ppc stable for bug 353436
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.5.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.5.ebuild
deleted file mode 100644
index 4403b9ce2a19..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.18.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.5.ebuild,v 1.8 2010/07/20 04:40:41 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="accessibility lua"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	lua? ( dev-lang/lua )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
-	use accessibility || G2CONF="${G2CONF} --disable-hc"
-}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild
deleted file mode 100644
index 8e76823e0518..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild,v 1.8 2010/10/17 15:00:58 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="accessibility lua"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	lua? ( dev-lang/lua )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
-	use accessibility || G2CONF="${G2CONF} --disable-hc"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Upstream bug 616124: drop xfce workaround that will break
-	epatch "${FILESDIR}/${P}-xfce-workaround.patch"
-
-	# Fix evolution table header workaround for new evo versions
-	epatch "${FILESDIR}/${P}-evolution-workaround.patch"
-}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
index cd6b37797e5c..570642c3bdbc 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2.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/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild,v 1.8 2011/03/22 19:54:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild,v 1.9 2011/03/27 13:03:17 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
-RDEPEND=">=x11-libs/gtk+-2.12
+RDEPEND=">=x11-libs/gtk+-2.12:2
 	lua? ( dev-lang/lua )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.31