Fix slot-deps on gtk+ and other libs, remove old

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

5 files changed, 10 insertions, 156 deletions

diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index 3aec995c1415..03c38f235d69 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/compiz-plugins-main
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.14 2011/02/26 22:51:00 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.15 2011/03/21 19:50:33 nirbheek Exp $
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -compiz-plugins-main-0.8.4.ebuild, -compiz-plugins-main-0.8.4-r1.ebuild,
+  -compiz-plugins-main-0.8.6.ebuild, compiz-plugins-main-0.8.6-r1.ebuild:
+  Fix slot-deps on gtk+ and other libs, remove old
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org>
   compiz-plugins-main-0.8.4.ebuild, compiz-plugins-main-0.8.4-r1.ebuild,
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4-r1.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4-r1.ebuild
deleted file mode 100644
index 2abda81cd4b6..000000000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4-r1.ebuild,v 1.2 2011/02/26 22:51:00 signals Exp $
-
-EAPI="2"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	!x11-plugins/compiz-fusion-plugins-main
-	>=gnome-base/librsvg-2.14.0
-	virtual/jpeg
-	x11-libs/cairo
-	~x11-libs/compiz-bcop-${PV}
-	~x11-wm/compiz-${PV}[gnome?]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	epatch "${FILESDIR}"/${P}-put-plugin.patch
-}
-
-src_configure() {
-	econf $(use_enable gnome schemas) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4.ebuild
deleted file mode 100644
index 2e9dd187edf1..000000000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.4.ebuild,v 1.3 2011/02/26 22:51:00 signals Exp $
-
-EAPI="2"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	>=gnome-base/librsvg-2.14.0
-	virtual/jpeg
-	x11-libs/cairo
-	~x11-libs/compiz-bcop-${PV}
-	~x11-wm/compiz-${PV}[gnome?]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
-}
-
-src_configure() {
-	econf $(use_enable gnome schemas) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
index 25b405bd2276..de10177bc758 100644
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
+++ b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.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-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.3 2011/02/26 22:51:00 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.4 2011/03/21 19:50:33 nirbheek Exp $
 
 EAPI="2"
 
@@ -18,8 +18,8 @@ IUSE="gconf"
 MY_PV="0.8.4"
 
 RDEPEND="
-	>=gnome-base/librsvg-2.14.0
-	virtual/jpeg
+	>=gnome-base/librsvg-2.14.0:2
+	virtual/jpeg:0
 	x11-libs/cairo
 	>=x11-libs/compiz-bcop-${MY_PV}
 	>=x11-wm/compiz-${PV}[gconf?]
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.19
 	>=sys-devel/gettext-0.15
-	gconf? ( gnome-base/gconf )
+	gconf? ( gnome-base/gconf:2 )
 "
 
 src_prepare() {
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6.ebuild
deleted file mode 100644
index e6a0c08d9e25..000000000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6.ebuild,v 1.2 2011/02/26 22:51:00 signals Exp $
-
-EAPI="2"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gnome"
-
-MY_PV="0.8.4"
-
-RDEPEND="
-	>=gnome-base/librsvg-2.14.0
-	virtual/jpeg
-	x11-libs/cairo
-	>=x11-libs/compiz-bcop-${MY_PV}
-	>=x11-wm/compiz-${PV}[gnome?]
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-"
-
-src_prepare() {
-	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
-}
-
-src_configure() {
-	econf $(use_enable gnome schemas) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-}