Fix slot-deps on gtk+ and other libs

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

6 files changed, 16 insertions, 102 deletions

diff --git a/x11-themes/gtk-engines-murrine/ChangeLog b/x11-themes/gtk-engines-murrine/ChangeLog
index 97aa99aab631..f4c9fc76a00d 100644
--- a/x11-themes/gtk-engines-murrine/ChangeLog
+++ b/x11-themes/gtk-engines-murrine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines-murrine
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/ChangeLog,v 1.45 2010/09/22 15:23:20 nirbheek Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/ChangeLog,v 1.46 2011/03/06 23:08:33 nirbheek Exp $
+
+  06 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gtk-engines-murrine-0.53.1.ebuild, -gtk-engines-murrine-0.53.1-r1.ebuild,
+  gtk-engines-murrine-0.90.3-r1.ebuild, gtk-engines-murrine-0.98.0.ebuild:
+  Fix slot-deps on gtk+ and other libs
 
 *gtk-engines-murrine-0.98.0 (22 Sep 2010)
 
diff --git a/x11-themes/gtk-engines-murrine/Manifest b/x11-themes/gtk-engines-murrine/Manifest
index 1a9efb678551..cd2f9750470c 100644
--- a/x11-themes/gtk-engines-murrine/Manifest
+++ b/x11-themes/gtk-engines-murrine/Manifest
@@ -1,17 +1,7 @@
 AUX gtk-engines-murrine-0.53.1-use-gtk_free.patch 473 RMD160 de3e052afa48129c031b7a64fc051720428c279e SHA1 b69c32c079dd3311fb243af0f3f24e9a3d8370cc SHA256 73354c6420ecaeccdf0ac3a199cc0b2f1f21ce6be709bf4be0eee8ec47923e08
-DIST MurrinaFancyCandy.tar.bz2 1586 RMD160 7d29f674f5ef6f28e19d1455da478e107da30376 SHA1 6b957cdc19c113fa608ab83b690d72b77e0c1033 SHA256 916fd74440ab8ad787de05ecc3b1dcafb6c576b7daf211008236c222a739a06b
-DIST MurrinaGilouche.tar.bz2 2062 RMD160 54dbfc81faba432bbf05d82735698533c6d233e9 SHA1 0b4717522a911511f2f75e599da929297acfe174 SHA256 589516c0ea81628d0317650d6367a22dd0deade981a042a462cef6d4ff1a2592
-DIST MurrinaLoveGray.tar.bz2 1510 RMD160 15e8b00c8dcceee5a91f3c3f6e2162ba8d5d64d1 SHA1 99b9d017384f94d160dd69a9ae5aa061d1c5eca3 SHA256 c5f9eb052a12eef90e7258ca5cf5ca27d10b333a1a3753def183f53c096d456b
-DIST MurrinaVerdeOlivo.tar.bz2 1320 RMD160 b9435d0345c8b6d64c9af7eaa51eec4e0de5d28f SHA1 26160027366073d6d778fb9cfbe6bef4d8109b4f SHA256 e0b2a00c4ea8b35aa57e1a7954cc94538b7829a62a3b9b8dca5e7b1bcd7b7990
-DIST Murrine.tar.gz 3693 RMD160 b470acea042b56e8ab49e6e535be3579faf90557 SHA1 6669a8cf02aac2e5109651d0b83faf89b052f0ef SHA256 90be2783ab823aa31c9eb74a36e49a87373bdeec97c543948bf7aff11f1bd70e
-DIST MurrineThemePack.tar.bz2 3003 RMD160 79ccfc6ebf1cf45a5a9721b411c39d64b0657fae SHA1 67472ec2f999ce5e71dbbc21cdbe3e20d5a5decc SHA256 1c3daa87fc55e41f86a53aad3605ef2894ced64ec96a3bff88880fc9ef58c96a
-DIST MurrineXfwm.tar.bz2 6408 RMD160 0162288af03b4e2c1acf7a37d3dffe97c219c00e SHA1 3b600f24a85a9406a46f55c84f95ac0da04ad17c SHA256 b76f1e4eef7747bcc468b55dac74a307220cecb242ecf173c4a491e23505126b
-DIST murrine-0.53.1.tar.bz2 261530 RMD160 dd7a507ee7ce323b88382cf42bab7f01881f9c39 SHA1 108e2fa43c152406ff0c7bcdaf484413fd7bd735 SHA256 8a1c0993d2e57fdf643a9c4a75494afecb900d070e901fff600dbfbf241f3042
 DIST murrine-0.90.3.tar.bz2 271512 RMD160 347909724a11cfe53f922208f46e39f47b420459 SHA1 5c65acf7948d23bb1693728157425120486303a8 SHA256 c61ff7614e68b705560612ea7485454d1a7947422ac8cfe11d75e45370e2f0ba
 DIST murrine-0.98.0.tar.bz2 303495 RMD160 4dd79351ab967b2b872c844983ef2db9ca20e849 SHA1 9b37c0c43c0e2fb43a69c7af1cb27feee2a68e56 SHA256 6e82f6f15df775c794494aea1fff9baafdf2ffedcc76e81fb6672a1ab97d750b
