Rename gnome USE flag to gconf (like x11-wm/compiz); disable static libs and remove .la files (ibid.).

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

4 files changed, 92 insertions, 3 deletions

diff --git a/x11-plugins/compiz-plugins-extra/ChangeLog b/x11-plugins/compiz-plugins-extra/ChangeLog
index d4a041fecf9a..3194a9c1d778 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.11 2010/04/03 05:11:17 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.12 2010/09/04 22:15:21 flameeyes Exp $
+
+*compiz-plugins-extra-0.8.6-r1 (04 Sep 2010)
+
+  04 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +compiz-plugins-extra-0.8.6-r1.ebuild, metadata.xml:
+  Rename gnome USE flag to gconf (like x11-wm/compiz); disable static libs
+  and remove .la files (ibid.).
 
 *compiz-plugins-extra-0.8.6 (03 Apr 2010)
 
diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
index 6859adbbf534..523bc056c55b 100644
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ b/x11-plugins/compiz-plugins-extra/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 2298 RMD160 bea79e4e971d74f1c0f6aba9f6a3a61dd126957f SHA1 b01a54d19a9a75e43b1358d3dfeacb4233218cd4 SHA256 2661a58add9eac96c73fba63b6234cd955a052790e69c291da48617f2a9786b4
-MISC metadata.xml 446 RMD160 aeefd7f7a11eca1cfdf311dd9edf9e78f54d0d13 SHA1 35ee4d4d871dc365def8b4901172b72c8db28460 SHA256 6c0bdfc83d10f364e6fc38305ef97834032fbb5d6623058d04670910acc6fad8
+MISC ChangeLog 2561 RMD160 82d983516278b2db550330aae23b84b001a17d7f SHA1 2a95c7e1ffac1747c17ae209bc836999d79aaee3 SHA256 ed7ba616028eee386a9a9f474b4a618ac060ca4286b74b72f9f925c406f60c60
+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.6-r1.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..ef002f32a308
--- /dev/null
+++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild
@@ -0,0 +1,65 @@
+# 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-r1.ebuild,v 1.1 2010/09/04 22:15:21 flameeyes 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="gconf"
+
+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}[gconf?]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/gettext-0.15
+	x11-libs/cairo
+	gconf? ( gnome-base/gconf )
+"
+
+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
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		--disable-static \
+		$(use_enable gconf schemas)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+}
diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
index e1a812c32910..907c49177fbd 100644
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ b/x11-plugins/compiz-plugins-extra/metadata.xml
@@ -7,5 +7,11 @@
 addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
 goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
 </longdescription>
+  <use>
+    <flag name="gconf">
+      Install GConf schemas for the plugins, needed when using the GConf-based
+      configuration backend in <pkg>x11-wm/compiz</pkg>.
+    </flag>
+  </use>
 </pkgmetadata>