Fix libGL.so.1.2 path in compiz-manager (bug #274762), update KDE4 dependencies (bug #277016), fix missing gconf flags in gnome plugin (bug #282807). Fix QA warnings, Drop old revisions.

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

9 files changed, 84 insertions, 417 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 082071db314c..d8e05737dc59 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.43 2009/06/12 03:09:39 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.44 2009/08/29 12:28:11 mrpouet Exp $
+
+*compiz-0.8.2-r3 (29 Aug 2009)
+
+  29 Aug 2009; Romain Perier <mrpouet@gentoo.org>
+  -compiz-0.6.2-r1.ebuild, -compiz-0.8.2.ebuild, -compiz-0.8.2-r1.ebuild,
+  -compiz-0.8.2-r2.ebuild, +compiz-0.8.2-r3.ebuild,
+  +files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch, files/compiz-manager,
+  metadata.xml:
+  Fix libGL.so.1.2 path in compiz-manager (bug #274762), update KDE4
+  dependencies (bug #277016), fix missing gconf flags in gnome plugin (bug
+  #282807), fix QA warnings, Drop old revisions.
 
 *compiz-0.8.2-r2 (12 Jun 2009)
 
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index d0199a185a27..6239b66c9a37 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,14 +1,11 @@
 AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1 f710dcfbd6274ff7bed3f264d284a4dcecb27254 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4
 AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
-AUX compiz-manager 9821 RMD160 c8329ddd31435e449780a01d8cc6b53ee90cdabb SHA1 40c0ef6ef65e8d5103bed9efbac2cbe96c7ca1de SHA256 3f03d39880bd3802370369f84614f7e48b2687c56c4d99d445a964b98c7fd811
+AUX compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch 1118 RMD160 cc6920723b29f89da29c7ca5df89770cf70d94a8 SHA1 5b0e790e0a0cc304b2510de53dee7648e0ca67c1 SHA256 071a9a8032a21cd560cb68eb172b2557bb997cffc750ba8212c2fd88443d9519
+AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
-DIST compiz-0.6.2.tar.gz 1784471 RMD160 6cc235570c3ac15573050b27198648045a85a804 SHA1 ab5ecad856049a12a803fe6c94c3e55cdfcb5f68 SHA256 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224
 DIST compiz-0.8.2.tar.gz 1751448 RMD160 e8bd6e6acd61d585451f1ecfc9fb9658e3faccec SHA1 e3e8022f488ab039d7a0d42400b67ebad063c1b9 SHA256 8ef19e2282c4df048f80a4c0cf61dcd2e92b17b2e2436f77372ccc13745dd5c7
-EBUILD compiz-0.6.2-r1.ebuild 1719 RMD160 44f0ccbf283f44219e3d124b2a0df9d64dbba538 SHA1 61e009aef49f3121621a1f50decf3ead5b1c7657 SHA256 0e91b045deb0bb68a45be919c8f9aa366df57ead9f1e88a47c747dada39790b8
-EBUILD compiz-0.8.2-r1.ebuild 3605 RMD160 ab5ddf1b575646d40ae21a1c7e68a26ec2cfd520 SHA1 3cdfbb576c0742cd501fc51682c4180d5d6b45d7 SHA256 92299a45c97239a3eb30d80236b3499b6fda12508179707979019ec9c397adc6
-EBUILD compiz-0.8.2-r2.ebuild 3579 RMD160 0cf38859f8beb436d41ef87683fdc7101e4b8b63 SHA1 536f7a766f9929c8559c4f9584d7c9d1e98df570 SHA256 6dd1b38b7f74186acd4e549faa7beaf17c2d7e6062d1915c326e326d291321bd
-EBUILD compiz-0.8.2.ebuild 3305 RMD160 5fe54351927982ab4084c27caae21b58b4422adf SHA1 4737728440532272db3e0d8497f9f227e79cda1d SHA256 8464478c1ac8b941bf163e7300abbd552b7e6d21f02d439ebd530473f0d2d345
-MISC ChangeLog 7448 RMD160 ce7de4361edeb673a5e6df7a03a6f73bfffeb28b SHA1 8596cf15e4b0f16c86896759319071c9b695d91c SHA256 3e92feb2456ef07f5b7ed63de9590fdef2b2adcf8aea6bf5e66bd47e4358933a
-MISC metadata.xml 539 RMD160 c2053bf5659c7d3246bb95de2a2779ffb0813731 SHA1 6ce46505eae0455d6ff939e62fba02b295867ef1 SHA256 f6ec1e0c8e763af9b4b1f2daa066922e60df7369e1c5c8ea110328def5cb2b4c
+EBUILD compiz-0.8.2-r3.ebuild 3558 RMD160 4bdf0e1aad78e59b0d21188a1ac7c6c10cc64645 SHA1 b76b612ad9ca5a2861da7621aa8fbb60226f1fed SHA256 230f4425c493499607f305f12de205ebdf6e40d5df8c2714a306457c6ec72b3f
+MISC ChangeLog 7943 RMD160 dddde3b8b6cbe7445e938ca8c4cbe06231891b9e SHA1 8966a9ecf04a5c70c92958ea0ec9de5a6c02cd95 SHA256 e01af95e1f1bb728819edb6b3b91b15a084d8131d871f10e6c0e4a1f198ca034
+MISC metadata.xml 502 RMD160 47964a1d3a920c089bfcf53140e4d6b432a6f040 SHA1 6ff05c98cd83c51b7912202b6c6f22541887f2ad SHA256 71c24630bf257ef8a7a0afe406963c43908aa8aeebb19046991927275289bdf6
diff --git a/x11-wm/compiz/compiz-0.6.2-r1.ebuild b/x11-wm/compiz/compiz-0.6.2-r1.ebuild
deleted file mode 100644
index 78d0e2b701d6..000000000000
--- a/x11-wm/compiz/compiz-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.6.2-r1.ebuild,v 1.6 2008/08/29 02:06:46 flameeyes Exp $
-
-EAPI=1
-
-inherit gnome2 eutils
-
-DESCRIPTION="3D composite- and windowmanager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus gnome kde svg"
-
-DEPEND=">=media-libs/mesa-6.5.1-r1
-	>=media-libs/glitz-0.5.6
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libXdamage
-	x11-libs/libXrandr
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	media-libs/libpng
-	>=x11-libs/gtk+-2.0
-	x11-libs/pango
-	x11-libs/startup-notification
-	gnome-base/gconf
-	>=x11-libs/libwnck-2.18.3
-	dev-libs/libxslt
-	gnome? ( >=gnome-base/gnome-control-center-2.16.1 )
-	svg? ( gnome-base/librsvg )
-	dbus? ( >=sys-apps/dbus-1.0
-			dev-libs/dbus-glib )
-	kde? (
-		|| ( kde-base/kwin:3.5 kde-base/kdebase:3.5 )
-		dev-libs/dbus-qt3-old )"
-
-RDEPEND="${DEPEND}
-	x11-apps/mesa-progs"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	x11-proto/xineramaproto
-	x11-proto/damageproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/compiz-0.6.2-CVE-2007-3920.patch"
-}
-
-src_compile() {
-	econf --with-default-plugins \
-		--enable-gtk \
-		--enable-gconf \
-		--disable-fuse \
-		`use_enable gnome` \
-		`use_enable gnome metacity` \
-		`use_enable kde` \
-		`use_enable svg librsvg` \
-		`use_enable dbus` \
-		`use_enable dbus dbus-glib` || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dobin "${FILESDIR}/0.3.6/compiz-start" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
diff --git a/x11-wm/compiz/compiz-0.8.2-r1.ebuild b/x11-wm/compiz/compiz-0.8.2-r1.ebuild
deleted file mode 100644
index fb65f036ee2a..000000000000
--- a/x11-wm/compiz/compiz-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r1.ebuild,v 1.2 2009/04/26 13:59:27 jmbsvicetto Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2-utils multilib
-
-DESCRIPTION="3D composite and windowmanager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/glitz-0.5.6
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libXrender-0.8.4
-	>=x11-libs/startup-notification-0.7
-	cairo? (
-			x11-libs/cairo[X]
-	)
-	dbus? ( >=sys-apps/dbus-1.0 )
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop
-		gnome-base/gconf:2
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3
-		x11-libs/pango
-	)
-	kde? (
-		|| ( kde-base/kwin:3.5
-			kde-base/kdebase:3.5
-		)
-		dev-libs/dbus-qt3-old
-	)
-	kde4? (
-		|| (
-			kde-base/kwin:4.2
-			kde-base/kwin:live
-		)
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-"
-
-RDEPEND="${DEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xvinfo"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto"
-
-src_prepare() {
-
-	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
-
-	use gnome || {
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-		ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4
-
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
-	}
-}
-
-src_configure() {
-	econf \
-		--disable-gnome-keybindings \
-		--enable-librsvg \
-		--with-default-plugins \
-		$(use_enable cairo annotate) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-glib) \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		$(use_enable kde) \
-		$(use_enable kde4) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install compiz-manager
-	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
-
-	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
-
-	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager"
-
-	# Create gentoo's config file
-	dodir /etc/xdg/compiz
-
-	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
-	COMPIZ_BIN_PATH="/usr/bin/"
-	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
-	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
-	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
-	KWIN="$(type -p kwin)"
-	METACITY="$(type -p metacity)"
-	SKIP_CHECKS="yes"
-	EOF
-
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-
-	insinto "/usr/share/applications"
-	doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
-}
-
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-
-	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
-	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
diff --git a/x11-wm/compiz/compiz-0.8.2-r2.ebuild b/x11-wm/compiz/compiz-0.8.2-r3.ebuild
index 8f773e4c0b60..8d64182381d8 100644
--- a/x11-wm/compiz/compiz-0.8.2-r2.ebuild
+++ b/x11-wm/compiz/compiz-0.8.2-r3.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-wm/compiz/compiz-0.8.2-r2.ebuild,v 1.1 2009/06/12 03:09:39 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r3.ebuild,v 1.1 2009/08/29 12:28:11 mrpouet Exp $
 
 EAPI="2"
 
-inherit autotools eutils gnome2-utils multilib
+inherit autotools eutils gnome2-utils
 
 DESCRIPTION="3D composite and windowmanager"
 HOMEPAGE="http://www.compiz.org/"
@@ -13,7 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
+IUSE="+cairo dbus fuse gnome gtk kde kde3 +svg"
 
 DEPEND="
 	dev-libs/glib:2
@@ -48,17 +48,17 @@ DEPEND="
 		x11-libs/pango
 	)
 	kde? (
+		|| (
+			>=kde-base/kwin-4.2.0
+			kde-base/kwin:live
+		)
+	)
+	kde3? (
 		|| ( kde-base/kwin:3.5
 			kde-base/kdebase:3.5
 		)
 		dev-libs/dbus-qt3-old
 	)
-	kde4? (
-		|| (
-			kde-base/kwin:4.2
-			kde-base/kwin:live
-		)
-	)
 	svg? (
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
@@ -79,19 +79,17 @@ src_prepare() {
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
 
-	use gnome || {
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-		ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4
+	# Missing gconf flags, fix bug #282807
+	epatch "${FILESDIR}"/${P}-gtk-gnome-missing-gconf-flags.patch
 
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
-	}
+	if ! use gnome; then
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	fi
+	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-gnome-keybindings \
+	econf --disable-gnome-keybindings \
 		--enable-librsvg \
 		--with-default-plugins \
 		$(use_enable cairo annotate) \
@@ -102,9 +100,8 @@ src_configure() {
 		$(use_enable gnome gconf) \
 		$(use_enable gnome metacity) \
 		$(use_enable gtk) \
-		$(use_enable kde) \
-		$(use_enable kde4) \
-		|| die "econf failed"
+		$(use_enable kde kde4) \
+		$(use_enable kde3 kde)
 }
 
 src_install() {
@@ -114,19 +111,19 @@ src_install() {
 	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
 
 	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
 
 	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager"
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
 
 	# Create gentoo's config file
-	dodir /etc/xdg/compiz
+	dodir /etc/xdg/compiz || die "dodir failed"
 
 	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
 	COMPIZ_BIN_PATH="/usr/bin/"
 	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
-	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
-	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
 	KWIN="$(type -p kwin)"
 	METACITY="$(type -p metacity)"
 	SKIP_CHECKS="yes"
diff --git a/x11-wm/compiz/compiz-0.8.2.ebuild b/x11-wm/compiz/compiz-0.8.2.ebuild
deleted file mode 100644
index 145ab2b108f0..000000000000
--- a/x11-wm/compiz/compiz-0.8.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2.ebuild,v 1.3 2009/04/25 16:06:37 ranger Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2-utils multilib
-
-DESCRIPTION="3D composite and windowmanager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/glitz-0.5.6
-	media-libs/libpng
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libICE
-	x11-libs/libSM
-	>=x11-libs/libXrender-0.8.4
-	>=x11-libs/startup-notification-0.7
-	cairo? (
-			x11-libs/cairo[X]
-	)
-	dbus? ( >=sys-apps/dbus-1.0 )
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop
-		gnome-base/gconf:2
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3
-		x11-libs/pango
-	)
-	kde? (
-		|| ( kde-base/kwin:3.5
-			kde-base/kdebase:3.5
-		)
-		dev-libs/dbus-qt3-old
-	)
-	kde4? (
-		|| (
-			kde-base/kwin:4.2
-			kde-base/kwin:live
-		)
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-"
-
-RDEPEND="${DEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xvinfo"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto"
-
-src_prepare() {
-
-	use gnome || {
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-		ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4
-
-		# required to apply the above patch
-		intltoolize --copy --force || die "intltoolize failed"
-		eautoreconf || die "eautoreconf failed"
-	}
-}
-
-src_configure() {
-	econf \
-		--disable-gnome-keybindings \
-		--enable-librsvg \
-		--with-default-plugins \
-		$(use_enable cairo annotate) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-glib) \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		$(use_enable kde) \
-		$(use_enable kde4) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install compiz-manager
-	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
-
-	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager"
-
-	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager"
-
-	# Create gentoo's config file
-	dodir /etc/xdg/compiz
-
-	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
-	COMPIZ_BIN_PATH="/usr/bin/"
-	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
-	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
-	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2"
-	KWIN="$(type -p kwin)"
-	METACITY="$(type -p metacity)"
-	SKIP_CHECKS="yes"
-	EOF
-
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
-
-pkg_postinst() {
-	use gnome && gnome2_gconf_install
-
-	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
-	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
-}
-
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
-}
diff --git a/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch b/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch
new file mode 100644
index 000000000000..e9888c3ff2c7
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch
@@ -0,0 +1,33 @@
+Author: Romain Perier <mrpouet@gentoo.org>
+Subject: Missing gconf flags for gnome plugin, fix bug #282807
+Date: 2009-08-29 12:25
+
+---
+ gtk/gnome/Makefile.am |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am
+index 208318a..d0a7c54 100644
+--- a/gtk/gnome/Makefile.am
++++ b/gtk/gnome/Makefile.am
+@@ -2,7 +2,7 @@ moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
+ 
+ if USE_GNOME
+ libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
+-libcompiz_la_LIBADD  = @GNOME_WINDOW_SETTINGS_LIBS@
++libcompiz_la_LIBADD  = @GNOME_WINDOW_SETTINGS_LIBS@ @GCONF_LIBS@
+ libcompiz_la_SOURCES = 		\
+ 	compiz-window-manager.c	\
+ 	compiz-window-manager.h
+@@ -76,8 +76,9 @@ if USE_GNOME_KEYBINDINGS
+ endif
+ endif
+ 
+-INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@			   \
+-	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
++INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@				\
++	@GCONF_CFLAGS@							\
++	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" 	\
+ 	-DLOCALEDIR="\"@datadir@/locale"\"
+ 
+ noinst_LTLIBRARIES = \
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
index 6e8fa5796474..3fbae21c0080 100644
--- a/x11-wm/compiz/files/compiz-manager
+++ b/x11-wm/compiz/files/compiz-manager
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Compiz Manager wrapper script
-#
+# 
 # Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,15 +24,15 @@
 # Much of this code is based on Beryl code, also licensed under the GPL.
 # This script will detect what options we need to pass to compiz to get it
 # started, and start a default plugin and possibly window decorator.
-#
+# 
 
 
 COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/lib/compiz/"
+PLUGIN_PATH="/usr/lib/compiz/" 
 GLXINFO="/usr/bin/glxinfo"
 KWIN="/usr/bin/kwin"
 METACITY="/usr/bin/metacity"
-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
 
 # For Xgl LD_PRELOAD
 LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
@@ -53,7 +53,7 @@ FALLBACKWM_OPTIONS="--replace $@"
 # Driver whitelist
 WHITELIST="nvidia intel ati radeon i810"
 
-# blacklist based on the pci ids
+# blacklist based on the pci ids 
 # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
 T="   1002:5954 1002:5854 1002:5955" # ati rs480
 T="$T 1002:4153" # ATI Rv350
@@ -122,10 +122,10 @@ check_fbconfig()
 {
 	verbose "Checking for FBConfig: "
 	if [ "$INDIRECT" = "yes" ]; then
-		$GLXINFO -i | grep -q GLX.*fbconfig
+		$GLXINFO -i | grep -q GLX.*fbconfig 
 		FB=$?
 	else
-		$GLXINFO | grep -q GLX.*fbconfig
+		$GLXINFO | grep -q GLX.*fbconfig 
 		FB=$?
 	fi
 
@@ -250,7 +250,7 @@ running_under_whitelisted_driver()
 	fi
 	for DRV in ${WHITELIST}; do
 		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
-		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
+		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
 		then
 			return 0
 		fi
@@ -341,7 +341,7 @@ if ! check_xgl; then
 	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
 		abort_with_fallback_wm
 	fi
-	# check if we have the required bits to run compiz and if not,
+	# check if we have the required bits to run compiz and if not, 
 	# fallback
 	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
 		abort_with_fallback_wm
@@ -381,3 +381,4 @@ elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]
 fi
 
 ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
+
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
index 2a128a53d67a..093c470babae 100644
--- a/x11-wm/compiz/metadata.xml
+++ b/x11-wm/compiz/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <use>
 	<flag name="fuse">Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.</flag>
-	<flag name="kde4">Compile the kde4 window decorator and add support for <pkg>kde-base/kdebase-startkde:4.1</pkg>.</flag>
+	<flag name="kde3">Compile the kde3 window decorator and add support for KDE3</flag>
 </use>
 <herd>desktop-effects</herd>
 <longdescription>