-EBUILD gtk-engines-murrine-0.53.1-r1.ebuild 1358 RMD160 7097c8a6d3d1067b94649a9679c2a5f5713cd587 SHA1 bafd12c19cf2ee4717f9d70012dd6be28f9d43a8 SHA256 7e303c04c33848094151d7bfe035002d004e765e7c9609c8fb6d7dbc8d880f35
-EBUILD gtk-engines-murrine-0.53.1.ebuild 1198 RMD160 2c63a1b8f856ec2370bd27efd1bb9f4e80c60141 SHA1 657d5189004967b668d88d7bfa6d95d668d511e9 SHA256 7891208f2757c590635004c64af8734dc15c835aa47abe5e557a2eb349a4dea9
-EBUILD gtk-engines-murrine-0.90.3-r1.ebuild 984 RMD160 f15283e3ab99372c6981b91e3d7017bffa07c01f SHA1 24209995a40605c0841fc88d1e1247f6abaad33e SHA256 1c7b632b370074a23c149e5239107d4747ad32fefb7fdc58d8489563ab249125
-EBUILD gtk-engines-murrine-0.98.0.ebuild 1094 RMD160 0c23492d3dc7e85e8b493473e1e1c0f563e60609 SHA1 5253fdaa1195749153aa50413dd5cea4a088891f SHA256 917d1644b67eddc432a3ab93adb16223db5ba128b8db2e09360a3a4228ef7a50
-MISC ChangeLog 6443 RMD160 5090e53aea8381c63cd5b0648e5e6d2c47008d40 SHA1 e5f47bf5cc8c0976b475e4fb95fdd563a88bc830 SHA256 c0cef977cb25c8a33b4344d98d2f743050c07fbbad924486e4bf9bc930108e01
+EBUILD gtk-engines-murrine-0.90.3-r1.ebuild 986 RMD160 5802d355628fefbb399fc515b39fb7f70461d95d SHA1 de1f516d0f5460bd5aa8b1fdf16e144210fb668f SHA256 b3d2b3c2b127640fc995c5434294af4eeec0de219865dc4e891eb3d8b362186c
+EBUILD gtk-engines-murrine-0.98.0.ebuild 1096 RMD160 f797a67a34005f31bc9ee14cecb504f0910d4ae3 SHA1 860db6feec908b567f87a30bbf06c1b3b5bfa7c0 SHA256 13c24ab7b0013a4d326f4c28052578563e3d1a179a8b3f46fb55ea20325b3ea1
+MISC ChangeLog 6689 RMD160 cc21f477d1a2a75b920dac2631c9f017eae59dff SHA1 78f56092ab66c62ccefa1f188d22c11e7d2bbd80 SHA256 9a9d6d774f308792908f85deab305ac59b3f8fd7afd9b9afc173333bbc04733c
 MISC metadata.xml 977 RMD160 2f5559b1c5863242a7a918cbad78c20abce9542a SHA1 60009e9eeabf68542b527436a5025f472f27d2c3 SHA256 0dd6c3841118272ec8f09232bffe155e1e45c0f860f50e4695c40ca312d87533
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1-r1.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1-r1.ebuild
deleted file mode 100644
index 08e8ca17eecb..000000000000
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1-r1.ebuild,v 1.5 2008/07/07 21:55:24 jokey Exp $
-
-inherit eutils
-
-MY_PN="murrine"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Murrine GTK+2 Cairo Engine"
-
-HOMEPAGE="http://www.cimitan.com/murrine/"
-URI_PREFIX="http://cimi.netsons.org/media/download_gallery"
-SRC_URI="${URI_PREFIX}/${MY_PN}/${MY_P}.tar.bz2 ${URI_PREFIX}/MurrinaFancyCandy.tar.bz2 ${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2 ${URI_PREFIX}/MurrinaGilouche.tar.bz2 ${URI_PREFIX}/MurrinaLoveGray.tar.bz2 ${URI_PREFIX}/MurrineThemePack.tar.bz2 ${URI_PREFIX}/MurrineXfwm.tar.bz2 http://www.kernow-webhosting.com/~bvc/theme/mcity/Murrine.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "$S"
-
-	# Fix for bug #198815
-	epatch "${FILESDIR}/${P}-use-gtk_free.patch"
-}
-
-src_compile() {
-	econf --enable-animation || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /usr/share/themes
-	insinto /usr/share/themes
-	doins -r "${WORKDIR}"/Murrin*
-
-	dodoc AUTHORS ChangeLog CREDITS
-}
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1.ebuild
deleted file mode 100644
index a321b4eec119..000000000000
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.53.1.ebuild
+++ /dev/null
@@ -1,34 +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-murrine/gtk-engines-murrine-0.53.1.ebuild,v 1.6 2010/02/24 14:56:15 ssuominen Exp $
-
-MY_PN="murrine"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Murrine GTK+2 Cairo Engine"
-
-HOMEPAGE="http://cimi.netsons.org/pages/murrine.php"
-URI_PREFIX="http://cimi.netsons.org/media/download_gallery"
-SRC_URI="${URI_PREFIX}/${MY_PN}/${MY_P}.tar.bz2 ${URI_PREFIX}/MurrinaFancyCandy.tar.bz2 ${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2 ${URI_PREFIX}/MurrinaGilouche.tar.bz2 ${URI_PREFIX}/MurrinaLoveGray.tar.bz2 ${URI_PREFIX}/MurrineThemePack.tar.bz2 ${URI_PREFIX}/MurrineXfwm.tar.bz2 http://www.kernow-webhosting.com/~bvc/theme/mcity/Murrine.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.6"
-DEPEND=">=x11-libs/gtk+-2.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --enable-animation || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodir /usr/share/themes
-	insinto /usr/share/themes
-	doins -r "${WORKDIR}"/Murrin*
-}
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.90.3-r1.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.90.3-r1.ebuild
index 7f7d23a10bce..73b83d58afed 100644
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.90.3-r1.ebuild
+++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.90.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-murrine/gtk-engines-murrine-0.90.3-r1.ebuild,v 1.7 2010/02/14 06:23:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.90.3-r1.ebuild,v 1.8 2011/03/06 23:08:33 nirbheek Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="+themes animation-rtl"
 
-RDEPEND=">=x11-libs/gtk+-2.12"
+RDEPEND=">=x11-libs/gtk+-2.12:2"
 PDEPEND="themes? ( x11-themes/murrine-themes )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.37.1
diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild
index 2e6fc914f86f..06553278d598 100644
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild
+++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-murrine/gtk-engines-murrine-0.98.0.ebuild,v 1.1 2010/09/22 15:23:20 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.0.ebuild,v 1.2 2011/03/06 23:08:33 nirbheek Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86
 IUSE="+themes animation-rtl"
 
 # pixman and cairo aren't checked for in configure, but are #include-ed
-RDEPEND=">=x11-libs/gtk+-2.18
+RDEPEND=">=x11-libs/gtk+-2.18:2
 	x11-libs/cairo
 	x11-libs/pixman"
 PDEPEND="themes? ( x11-themes/murrine-themes )"