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, 84 insertions, 3 deletions

diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index d1c7c9e1b906..40dfacaee5b4 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/compiz-plugins-main
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.11 2010/04/03 04:52:06 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.12 2010/09/04 22:01:05 flameeyes Exp $
+
+*compiz-plugins-main-0.8.6-r1 (04 Sep 2010)
+
+  04 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +compiz-plugins-main-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-main-0.8.6 (03 Apr 2010)
 
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
index 4bb106af7c76..b953725af978 100644
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ b/x11-plugins/compiz-plugins-main/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX compiz-plugins-main-0.8.4-put-plugin.patch 6918 RMD160 1c14b58a95694e711d1dcd0036471fe465cf2a0e SHA1 fc50491bc22fe1f46f2779b9e24fc07e4c15bdc4 SHA256 1155ac5765d1712b8dee5813b41a638ea01cc16519837e7137a69d6a1e79e614
 AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
 DIST compiz-plugins-main-0.8.4.tar.bz2 1221256 RMD160 ea438b5b608dc084e50bac94a07ce66487f3a865 SHA1 9dcc1018537f69eb9fd470b1c49e7b4888c2c3ce SHA256 1ea757880a3793e9a01603839b4a2efe5fab4efee0a96101d772dc25422f8aee
 DIST compiz-plugins-main-0.8.6.tar.bz2 1226802 RMD160 7eefc691c26199487309fc5e5b0993bfe3f3dd86 SHA1 6cd9c6a48c570061ac0b6275a6acddd8415b8611 SHA256 66dc4f349b11dbeac08f941d2d3443aa9b80d82f35c304db747ff383491ed6d9
 EBUILD compiz-plugins-main-0.8.4-r1.ebuild 1168 RMD160 cefe7cdc802cefd2d640736f39f2fbc80491645e SHA1 d9e8b96924c710173ef58ad36cf3dd4667632357 SHA256 ae9d3ff18cd296432cd77ffd3c1cb6f24aa0f83fcee3d6c0724d0928861896b5
 EBUILD compiz-plugins-main-0.8.4.ebuild 1084 RMD160 c780c41ba0c2a396778ac984b4cac25167aafd77 SHA1 b7a29bb356b24b03c812f940c38f76d3fcf99899 SHA256 c967bdc180b2f50673e766232a54edec5644b742e656c80e2407acd17ae3ec29
+EBUILD compiz-plugins-main-0.8.6-r1.ebuild 1232 RMD160 be2e59f7063791a90587d9d599f6e6c73f6cddf3 SHA1 efca72c0761346929830b4540ec5e949c564bac6 SHA256 0dd5ff58e4649699dd72e59c16e0c21c5b4ab9d8c036d817a0fd0b8d552b3088
 EBUILD compiz-plugins-main-0.8.6.ebuild 1104 RMD160 2b47719110746193ec9e9a75d900cb7b4a2ef4da SHA1 f6d0920e9b16361f1a6ad764a63fff4f38b20ec2 SHA256 f7c0bac689509f5d9a4ced1d0127b3bd51df8e6940675ba0b66d43413a70c63b
-MISC ChangeLog 2572 RMD160 8a7b3201dd1632da1c569ccb45f5c61741a2c3f5 SHA1 72bcf3427c462039b6279f8afdb533659072c032 SHA256 bba47107265365ff602f70fb5bd6225497ace77640db0696de288aeca4b889e2
-MISC metadata.xml 423 RMD160 ed3e1c4f2fcef78faf6d8b85b337f60b69c582f1 SHA1 554188b456adfdd2be58a825b83f5a2f75a1070e SHA256 63a22d1439257bac17c3a4e5a045bc2e07fbd13bde371f72cecdd0bd5cbe8742
+MISC ChangeLog 2833 RMD160 50b6defe29dbe058f61ff523a8d9eea6000d2842 SHA1 8164dc2e348ae985777a857431374b2c47683a55 SHA256 7bc400468dd02728f64255e6b513b1ccd8010d3d79aa7724c9116aaf60705424
+MISC metadata.xml 612 RMD160 2c509701c4d10caa747d3d5ecdac89d591d92fba SHA1 fa635c34711c80e4f7d430c67421aeb7839daca1 SHA256 70c3031e9483ffa40727107ea5272d67501f24a44d2e7040356572490c4e34a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyCwacACgkQAiZjviIA2XgMtQCg81nTFRGq3aWQ2KdlUPuYBFQC
+zzAAoKlsVoalNnWVamyL26thpQ7aI29L
+=cSh3
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..67a811683ee4
--- /dev/null
+++ b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild
@@ -0,0 +1,57 @@
+# 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-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.1 2010/09/04 22:01:05 flameeyes 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="gconf"
+
+MY_PV="0.8.4"
+
+RDEPEND="
+	>=gnome-base/librsvg-2.14.0
+	media-libs/jpeg
+	x11-libs/cairo
+	>=x11-libs/compiz-bcop-${MY_PV}
+	>=x11-wm/compiz-${PV}[gconf?]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/gettext-0.15
+"
+
+src_prepare() {
+	use gconf || epatch "${FILESDIR}"/${PN}-no-gconf.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		--disable-static \
+		$(use_enable gconf schemas) || die "econf failed"
+}
+
+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-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml
index 085d91514492..f80d46d0455f 100644
--- a/x11-plugins/compiz-plugins-main/metadata.xml
+++ b/x11-plugins/compiz-plugins-main/metadata.xml
@@ -7,4 +7,10 @@ Package with the base compiz-fusion plugins:
 animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
 scaleaddon, shift, snap, text, thumbnail, vpswitch,, wall, winrules, workarounds.
 </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>