Fix bug #265223, replace $(use_enable gnome gconf) by $(use_enable gnome schemas) without it gconf schemas were not installed, Add inheritance from gnome2-utils.eclass to use gnome2_gconf_* functions. Drop old revision

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

3 files changed, 23 insertions, 7 deletions

diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index b9c2de7659f9..81e07ef3b52e 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-plugins/compiz-plugins-main
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.5 2009/04/25 16:05:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.6 2009/08/28 20:16:01 mrpouet Exp $
+
+*compiz-plugins-main-0.8.2-r1 (28 Aug 2009)
+
+  28 Aug 2009; Romain Perier <mrpouet@gentoo.org>
+  -compiz-plugins-main-0.8.2.ebuild,
+  +compiz-plugins-main-0.8.2-r1.ebuild:
+  Fix bug #265223, replace $(use_enable gnome gconf) by $(use_enable gnome
+  schemas) without it gconf schemas were not installed, Add inheritance from
+  gnome2-utils.eclass to use gnome2_gconf_* functions. Drop old revision.
 
   25 Apr 2009; Brent Baude <ranger@gentoo.org>
   compiz-plugins-main-0.8.2.ebuild:
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
index 1865b9f43971..eb1092c638c4 100644
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ b/x11-plugins/compiz-plugins-main/Manifest
@@ -1,6 +1,6 @@
 AUX compiz-plugins-main-0.8.2-xdamage-race.patch 1346 RMD160 b5ae8613aec891ef25f400007c4a3ab65343dfda SHA1 27611c3372831413571f1c821d114cd02563f3a0 SHA256 44d36e8a6113432bc93cf674ad96509dfc94a4fd804dbfc00c75625f49d1d500
 AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
 DIST compiz-plugins-main-0.8.2.tar.bz2 1169127 RMD160 36e0a258ff8287df2d517607c37f4df2b5e62725 SHA1 d733604cda891a95f8cb451bf70cb1ff8fd3f7c2 SHA256 d1c71500d4b84ac3a3767f0eb498bbfe22b8abcac8bc71dac6c7696de493ff1e
-EBUILD compiz-plugins-main-0.8.2.ebuild 1034 RMD160 47ed006bb68b6d54506eb5c78496f90c98a9f384 SHA1 20bec3db6262e915ee2fd4c85f1f6f54d4a79dc3 SHA256 d9419d71c524ea0ee3f5aca3cc2ec82644cfd4f95519fa83c98085b33b3b09ab
-MISC ChangeLog 1054 RMD160 c329879c26a049d02047bace3f7b353fef1bf698 SHA1 ccee2d33865b6e9052422961c882c414a117721a SHA256 b23df96811e7aba87cecd9c6e8698f3b93199249fdbc24bcbb8cc5d22fcfd9af
+EBUILD compiz-plugins-main-0.8.2-r1.ebuild 1170 RMD160 00f235a2c4c154b4d6c77a72c765ce56c1f0a4ed SHA1 11fc34530a84fa5188dd99d48b31917ca4f23311 SHA256 7b30c1619feb3dfa1d639f8aef6abaceb1a5f8508cb1320cb1fcb8b5dc0e579b
+MISC ChangeLog 1454 RMD160 6ff98d8ee71fa14c91f85f4e7f715a8243c5cc8f SHA1 afa4cf98b35c51cd063ff982631284f6d9fbe1ec SHA256 82284c8f181f4f08b648d1f8a0380b1867205f8ca9d3a85d2cf09ce2c7bc386e
 MISC metadata.xml 423 RMD160 ed3e1c4f2fcef78faf6d8b85b337f60b69c582f1 SHA1 554188b456adfdd2be58a825b83f5a2f75a1070e SHA256 63a22d1439257bac17c3a4e5a045bc2e07fbd13bde371f72cecdd0bd5cbe8742
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild
index a7873225bf31..e6837ebe0674 100644
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2.ebuild
+++ b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-main/compiz-plugins-main-0.8.2.ebuild,v 1.3 2009/04/25 16:05:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.2-r1.ebuild,v 1.1 2009/08/28 20:16:01 mrpouet Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils gnome2-utils
 
 DESCRIPTION="Compiz Fusion Window Decorator Plugins"
 HOMEPAGE="http://www.compiz.org/"
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/jpeg
 	x11-libs/cairo
 	~x11-libs/compiz-bcop-${PV}
-	~x11-wm/compiz-${PV}
+	~x11-wm/compiz-${PV}[gnome?]
 "
 
 DEPEND="${RDEPEND}
@@ -36,9 +36,16 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable gnome gconf) || die "econf failed"
+	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
+}