Resolve automagic dependencies over libnotify: force it on 0.8.4-r1, and patch 0.8.6-r1 to respect a libnotify USE flag instead. Drop old version.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

7 files changed, 47 insertions, 142 deletions

diff --git a/x11-plugins/compiz-plugins-extra/ChangeLog b/x11-plugins/compiz-plugins-extra/ChangeLog
index 3194a9c1d778..e93a39db98a3 100644
--- a/x11-plugins/compiz-plugins-extra/ChangeLog
+++ b/x11-plugins/compiz-plugins-extra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/compiz-plugins-extra
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.12 2010/09/04 22:15:21 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.13 2011/02/13 18:32:25 flameeyes Exp $
+
+  13 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -compiz-plugins-extra-0.8.4.ebuild, compiz-plugins-extra-0.8.4-r1.ebuild,
+  -compiz-plugins-extra-0.8.6.ebuild, compiz-plugins-extra-0.8.6-r1.ebuild,
+  +files/compiz-plugins-extra-0.8.6-libnotify.patch:
+  Resolve automagic dependencies over libnotify: force it on 0.8.4-r1, and
+  patch 0.8.6-r1 to respect a libnotify USE flag instead. Drop old version.
 
 *compiz-plugins-extra-0.8.6-r1 (04 Sep 2010)
 
diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
index 523bc056c55b..31b3407146a0 100644
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ b/x11-plugins/compiz-plugins-extra/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX compiz-plugins-extra-0.8.6-libnotify.patch 1022 RMD160 cd5d07e9cfbfa2a0845d279f08889a8adb2d9ae6 SHA1 bb63195178ae0f495d55f1cd37efff117d4f3961 SHA256 116e4cb3fb9039feea742d20c0bd2ce282d331db8960cc9f20bae54719976d5a
 AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
 DIST compiz-plugins-extra-0.8.4.tar.bz2 2678694 RMD160 10daaaed686e803fb7be27ebe61ff6adaf036c38 SHA1 eb05e8b60c5d1e22a007979d652ef92c23b7bd21 SHA256 a874903d07eb54c3bf210a322275a972cef7f47ccf4c2d2e307c31d73c57d952
 DIST compiz-plugins-extra-0.8.6.tar.bz2 2699385 RMD160 cd8d26902d38ee7fb42fe2077e483f92fc458929 SHA1 66c571c64910aa21808aedaee8c8ceb4c4a82c78 SHA256 e111beecd9e563065448aae81002fd6cb644b3cd0e11a8406d6a2d3146747de1
-EBUILD compiz-plugins-extra-0.8.4-r1.ebuild 1348 RMD160 c9abfc63d6620e9c65313b936278a128c7235ff1 SHA1 6803d2fb3372a0626f379be7af93082b4d6fc6a9 SHA256 9397f464fbb3e129de26091e0020d67a18c467de0add6ec10cef7a9f5a906870
-EBUILD compiz-plugins-extra-0.8.4.ebuild 1184 RMD160 a6ebf347c48da7f1ef52ff67609cd0179dce3246 SHA1 2fb61c9c01a6e3be7c1489e064de82b246d79f4e SHA256 df1dd63c882b1717495b29a3627b307a85d5d025c1cf6396f5f372be63c12d77
-EBUILD compiz-plugins-extra-0.8.6-r1.ebuild 1450 RMD160 1445816f22d24ae49887a296492276e04dfcf466 SHA1 c24c67af9295569b93b6fee8e3a5af93bfdf3330 SHA256 678af52e0552163b8c8172b5bbfe6045e46cc8c6ed71d1657b7eb8e91f8400f1
-EBUILD compiz-plugins-extra-0.8.6.ebuild 1366 RMD160 1d4caa58a7f559b291738ebb0ac3a2bf74d7cb1c SHA1 fcbcbbcaa2a27d9f9d22b640711b4166a72cf0fe SHA256 5bdc7d254d268397d6ab0e52d851d0a9afcf6dd6230a5f8fc794dc441d2f2fea
-MISC ChangeLog 2561 RMD160 82d983516278b2db550330aae23b84b001a17d7f SHA1 2a95c7e1ffac1747c17ae209bc836999d79aaee3 SHA256 ed7ba616028eee386a9a9f474b4a618ac060ca4286b74b72f9f925c406f60c60
+EBUILD compiz-plugins-extra-0.8.4-r1.ebuild 1371 RMD160 7948c0804f58b8f7a7fc717ad0c9ae630b21b845 SHA1 7e7d526b0a96aac3181f4815cafe1ec9c8cec87d SHA256 0e27426ec165570d7a942be04fabe812dcbb8213e91e389cce624173d69bd054
+EBUILD compiz-plugins-extra-0.8.6-r1.ebuild 1567 RMD160 81bd08a5318c35f3efccd9744b22b7502396f17a SHA1 f91a617312313307a78b4b61ffa7ce81b5e5237d SHA256 731028b3cebd12087e1e7fbb6b95d5922fa4060aa5058e34ffae48c471324d02
+MISC ChangeLog 2974 RMD160 8beee07e9fffbefb21620b1d3f76c5f08a054840 SHA1 932593f010fdddb255957418231a0bd7e377257e SHA256 6f32284788fcce9185907f70c4a87734095b609a767054a04401a6aa3ed0164c
 MISC metadata.xml 635 RMD160 254ac795726f3ed90c85945f1c3bca9597cfc1d2 SHA1 cae4d4184b4530628dac878f077bca339b2fec24 SHA256 e2023c254ee05395db536f19d88d1735ddcec97e260a50a5db717249e0f3ba93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyCxP8ACgkQAiZjviIA2Xj7VwCgjM/GUjPzhuXTSun205ZerzBw
