Fix slot-deps on gnome libs, remove old

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

6 files changed, 52 insertions, 79 deletions

diff --git a/x11-themes/gtk-engines-qtpixmap/Manifest b/x11-themes/gtk-engines-qtpixmap/Manifest
index eed9edd7b84b..aadfe632c707 100644
--- a/x11-themes/gtk-engines-qtpixmap/Manifest
+++ b/x11-themes/gtk-engines-qtpixmap/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk-engines-qtpixmap-0.28-gtk_switches.patch 3612 RMD160 3ed554fe563033a490902b651a3a0a8fa96e09d2 SHA1 d645d9972f3055ec6b23404a49f61a24c91c2a51 SHA256 45e917ab0579264c4bd5b160877df3b9d28a3f8a397d2d25d85a44720359bd8d
 DIST QtPixmap-0.28.tar.gz 429698 RMD160 e6f0c9e3de544a9765d57d235834adcf889a61a5 SHA1 fdbf2cc20c72e4280c1edda6efbd79d398fb44ca SHA256 514090d808db0c9ff04792663e24ac5ab663ae5b15ea4914cae8b76f4663a407
-EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1226 RMD160 9f49ddae18ec733698045c4a2624a28892fb1571 SHA1 a8911e8b24b86ec04c50342e88c3b66bf8e8b223 SHA256 ee34e51762b460105d514863b03e823d125b9a902b80c4395566002e2146da07
-MISC ChangeLog 3648 RMD160 cd10c8e8f83fdf34b2a69a67b5a9445fe479d46a SHA1 fe3331b576dfb2d08180add10a3c3c47406a6091 SHA256 48e35bc78169aa929defee86d9104ceb2348f53048fe69f0d1b973141f08de35
+EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1235 RMD160 5d28a66290451273d6863580506b8dee7901316f SHA1 0a2d863b9750ef652c784f3453a4dd953575f1a8 SHA256 4ef5fd62621a2f47b7478e271ef63be8ffe9323222c10571df100e8f231bad90
+MISC ChangeLog 3765 RMD160 f8e5a5f6c4858a99aec62b9bf6042eb3ec7783c4 SHA1 eadd2b43f3fd0d79be14977321f5061ac14523ca SHA256 c945cc9ac8d69f4b881bef9b52c11d5bcbf2d51ab6512f4a206c06672d050f04
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNjzXeAAoJEO/kOhxWD91k3/8QAI7HkF2/HZlQbP9kGkU57TJg
+niGZcclDWnbExKEGPeiTIHFHOunjaQM2E6LGFHTgMZWQTtDuDMGFmHJUljBvOXvW
+LQ7oelNC4BNsy/29aWVlYlE6a5gjboj0UJWbqwuGaGJGw54PC0qZwDmn9JC1BTgA
+4sBKIfgbP3FwuW81qSlWqFNBkDmLdGfOWo85u+KoqBPCn3InKn1d3IAOjU7rNmzY
+mliuz/YcmDtPB5i+u0BQdZKZ2y1xzQ4MJ/cgJ+xkB4Gwyeza9r1tax+9GN8rT58i
+0L0Wa9Eku41GCVjX2cO+19EuzLj1i+vz0zdyzwM6vJGoLo7VsHfkmSfYLQwwAKSG
+hvCoqcgkgpmA1vEPr4UfZUTCqMRhVz+dIfEXa6886aatlBjo2/mTLZjMNjLUTUO6
+kgDnEUHlw0JE8Go6uZ0587WQY3UEfjsaKe9Zobe2xcjCa/vMXdidApAd/E+Fzx3O
+MM0LseOIZFAHOyCNZBhdQ/x5PYGEFbwzkkqX52g6xwq6Wl/pqd8AMvB7w8D3pnGd
+P/hWFeR23xDTZ7mUg3sv/LTIaFn5PS/Q0lyWUkJ91fX2asMpFohB2cr1HNTpgbUD
+UbLjmrX4PraNNA3uUEXsHRvyVEGBGxzECn6jIn3Xza+BtUDgrY08IodCt0kL26E2
+JuQ4QVGJMAMlwjcRx6fS
+=mPUB
+-----END PGP SIGNATURE-----
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/Manifest b/x11-themes/gtk-engines/Manifest
index 299afabe8f6b..906f8fe13cb4 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk-engines-2.18.3-fix-system-lua-check.patch 862 RMD160 c14e110e1c2f604e6b42d8034d78c6d29ca39428 SHA1 3c5d009bfe73237927bb0dbe78f3a815c485b1a3 SHA256 5d1ab916b9146859cbdde2af627d63c69faad41438fd747e14ca2476fd3ee9bb
 AUX gtk-engines-2.20.1-evolution-workaround.patch 1028 RMD160 0fee809fec9d95bfd1b1796559bbe01cd35fb930 SHA1 3e240d99c8de754768ae996103c43360c792d0c8 SHA256 22e11c338b4db573fe87a6c11c9bffd204780f27af81f39dbaf1c78080e61d40
 AUX gtk-engines-2.20.1-xfce-workaround.patch 1047 RMD160 a3889363c8884b27de5eb6d14383c77fd8a76f35 SHA1 b2de5c652bbf47f71e5b6dfaa873c55704bde054 SHA256 61cd87901804d9be6bc95694dfe4707c64f50954dca9b5a0ff75d380a875d1fb
