Fix slot-deps on gtk+ and other libs

(Portage version: 2.1.9.42/cvs/Linux x86_64)

5 files changed, 13 insertions, 89 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/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 )"