-OIQAoI+bGGCz407QNLvbahg3YQt4CTG9
-=4scc
------END PGP SIGNATURE-----
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4-r1.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4-r1.ebuild
index 5ebcee57b9e2..d0aff2d953a4 100644
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4-r1.ebuild
+++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-extra/compiz-plugins-extra-0.8.4-r1.ebuild,v 1.2 2009/12/23 02:48:15 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4-r1.ebuild,v 1.3 2011/02/13 18:32:25 flameeyes Exp $
 
 EAPI="2"
 
@@ -18,6 +18,7 @@ IUSE="gnome"
 RDEPEND="
 	>=gnome-base/librsvg-2.14.0
 	media-libs/jpeg
+	<x11-libs/libnotify-0.7
 	~x11-libs/compiz-bcop-${PV}
 	~x11-plugins/compiz-plugins-main-${PV}
 	~x11-wm/compiz-${PV}
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4.ebuild
deleted file mode 100644
index eeb9f481367d..000000000000
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.4.ebuild,v 1.2 2009/12/23 02:48:15 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Compiz Fusion Window Decorator Extra 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
-	media-libs/jpeg
-	~x11-libs/compiz-bcop-${PV}
-	~x11-plugins/compiz-plugins-main-${PV}
-	~x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-	x11-libs/cairo
-	gnome? ( gnome-base/gconf )
-"
-
-src_prepare() {
-	use gnome || {
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
-	}
-}
-
-src_configure() {
-	econf $(use_enable gnome gconf) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild
index ef002f32a308..e2525f1a908d 100644
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild
+++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-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-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.1 2010/09/04 22:15:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.2 2011/02/13 18:32:25 flameeyes Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gconf"
+IUSE="gconf libnotify"
 
 MY_PV="0.8.4"
 
@@ -23,6 +23,7 @@ RDEPEND="
 	>=x11-libs/compiz-bcop-${MY_PV}
 	>=x11-plugins/compiz-plugins-main-${PV}
 	>=x11-wm/compiz-${PV}[gconf?]
+	libnotify? ( <x11-libs/libnotify-0.7 )
 "
 
 DEPEND="${RDEPEND}
@@ -36,11 +37,13 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	if ! use gconf; then
 		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
 	fi
+
+	epatch "${FILESDIR}/${P}-libnotify.patch"
+
+	# required to apply the above patch
+	intltoolize --copy --force || die "intltoolize failed"
+	eautoreconf || die "eautoreconf failed"
 }
 
 src_configure() {
@@ -48,7 +51,8 @@ src_configure() {
 		--disable-dependency-tracking \
 		--enable-fast-install \
 		--disable-static \
-		$(use_enable gconf schemas)
+		$(use_enable gconf schemas) \
+		$(use_with libnotify)
 }
 
 src_install() {
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6.ebuild
deleted file mode 100644
index 78663a1bcb23..000000000000
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6.ebuild,v 1.1 2010/04/03 05:11:17 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Extra 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
-	media-libs/jpeg
-	>=x11-libs/compiz-bcop-${MY_PV}
-	>=x11-plugins/compiz-plugins-main-${PV}
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.15
-	x11-libs/cairo
-	gnome? ( gnome-base/gconf )
-"
-
-src_prepare() {
-	use gnome || {
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
-	}
-}
-
-src_configure() {
-	econf --disable-dependency-tracking \
-		$(use_enable gnome schemas)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_preinst() {
-	if use gnome; then
-		gnome2_gconf_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gnome; then
-		gnome2_gconf_install
-	fi
-}
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch
new file mode 100644
index 000000000000..5392fa00d021
--- /dev/null
+++ b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch
@@ -0,0 +1,19 @@
+Index: compiz-plugins-extra-0.8.6/configure.ac
+===================================================================
+--- compiz-plugins-extra-0.8.6.orig/configure.ac
++++ compiz-plugins-extra-0.8.6/configure.ac
+@@ -136,9 +136,12 @@ AM_CONDITIONAL(THREED_PLUGIN, test "x$ha
+ PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no])
+ AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes")
+ 
+-PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [have_libnotify=yes], [have_libnotify=no])
++AC_ARG_WITH([libnotify], [AS_HELP_STRING([--without-libnotify], [Build without libnotify support @<:@default=auto@:>@])])
++AS_IF([test "x$with_libnotify" != "xno"], [
++  PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [have_libnotify=yes], [have_libnotify=no])
++])
+ AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes")
+-if test "$have_libnotify" = yes; then
++if test "x$have_libnotify" = "xyes"; then
+   AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin])
+ fi
+