-DIST gtk-engines-2.18.5.tar.bz2 675585 RMD160 34b47034302b18defdd2191bb9bea06b2ca4e614 SHA1 bc540837ec7aa81b155c46317aacb367c3b71314 SHA256 494db7876b8c69b760c097493e4c3566a71231c54a90eaa6ef9529884e2a9f12
-DIST gtk-engines-2.20.1.tar.bz2 679326 RMD160 336465821ded77e69d9cafe2cd07f3417dd97dc5 SHA1 908d24ae48e70a0ce2f047ba9f494f35153e3982 SHA256 c502ee4778e1a8e232f430fb575146a0880266471d19dbd78ee51eaa769da614
 DIST gtk-engines-2.20.2.tar.bz2 688171 RMD160 941b71cd2346a349d89f68962c2ce28e3520297c SHA1 574c7577d70eaacecd2ffa14e288ef88fdcb6c2a SHA256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5
-EBUILD gtk-engines-2.18.5.ebuild 887 RMD160 f42fbb7385373422df8b2b51f3cc0154c2bfd895 SHA1 f1f335798125cfe300c76a66b467d44f488551be SHA256 836526209e2562edffbecc7eb05e592a0bb3fe324ab202ffd82234c5d5148bf3
-EBUILD gtk-engines-2.20.1-r1.ebuild 1168 RMD160 7e1e6741ee0e75c1ee71274b9dab5285acfa36fe SHA1 232c6dac5f3ea1317a1c2f51da1c6d9369e1ff97 SHA256 8cfc02fde34cfb966450cd98a79ab457f76485aff0252fb95742f1ff299ca1c4
-EBUILD gtk-engines-2.20.2.ebuild 971 RMD160 1e7df07018a0795944e71e5a1b7021f460848b9d SHA1 a76fbeb17a3d843668023fc8ffe9ada10afa5486 SHA256 ac9281d94eaf9d245fcb938095494cf7f8e9e700e6b3134f1c2caf675f6f5e0c
-MISC ChangeLog 23971 RMD160 ef04a9025a695236ed13a2c19d7dedf834c3c948 SHA1 01fecfc4191ea21cb6c8b497b6d78ea5ec23c603 SHA256 28fc6432b97c83154441fc31ea6eae581094260419f3b56cc1f0dacc47c50207
+EBUILD gtk-engines-2.20.2.ebuild 975 RMD160 39b45cfb0b562694093c9cffb3a1b438eeebd1c7 SHA1 3969d33745fe54f17dbb04a73db8c83686c2905a SHA256 9c1af15ea8096873f1ad33b6282f9f97ba0410501f248bd58608a799c073356b
+MISC ChangeLog 24160 RMD160 1b299bcc8c4cb9210d83bc5e9647ea77fa01b0c2 SHA1 5623e5e6cbebcb1847d7cb375be9ab9718b5b583 SHA256 aaf234ce6dc8d9f3d8e6cdc84ac2bbc645c7e7f54f5f3b2c0cd22335e0aba6ed
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNjzWcAAoJEO/kOhxWD91kEWUP/R0DJp/B0m6NFNqlwb0L75Tr
+8VMaHukEIDBZeonfDtC4tCsoLYYU4vgXWHVuVME0TI3+dtByjhJwnvB3IfHPoVrZ
+TVl+RveXBcv4chpxuRkQG/HUfRgjDF8SrYRQXDiVGDqM05ehkEXK5qCcMaE5aFnL
+S54vm/RorsHKqr0tThfdORRVIefVDiMAFtugPHKc3bE6Xp/43QQMMOl+ERCF9gnY
+WiEMSao0o+xnY0cNnm7QQNN+ViJxum6DI2fCaXldBECdVFiYIxEFoxI5Ih++wEgG
+JsXeMz9tBHlaWjvrTzeuB39U6qHKo5pEvchnflbzcnIai80rKHp4Y+rIRvheE1kp
+MF9KiSINd6qlmByC5IYrarv/plhbN5ufzbsOX9YWHnH6T1qhybpKaV+N8Sior2VU
+nHA3BvZbHN2esrNIKi9Neu240EHtj2/WG+tkHBTT1dgg8HyjUw9jvTIp52yLiscy
+VcmDSjWFVzqS7Tb0dZdsN6PpsbzZKpKrlo3CMfJQP5Bva1ThNSHLjodAYJLG/jog
+EQdji1h2TtZ1JbhCzXbdnJD/TVzPrSFMzcw2eB8b49OBTW8Mp2ORSaiwhb/Q44bx
+SNeL64Dhu1x4OAs+8LUkfnVIvDSl4G5fWcMTmaoWPjspmUFHEOo5GRYyUfPtrE6p
+BiUkcP9Tovb3XeV0zPP+
+=1JFU
+-----END PGP SIGNATURE-----
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