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.

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

6 files changed, 43 insertions, 127 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/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
+