diff --git a/dev-python/compizconfig-python/Manifest b/dev-python/compizconfig-python/Manifest
index ce7427c8e..d534c00e1 100644
--- a/dev-python/compizconfig-python/Manifest
+++ b/dev-python/compizconfig-python/Manifest
@@ -1,4 +1,6 @@
 DIST compizconfig-python-0.7.2.tar.bz2 258046 RMD160 f074a73fea37368cafef3bb26f04af04264c583c SHA1 570e463f808b1ef133244d9fbe1e45fb7b888c65 SHA256 c9c15b18f2fba5d3b5e830cc58175ee288afdf6f9bc0cc7353e2f07ed2e077a0
 DIST compizconfig-python-0.7.4.tar.bz2 258121 RMD160 15ec9bf923873db543edecbcf660ddc4b49612aa SHA1 eff8c4dd28fbf66c05794bcf13c2b74606ea37f4 SHA256 2dc5a7dd7c9c4b385ec3bd42ac8e221e5a5382a171b6a5fde98315072e0b3979
+DIST compizconfig-python-0.7.6.tar.bz2 258300 RMD160 468a53f8be9e9141fbf46223c589088bbeaf8f98 SHA1 1a08d421511d93a9eb2614e92b3842a6712a3f23 SHA256 3aa5b2473b9bc7bcf3d35b8abfbac12b23ee09c47fef26330ec80d7446f3413c
 EBUILD compizconfig-python-0.7.2.ebuild 614 RMD160 d0d1853103ae5e61c5ec76d2b1ebb085a4b5cf93 SHA1 dd7bec94f48e104ea66f0b701ace8cc16c89cb49 SHA256 8bb915c0393687d7252d9a711d9832fe623ef3943d1ec5dea6b3f025a40917e2
 EBUILD compizconfig-python-0.7.4.ebuild 614 RMD160 d0d1853103ae5e61c5ec76d2b1ebb085a4b5cf93 SHA1 dd7bec94f48e104ea66f0b701ace8cc16c89cb49 SHA256 8bb915c0393687d7252d9a711d9832fe623ef3943d1ec5dea6b3f025a40917e2
+EBUILD compizconfig-python-0.7.6.ebuild 557 RMD160 34f7d1b790a8fcf03e20ec909884de4054e5bc9f SHA1 2e06b85b7d2071580c45e68cf2d88fda38928ac3 SHA256 ae8bc22c461b35bcffb98e3ac4db1f5ca68635e73c2c2f1602a2b61305cd83a7
diff --git a/dev-python/compizconfig-python/compizconfig-python-0.7.6.ebuild b/dev-python/compizconfig-python/compizconfig-python-0.7.6.ebuild
new file mode 100644
index 000000000..3d5b45927
--- /dev/null
+++ b/dev-python/compizconfig-python/compizconfig-python-0.7.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Compizconfig Python Bindings"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="
+	|| ( >=dev-lang/python-2.4 >=dev-lang/python-2.5 )
+	>=dev-libs/glib-2.6
+	dev-python/pyrex
+	~x11-libs/libcompizconfig-${PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-libs/compiz-bcop/Manifest b/x11-libs/compiz-bcop/Manifest
index 2d75d393e..27466d700 100644
--- a/x11-libs/compiz-bcop/Manifest
+++ b/x11-libs/compiz-bcop/Manifest
@@ -1,4 +1,6 @@
 DIST compiz-bcop-0.7.2.tar.bz2 70547 RMD160 2cdec55aa3f3301d6fbf081397f72c07449bd720 SHA1 0e81f7b31359ae3785db8e4cd904663d61a7614c SHA256 971b53c9300d06c0e17893f5469a049df66e15b4a04727b405f3a6cd695974ac
 DIST compiz-bcop-0.7.4.tar.bz2 70792 RMD160 752475e2a618bc2729ff01c5fcd171c919a70b46 SHA1 69b62fb138ad7fe335c70f7f5278ec4053c6fb4f SHA256 4ede68f7d56f9a14ad3cd6fd89690d88a7048bb41215fb88a1cbdc4298e2d3b5
+DIST compiz-bcop-0.7.6.tar.bz2 70736 RMD160 d833103002193c2db8bbae508368064f73233f06 SHA1 5a4d528311d76f43833a7dce9da427c56aaadcac SHA256 785b386f64ae73f78df0d2a401ac05bfef93c9d747cd5323dae1a2e70fdf3da5
 EBUILD compiz-bcop-0.7.2.ebuild 574 RMD160 b822ac9482ddece475dff95165a9c79b1f9c5a3d SHA1 57db9efd262746f3e405d00a4e36af3d253f611d SHA256 84af7bd30999c2f6ca107f5a2bdfc91bffab99e802cdf9fdb150ef66d9757a78
 EBUILD compiz-bcop-0.7.4.ebuild 574 RMD160 b822ac9482ddece475dff95165a9c79b1f9c5a3d SHA1 57db9efd262746f3e405d00a4e36af3d253f611d SHA256 84af7bd30999c2f6ca107f5a2bdfc91bffab99e802cdf9fdb150ef66d9757a78
+EBUILD compiz-bcop-0.7.6.ebuild 533 RMD160 2a0f00a1e520e6e28cd8afb885d81a94e8772bfc SHA1 294264f0d2d11e5d6c80b2ceca10a8308a483aa3 SHA256 6f7200a244ff86f59776e857198dcf10320f3dd921483277a414abd55054f2ae
diff --git a/x11-libs/compiz-bcop/compiz-bcop-0.7.6.ebuild b/x11-libs/compiz-bcop/compiz-bcop-0.7.6.ebuild
new file mode 100644
index 000000000..43bdf9ea6
--- /dev/null
+++ b/x11-libs/compiz-bcop/compiz-bcop-0.7.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Compiz Option code Generator"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/x11-libs/compizconfig-backend-gconf/Manifest b/x11-libs/compizconfig-backend-gconf/Manifest
index 05d3c543d..ab6d3f2b7 100644
--- a/x11-libs/compizconfig-backend-gconf/Manifest
+++ b/x11-libs/compizconfig-backend-gconf/Manifest
@@ -1,4 +1,6 @@
 DIST compizconfig-backend-gconf-0.7.2.tar.bz2 236011 RMD160 cab63adec591d1d0cc9b3f7f7eee07157fe1fd4b SHA1 a9d13c1aa1a66792d47fd4b2418400ff65a540bb SHA256 6ab7394af54cecf93e630fe596fa390d221c6bd3ae0777d9bc626d0b451531ba
 DIST compizconfig-backend-gconf-0.7.4.tar.bz2 236085 RMD160 aa58e6b97cc225919d89c4b042c16447980d3378 SHA1 63d04e9bcca5fe9e99871122d5c726aa1dc384ec SHA256 9e1e52498497aa684495dc7d1383b0e196daa8e5e19dcb008e8c834b7f406b3f
+DIST compizconfig-backend-gconf-0.7.6.tar.bz2 236135 RMD160 a399bd8494bd19f39da83ff928dd62ae56ea0b8a SHA1 88e29e503f59d4dad4519c5f3bc6e659882a3009 SHA256 20ff0da8baa7aa63e8280376478dc6b83f7041501330f892434f04d6d7173bfb
 EBUILD compizconfig-backend-gconf-0.7.2.ebuild 630 RMD160 e9ae048d7fcb43f943e844ffe00dbc637a41eb9b SHA1 300d9b21fb7e2c20f2b8c0e44a8f6691fdb3205e SHA256 05670e23af76f3be4d1e16df301f81ef1d3a7ef3b07259cc5578abd138a485f7
 EBUILD compizconfig-backend-gconf-0.7.4.ebuild 628 RMD160 604ae0be1baa692eefb1f92c7b42debdebc5f442 SHA1 f4b515d56c06bf4b0c3f7388023daa4b92b2d73a SHA256 0e194a81a985f5fca3bd85e58e9a55208e79b6ecc6c23cd05403dc2079fc2fbc
+EBUILD compizconfig-backend-gconf-0.7.6.ebuild 508 RMD160 0965ce4d66ddbfb066c9b9b1a95ddd3be10517af SHA1 d834102c8d017860a575db2bbe741e58d0e4ad3e SHA256 1c23f7ee3872d28e56622139233be7a6b454455f1d91eb155007eb7423de2ded
diff --git a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.6.ebuild b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.6.ebuild
new file mode 100644
index 000000000..c1ef22f3c
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Compizconfig Gconf Backend"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=">=gnome-base/gconf-2.0
+	~x11-libs/libcompizconfig-${PV}
+	~x11-wm/compiz-${PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-libs/compizconfig-backend-kconfig/Manifest b/x11-libs/compizconfig-backend-kconfig/Manifest
index 356dc2599..41e3bcb41 100644
--- a/x11-libs/compizconfig-backend-kconfig/Manifest
+++ b/x11-libs/compizconfig-backend-kconfig/Manifest
@@ -1,4 +1,6 @@
 DIST compizconfig-backend-kconfig-0.7.2.tar.bz2 412956 RMD160 e2987c74ee45189009023a95f0e34d07239cec07 SHA1 a019a008dd0a3989c25b53a98861551c47b3c0f2 SHA256 f57cb12caa0500594f871b38c2c223ba492a4ea554e6052ae6d1cae5c63a286d
 DIST compizconfig-backend-kconfig-0.7.4.tar.bz2 413211 RMD160 b79e0658456e4b62b9cf65c3fecc8d91dd32aedb SHA1 523479ace77b157d4599545b6c1471c2525009c6 SHA256 dfea0734e4352a842d26597d90bcc76a67918d9efbf18a3362040415b351528a
+DIST compizconfig-backend-kconfig-0.7.6.tar.bz2 413199 RMD160 72e206308dfdbddaa1377a50385a441c197d905b SHA1 859f26ec8e253737d35edd7bca62093ff187c95c SHA256 f3bb952a68b663557837806477df391ced7a7921a0f348a3c899c41990d92a34
 EBUILD compizconfig-backend-kconfig-0.7.2.ebuild 565 RMD160 5d6f892bb932d62b6b01ed0d57295929458796fe SHA1 cc1be173abd5ab45f0e1121274e1170d4d3b44c7 SHA256 d3ecdc034b6c3b37ef77bf7feae2954ff58f2d66e2a21cbf09359c5a7370c20b
 EBUILD compizconfig-backend-kconfig-0.7.4.ebuild 563 RMD160 559364feb196cd223b2b4cca275942165965d739 SHA1 9e2347dea8ccb4a954c98a04f0942a05682eccb6 SHA256 8a26f5c6f995dc2cd6060e29fcfd0f8864830b25998450274638ea231c9b80ec
+EBUILD compizconfig-backend-kconfig-0.7.6.ebuild 494 RMD160 0c2f33a060cc72360ffdf2786d1290dc33c34ea9 SHA1 02a482b228607bd499c6a92d85aed5478e8d7eaf SHA256 4e8c17a2b99cff2861f31751a199c16c8806243ff6fc8826383aafb539d7ad29
diff --git a/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.6.ebuild b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.6.ebuild
new file mode 100644
index 000000000..5d8665f7e
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ARTS_REQUIRED="never"
+inherit kde
+
+DESCRIPTION="Compizconfig Kconfig Backend"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="~x11-libs/libcompizconfig-${PV}
+	~x11-wm/compiz-${PV}"
+
+need-kde 3.5
+
+pkg_postinst() {
+	kde_pkg_postinst
+}
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
index 9d6f27dfb..d2ac75109 100644
--- a/x11-libs/libcompizconfig/Manifest
+++ b/x11-libs/libcompizconfig/Manifest
@@ -1,4 +1,6 @@
 DIST libcompizconfig-0.7.2.tar.bz2 325319 RMD160 1438e92f8ac64befe99622d4f8555191c974591e SHA1 c1915ea6fa8b923ad0dcf6ccae05e909a999703b SHA256 5f76d9c9be612ec18d2a4ead8bbde9a300358dccdf87c399690d17878b9a8a07
 DIST libcompizconfig-0.7.4.tar.bz2 324991 RMD160 29b17e4e276fa023e65c280d8d3902443cc97e68 SHA1 30d0de4e6caa7c398aa04733449d5ee7c7a95d87 SHA256 23d7df075c060b2b1b57582fd95e623617f236081b6cf468fc3a3e30a072b078
+DIST libcompizconfig-0.7.6.tar.bz2 325360 RMD160 023489e4e821bc23ecd647ba9cf49d4827c7bd63 SHA1 df84fd6ab4aa9f40975af8b526d1e1e27c9dc690 SHA256 622fcabd1f8f66a307df7d22c3307263066be8e4e8edbd09f8908676f1086e30
 EBUILD libcompizconfig-0.7.2.ebuild 598 RMD160 5df3cd060b018f44ea9cb184baa067d213407a5b SHA1 147d8bc05c332342f8cdfa9cd20f234f1b6e9a1c SHA256 e40cbce4464173b1d719e0458fc0e0b9d887e25342a68bcfdf21cc001e14c9d0
 EBUILD libcompizconfig-0.7.4.ebuild 597 RMD160 67b08064ceabd5931585278abfacbe7dcabc19ea SHA1 1842f5db04272aa6fc21e0388b395dc9bd8df6c7 SHA256 dffa86c784c888ca3e4e81da4f52e8c8ba75a6e9e487c2909cde1e77a5985397
+EBUILD libcompizconfig-0.7.6.ebuild 553 RMD160 fb44626eb1328e74a58ecdcc9513893585a00a22 SHA1 61e119706d5e634c97d10b74526bf94eaa511b22 SHA256 1fd98e535d8dfcdaa4ce7646e1f08c31a67585cfe47c692a0f85df3d5a18b599
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.7.6.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.7.6.ebuild
new file mode 100644
index 000000000..050a4d41f
--- /dev/null
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.7.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Compiz Configuration System (git)"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/libxml2
+	~x11-wm/compiz-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc TODO || "dodoc failed"
+}
diff --git a/x11-plugins/compiz-fusion-plugins-extra/Manifest b/x11-plugins/compiz-fusion-plugins-extra/Manifest
index 0b42aae77..71b5d48ce 100644
--- a/x11-plugins/compiz-fusion-plugins-extra/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-extra/Manifest
@@ -1,4 +1,7 @@
+AUX compiz-fusion-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
 DIST compiz-fusion-plugins-extra-0.7.2.tar.bz2 2504563 RMD160 2226991ac74fbaa6a7a6b1d44ada3db0ee4dc603 SHA1 619038129d685a02e744c46fe367a54c2e841d1d SHA256 0a8fac448cef132c4e653df34cdfdbb5297e257fb43470127d2711dfe7f3caa2
 DIST compiz-fusion-plugins-extra-0.7.4.tar.bz2 2593965 RMD160 621fbd4c0425d6c11ccc5d889a0280a61b9e1858 SHA1 2e419f255e6aba100c63ff2261d9cc332ad4d91c SHA256 7ce8c6f83d1d5e420887d3019f397f3db8a211743d4020e4de0a71cbd8afcc7e
+DIST compiz-fusion-plugins-extra-0.7.6.tar.bz2 2616691 RMD160 1f65e85a3c0daadbad572f29e68323a3b54532b3 SHA1 4acc3330fa00b4c5e005a70c48971fefe6bf003d SHA256 7a6a7a04c156f2e068b0079f844927ddc717dca0693f4b2022c2489125962d25
 EBUILD compiz-fusion-plugins-extra-0.7.2.ebuild 646 RMD160 0050f67ca13a30f1128c56758b80a26f77e763f4 SHA1 f3556a88e8471cec6aaee114d2152ace6ae6c10c SHA256 1fd66718f4e8476ff28e9bcd154881f84a31e226d498b3b08902f1a4d49d5ae4
 EBUILD compiz-fusion-plugins-extra-0.7.4.ebuild 653 RMD160 52d28079e9ba99398dc0b923b11940f1cced1a4c SHA1 a280f163ee3b8be181880956d3490ca27de04bef SHA256 36ae559c4ed45175a83e8022f1f6d5dcd8949321f9ddd7ab7edc1697e559fda6
+EBUILD compiz-fusion-plugins-extra-0.7.6.ebuild 1300 RMD160 28c11f17f16ad85e2bc8d4e7723de5d7ce413ed7 SHA1 6741f06a572367904074720a785e721721855b10 SHA256 528ed8ee50a4339a886d4131afe54e627858b62e4db72ba4547290dff8732c4c
diff --git a/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.6.ebuild b/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.6.ebuild
new file mode 100644
index 000000000..05196112d
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Compiz Fusion Window Decorator Extra Plugins"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=gnome-base/librsvg-2.14.0
+	media-libs/jpeg
+	~x11-libs/compiz-bcop-${PV}
+	~x11-plugins/compiz-fusion-plugins-main-${PV}
+	~x11-wm/compiz-${PV}"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.15
+	gnome? ( gnome-base/gconf )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo glitz ; then
+		einfo "Please rebuild cairo with USE=\"glitz\""
+		die "x11-libs/cairo missing glitz support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
+
+	if ! use gnome; then 
+		eautoreconf || die "eautoreconf failed"
+	fi
+}
+
+src_compile() {
+	filter-ldflags -znow -z,now
+	filter-ldflags -Wl,-znow -Wl,-z,now
+
+	econf $(use_enable gnome gconf) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/x11-plugins/compiz-fusion-plugins-extra/files/compiz-fusion-plugins-extra-no-gconf.patch b/x11-plugins/compiz-fusion-plugins-extra/files/compiz-fusion-plugins-extra-no-gconf.patch
new file mode 100644
index 000000000..49bf16be4
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-extra/files/compiz-fusion-plugins-extra-no-gconf.patch
@@ -0,0 +1,21 @@
+ configure.ac |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0a3d7c1..6f8356d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,11 +150,10 @@ if test x"$use_schemas" = x"yes"; then
+   fi
+   xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
+   AC_SUBST(xsltdir)
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+-
+ AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
+ if test "$use_schemas" = yes; then
+   AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])
diff --git a/x11-plugins/compiz-fusion-plugins-main/Manifest b/x11-plugins/compiz-fusion-plugins-main/Manifest
index 17d57168a..738efcce2 100644
--- a/x11-plugins/compiz-fusion-plugins-main/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-main/Manifest
@@ -1,4 +1,7 @@
+AUX compiz-fusion-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
 DIST compiz-fusion-plugins-main-0.7.2.tar.bz2 1189246 RMD160 7fb25ff3e951b206165171eddcfcf0a9d8246782 SHA1 ed6f03f8516af0a9e4d34051b4ca5eea2da0af09 SHA256 e4c6be68aae0c962e0ee2622bcb1173aec514ee93d08e952377d42f3f10148af
 DIST compiz-fusion-plugins-main-0.7.4.tar.bz2 1290956 RMD160 80f4e575b78c9815c524a9e28f2c8397dce53188 SHA1 fd8a9f979490f2f9c183da9b3e531c9168d51527 SHA256 e3d603250b8768348e0f763978466506ae5f52f9afa71e8ab74946edc17a68b6
+DIST compiz-fusion-plugins-main-0.7.6.tar.bz2 1339732 RMD160 6edebad53b75e6697a58b25d43dba2511ba857b9 SHA1 5f90a3b8c2402c19ee3a35b0f3904a680eacaa7d SHA256 c89d43f95706b7dd8d791e6e3132480d31b20ceef0db09b9bb2dddb1be6d28e7
 EBUILD compiz-fusion-plugins-main-0.7.2.ebuild 863 RMD160 4867fcebfbd509e524624a79cf7a3d6b589b84b2 SHA1 6f08221aa5149a1c1ed11368eb6b38c8af222709 SHA256 b6b9b162046f2141ed143845893952666880df59943b3e9fc6e64808e9411b7e
 EBUILD compiz-fusion-plugins-main-0.7.4.ebuild 861 RMD160 2b0d2dc4b9fc27074eb1abee3d9d23177c956f18 SHA1 7692ef15d16d66e0726007363458f29bf8a44608 SHA256 b003bd5eea571c4e3fab3d1be2ce698eead7c2bde430b9469368dc1e1dbc5b60
+EBUILD compiz-fusion-plugins-main-0.7.6.ebuild 1216 RMD160 80503a46dccd3bf2e24a9bf9b954bb11f5d7887f SHA1 0d6bf8fc5f511688b2a51eb0266d1273d9e7d99b SHA256 18c67eaaf4ce5b1ea45e82d62d249c41d44e59d1425d368a5577889372f3fe18
diff --git a/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.6.ebuild b/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.6.ebuild
new file mode 100644
index 000000000..6cf5f5e5f
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Compiz Fusion Window Decorator Plugins"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome"
+RESTRICT="mirror"
+
+RDEPEND=">=gnome-base/librsvg-2.14.0
+	media-libs/jpeg
+	~x11-libs/compiz-bcop-${PV}
+	~x11-wm/compiz-${PV}"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/gettext-0.15"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo glitz ; then
+		einfo "Please rebuild cairo with USE=\"glitz\""
+		die "x11-libs/cairo missing glitz support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
+
+	if ! use gnome; then 
+		eautoreconf || die "eautoreconf failed"
+	fi
+}
+
+src_compile() {
+	filter-ldflags -znow -z,now
+	filter-ldflags -Wl,-znow -Wl,-z,now
+
+	econf $(use_enable gnome gconf) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/x11-plugins/compiz-fusion-plugins-main/files/compiz-fusion-plugins-main-no-gconf.patch b/x11-plugins/compiz-fusion-plugins-main/files/compiz-fusion-plugins-main-no-gconf.patch
new file mode 100644
index 000000000..63222a5f1
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-main/files/compiz-fusion-plugins-main-no-gconf.patch
@@ -0,0 +1,22 @@
+ configure.ac |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 297a8cf..290e92b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,11 +171,10 @@
+ if test x"$use_schemas" = x"yes"; then
+   fi
+   xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
+   AC_SUBST(xsltdir)
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+-
+ AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
+ if test "$use_schemas" = yes; then
+   AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])
diff --git a/x11-plugins/compiz-fusion-plugins-unsupported/Manifest b/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
index 28b7aa7ed..fadb080f8 100644
--- a/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
@@ -1,4 +1,6 @@
 DIST compiz-fusion-plugins-unsupported-0.7.2.tar.bz2 711658 RMD160 522e4934c03984ccbfdeafbed60b9e28239c3ebe SHA1 e646199f778caef6c09ec6055a1a3f4279127507 SHA256 7a453bbe9ae01ef8af1fbec5e92630a5ef4217a823436e52e9dcb170c25201e9
 DIST compiz-fusion-plugins-unsupported-0.7.4.tar.bz2 759500 RMD160 e4f71153b1591e33ad8ef7f21cf84a38bc5520aa SHA1 f62adf73eae0a6c76c7636467e8f1cf6041e723a SHA256 645061a7b5ff1898a48264fc9ee3e43f717963277940d058de5d3d79d8fb810d
+DIST compiz-fusion-plugins-unsupported-0.7.6.tar.bz2 770847 RMD160 703f7c1acf697c93a4c37157e4f3b8f847c8efda SHA1 f931d0cd6cf6aa9ac8b8dd28affbb2265e053d82 SHA256 c0a480921617246a636126c1edde46af4a37a5f4bef76eecd65864713394d957
 EBUILD compiz-fusion-plugins-unsupported-0.7.2.ebuild 634 RMD160 a8a78e6d383845fc12cb3ea3cb69f30a18d403ea SHA1 f902e6391502be750c0923d45d88ff6d39ef6ab6 SHA256 f83797b9afe83a9e6306ad8f7105767184bc68aca1ea0b91e9bcd0fb45f92634
 EBUILD compiz-fusion-plugins-unsupported-0.7.4.ebuild 632 RMD160 2cd76c2a8b676ae00a422c93f79c33f798907d37 SHA1 23709e7fe28e4366fb8e6c273c79cc73ca75658e SHA256 728c52741a23e68713f7aaef85bc3c3b01f47b21f984407d8de0f3e70bbc4107
+EBUILD compiz-fusion-plugins-unsupported-0.7.6.ebuild 979 RMD160 b1f81254c80a0935720e1747c9f6dea8bed8da00 SHA1 d21d91ed22c73cc87702d54bffeb2ecd1614073d SHA256 9ba19c9725ab0c0e9f21b46ae9156ac98762cb1fa14491983b8ea60dd1cff78e
diff --git a/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.6.ebuild b/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.6.ebuild
new file mode 100644
index 000000000..3dd22f982
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit flag-o-matic
+
+DESCRIPTION="Compiz Fusion Window Decorator Unsupported Plugins"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="
+	>=gnome-base/librsvg-2.14.0
+	media-libs/jpeg
+	~x11-libs/compiz-bcop-${PV}
+	~x11-wm/compiz-${PV}"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/gettext-0.15"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo glitz ; then
+		einfo "Please rebuild cairo with USE=\"glitz\""
+		die "x11-libs/cairo missing glitz support"
+	fi
+}
+
+src_compile() {
+	filter-ldflags -znow -z,now
+	filter-ldflags -Wl,-znow -Wl,-z,now
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
index 6851302a3..8371ac8d2 100644
--- a/x11-wm/compiz-fusion/Manifest
+++ b/x11-wm/compiz-fusion/Manifest
@@ -1,2 +1,3 @@
 EBUILD compiz-fusion-0.7.2.ebuild 846 RMD160 e1c19e9e2a1d92cf3b07c772f13852a9ebf6b8db SHA1 a3673fba67d7c3d74d602bf10f59f7f888e716db SHA256 ea51637f723ffcf77eaf790692eae0befd62097380063195a4af8acb5a762dc2
 EBUILD compiz-fusion-0.7.4.ebuild 841 RMD160 ed041deb3d7ffa5d45d11843d52677388a354c59 SHA1 ed4c5c5b151836c84a7849cd5d26ddec24551c57 SHA256 48f33465b7b94434090a6c45b9d03d925ac8e434d0aa6b05b3ba5981885f812c
+EBUILD compiz-fusion-0.7.6.ebuild 991 RMD160 80fc10abb70a1a270d9dd463b8048dba09822e34 SHA1 9412f24b0a76a308017b17343ddfd2b42d75583d SHA256 217f4a9719287076de7fa5c8f3abef8c1170623fe64d20c37cce4d9c37bfdce0
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.7.6.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.7.6.ebuild
new file mode 100644
index 000000000..05c3704d3
--- /dev/null
+++ b/x11-wm/compiz-fusion/compiz-fusion-0.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="Compiz Fusion (meta)"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome kde unsupported"
+
+RDEPEND="~x11-wm/compiz-${PV}
+	~x11-plugins/compiz-fusion-plugins-main-${PV}
+	~x11-plugins/compiz-fusion-plugins-extra-${PV}
+	unsupported? ( ~x11-plugins/compiz-fusion-plugins-unsupported-${PV} )
+	~x11-apps/ccsm-${PV}
+	~x11-wm/emerald-${PV}
+	gnome? ( ~x11-libs/compizconfig-backend-gconf-${PV} )
+	kde? ( ~x11-libs/compizconfig-backend-kconfig-${PV} )"
+
+pkg_postinst() {
+	ewarn "If you want to try out simple-ccsm, you'll need to emerge it"
+	if ! use unsupported; then
+		einfo "Upstream provides an unsupported-package, which is not part of this meta ebuild."
+		einfo "To install it \"emerge compiz-fusion-plugins-unsupported\""
+		einfo "or re-emerge this ebuild with the \"unsupported\" USE flag."
+	fi
+}
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 8cef1f46e..d6c66df07 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,9 +1,14 @@
 AUX compiz-0.7.0-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.0-compiz-core.patch 342 RMD160 cf43fcf249ec4835cbd24171f335c619ac669695 SHA1 c9adf2c5f5b92549705f79d3cfcba766b069e90e SHA256 8ff04a1ece6eb39f6ab5b0b46b6a1f05a2b80e36223c3cbaecd7e722a67bf16e
 AUX compiz-0.7.0-configure.patch 271 RMD160 de160dc02bfec766282f876e8268943a9c1cb315 SHA1 4611407c4c72cdb7ced287e824a5c02362ba52e4 SHA256 39b89ea5666f847222c4c4a97fbf5062483bd0c387ebef0b28b21faa7bad3846
+AUX compiz-drop-xcb.patch 1310 RMD160 70c56b45843a37a4cdd58017a27d348ae35fdd1d SHA1 f0f1234a9f3e5f20ab1b271cd9e6ada8193ea363 SHA256 1510a0a4e76d4acd9853513bf8acdb721c6165fd2fba4593f34d8a9658711c98
+AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
+AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 DIST compiz-0.7.0.tar.gz 2513229 RMD160 fb0f505aa04e125c2b35e599b931eaad8f6c412f SHA1 59b019b6cd627140f44006876ee2b0c3ab92f150 SHA256 ab26cb9b4825807c572d2816d4030c39933d3c10f5142e6e22f5a2bf4613c8c2
 DIST compiz-0.7.2.tar.gz 1438583 RMD160 ee8788984f0ac91962237ccf4b99a79bd6059c50 SHA1 da3dbe8c5be19aa03529e8d3c7e32365c82a973b SHA256 b91dd7cb0d9a1cb02940a2a1ea1f214f9da5c488e69b152bd7762b03a1c10665
 DIST compiz-0.7.4.tar.gz 1440676 RMD160 33437c5926734e2e5a07866906871b798ed66143 SHA1 a204d9b70ac8abfb037ca3402452aa055f4aab71 SHA256 e2434768af482b186c867cd954800ad9453bcbdb33bc3a9682a245b4e3b22f24
+DIST compiz-0.7.6.tar.gz 1516276 RMD160 b5604cf43a96ef8843c45c3d0ea1af6b690291b4 SHA1 be55dada77dc0716a040c2b9e2d16a0fbc736180 SHA256 609d2df06dd5942364f880f32d746947ae624840338efef4b740ab63681f20be
 EBUILD compiz-0.7.0.ebuild 1675 RMD160 5264a64c314cd449608586636d19116e5e3c182e SHA1 afd29eeae99a185737651f8f3a1ad637b3e2e662 SHA256 5327d4c98f7d8231e25e561562a630462e915a07491b9852822960db50517f21
 EBUILD compiz-0.7.2.ebuild 2173 RMD160 f96dc46d98ecdd392cb5711468f4b749795a1373 SHA1 059dd90d2bc822674736b5184fdfda13d3b7e1a4 SHA256 cfd6ead3112a5506be6d8958d5294e5c0b87a894815e5d4774436d3e5e956db4
 EBUILD compiz-0.7.4.ebuild 2118 RMD160 b10bc0ac850fde1058ed829cf08fce52089d583c SHA1 b35c42405d8eabb0777315a67310355c56fa7eb5 SHA256 0a15bc42e23b7a84ba01b7466271dd568f0e4c0c138f372ee7a98291b2f6fd69
+EBUILD compiz-0.7.6.ebuild 3505 RMD160 433e0a1fa353d6e816b3d949bbe8a6bc0f17c4ed SHA1 39a63be178f99b58a3fa068d3391e8f0663df345 SHA256 77a5f302474bca7e2f127dcb87e62a3040ac859d8f76fd528ee2a6cd7a38590e
diff --git a/x11-wm/compiz/compiz-0.7.6.ebuild b/x11-wm/compiz/compiz-0.7.6.ebuild
new file mode 100644
index 000000000..029defcd2
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.7.6.ebuild
@@ -0,0 +1,134 @@
+# 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.5.0.ebuild,v 1.1 2007/04/24 01:51:02 hanno Exp $
+
+EAPI="1"
+
+inherit autotools eutils gnome2-utils multilib
+
+DESCRIPTION="3D composite- and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/compiz/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dbus fuse gnome gtk kde svg xcb"
+RESTRICT="mirror"
+
+DEPEND="
+	>=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/gtk+-2.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/startup-notification
+	x11-proto/damageproto
+	dbus? ( >=sys-apps/dbus-1.0 )
+	fuse? ( sys-fs/fuse )
+	gnome? (
+		>=gnome-base/gnome-control-center-2.16.1
+		gnome-base/gconf
+		>=x11-libs/libwnck-2.18.3
+		)
+	kde? (
+		|| ( kde-base/kwin:3.5
+			kde-base/kdebase:3.5 )
+			dev-libs/dbus-qt3-old )
+	svg? ( gnome-base/librsvg )
+	xcb? ( x11-libs/libxcb )
+"
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xvinfo"
+
+pkg_setup() {
+	ewarn "If the build fails with an XGetXCBConnection error"
+	ewarn "try this: eselect opengl set xorg-x11"
+	ewarn "and/or read this: http://www.sabayonlinux.org/forum/viewtopic.php?f=53&t=12933"
+
+	if use xcb && \
+		! built_with_use x11-libs/libX11 xcb && \
+		! built_with_use x11-libs/cairo xcb && \
+		! built_with_use media-libs/mesa xcb
+	then
+		eerror "Compiz now requires libX11, cairo and mesa to be built with xcb."
+		eerror "Please build libX11, cairo and mesa with USE=\"xcb\""
+		ewarn "Be warned that building libX11 with xcb support might break Java."
+		die "Build libX11, cairo and mesa with USE=\"xcb\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use gnome || epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	use xcb || epatch "${FILESDIR}"/${PN}-drop-xcb.patch
+
+	if use gnome || use xcb
+	then
+		# required to apply the above patches
+		eautoreconf || die "eautoreconf failed"
+		intltoolize --copy --force || die "intltoolize failed"
+		glib-gettextize --copy --force || die "glib-gettextize failed"
+	fi
+}
+
+src_compile() {
+	econf \
+		--with-default-plugins \
+		$(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) \
+		$(use_enable svg librsvg) || die "econf failed"
+
+	emake || die "emake 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"
+
+	# 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
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
+
+pkg_postinst() {
+	ewarn "Dont forget to restore your opengl config if you set it to xorg-x11!"
+}
diff --git a/x11-wm/compiz/files/compiz-drop-xcb.patch b/x11-wm/compiz/files/compiz-drop-xcb.patch
new file mode 100644
index 000000000..244948c73
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-drop-xcb.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index 8a45698..d82e5f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,8 +118,7 @@ AC_SUBST(imagedir)
+ metadatadir=$datadir/compiz
+ AC_SUBST(metadatadir)
+ 
+-COMPIZ_REQUIRES="x11-xcb    \
+-		 xcomposite \
++COMPIZ_REQUIRES="xcomposite \
+ 		 xfixes	    \
+ 		 xdamage    \
+ 		 xrandr	    \
+diff --git a/include/compiz-core.h b/include/compiz-core.h
+index ade40c5..47cac9c 100644
+--- a/include/compiz-core.h
++++ b/include/compiz-core.h
+@@ -33,7 +33,7 @@
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+-#include <X11/Xlib-xcb.h>
++#include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/extensions/Xdamage.h>
+ #include <X11/extensions/Xcomposite.h>
+@@ -716,8 +716,6 @@ typedef void (*FiniPluginForDisplayProc) (CompPlugin  *plugin,
+ struct _CompDisplay {
+     CompObject object;
+ 
+-    xcb_connection_t *connection;
+-
+     Display    *display;
+     CompScreen *screens;
+ 
+diff --git a/include/compiz.h b/include/compiz.h
+diff --git a/src/display.c b/src/display.c
+index 57cd520..9d9a3e1 100644
+--- a/src/display.c
++++ b/src/display.c
+@@ -2064,8 +2064,6 @@ addDisplay (const char *name)
+ 	return FALSE;
+     }
+ 
+-    d->connection = XGetXCBConnection (dpy);
+-
+     if (!compInitDisplayOptionsFromMetadata (d,
+ 					     &coreMetadata,
+ 					     coreDisplayOptionInfo,
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
new file mode 100644
index 000000000..3fbae21c0
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-manager
@@ -0,0 +1,384 @@
+#!/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
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#
+# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
+#
+# 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/" 
+GLXINFO="/usr/bin/glxinfo"
+KWIN="/usr/bin/kwin"
+METACITY="/usr/bin/metacity"
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+
+# For Xgl LD_PRELOAD
+LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
+LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+
+# Minimum amount of memory (in kilo bytes) that nVidia cards need
+# to be allowed to start
+# Set to 262144 to require 256MB
+NVIDIA_MEMORY="65536" # 64MB
+NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
+
+# For detecting what driver is in use, the + is for one or more /'s
+XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+
+FALLBACKWM="${METACITY}"
+FALLBACKWM_OPTIONS="--replace $@"
+
+# Driver whitelist
+WHITELIST="nvidia intel ati radeon i810"
+
+# 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
+T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12"  # intel 965
+BLACKLIST_PCIIDS="$T"
+unset T
+
+COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
+COMPIZ_PLUGINS=""
+ENV=""
+
+# Use emerald by default if it exist
+USE_EMERALD="yes"
+
+# No indirect by default
+INDIRECT="no"
+
+# Default X.org log if xset q doesn't reveal it
+XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
+
+# Set to yes to enable verbose
+VERBOSE="yes"
+
+# Echos the arguments if verbose
+verbose()
+{
+	if [ "x$VERBOSE" = "xyes" ]; then
+		printf "$*"
+	fi
+}
+
+# abort script and run fallback windowmanager
+abort_with_fallback_wm()
+{
+	if [ "x$SKIP_CHECKS" = "xyes" ]; then
+		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
+		return 0;
+	fi
+
+	verbose "aborting and using fallback: $FALLBACKWM \n"
+
+	if [ -x $FALLBACKWM ]; then
+		exec $FALLBACKWM $FALLBACKWM_OPTIONS
+	else
+		printf "no $FALLBACKWM found, exiting\n"
+		exit 1
+	fi
+}
+
+# Check for non power of two texture support
+check_npot_texture()
+{
+	verbose "Checking for non power of two support: "
+	if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "Not present. \n"
+		return 1;
+	fi
+
+}
+
+# Check for presence of FBConfig
+check_fbconfig()
+{
+	verbose "Checking for FBConfig: "
+	if [ "$INDIRECT" = "yes" ]; then
+		$GLXINFO -i | grep -q GLX.*fbconfig 
+		FB=$?
+	else
+		$GLXINFO | grep -q GLX.*fbconfig 
+		FB=$?
+	fi
+
+	if [ $FB = "0" ]; then
+		unset FB
+		verbose "present. \n"
+		return 0;
+	else
+		unset FB
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+
+# Check for TFP
+check_tfp()
+{
+	verbose "Checking for texture_from_pixmap: "
+	if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		if [ "$INDIRECT" = "yes" ]; then
+			unset LIBGL_ALWAYS_INDIRECT
+			INDIRECT="no"
+			return 1;
+		else
+			verbose "Trying again with indirect rendering:\n";
+			INDIRECT="yes"
+			export LIBGL_ALWAYS_INDIRECT=1
+			check_tfp;
+			return $?
+		fi
+	fi
+}
+
+# Check wether the composite extension is present
+check_composite()
+{
+	verbose "Checking for Composite extension: "
+	if xdpyinfo -queryExtensions | grep -q Composite ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "not present. \n";
+		return 1;
+	fi
+}
+
+# Detects if Xgl is running
+check_xgl()
+{
+	verbose "Checking for Xgl: "
+	if xvinfo | grep -q Xgl ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+# Check if the nVidia card has enough video ram to make sense
+check_nvidia_memory()
+{
+	MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
+	if [ $MEM -lt $NVIDIA_MEMORY ]; then
+		verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
+		return 1;
+	fi
+	return 0;
+}
+
+# Check for existence if NV-GLX
+check_nvidia()
+{
+	if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
+		return $NVIDIA_INTERNAL_TEST;
+	fi
+	verbose "Checking for nVidia: "
+	if xdpyinfo | grep -q NV-GLX ; then
+		verbose "present. \n"
+		NVIDIA_INTERNAL_TEST=0
+		return 0;
+	else
+		verbose "not present. \n"
+		NVIDIA_INTERNAL_TEST=1
+		return 1;
+	fi
+}
+
+# Check if the max texture size is large enough compared to the resolution
+check_texture_size()
+{
+	TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
+	RESOLUTION=$(xdpyinfo  | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
+	VRES=$(echo $RESOLUTION | sed 's/.*x//')
+	HRES=$(echo $RESOLUTION | sed 's/x.*//')
+	verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
+	if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
+		verbose "Failed.\n"
+		return 1;
+	fi
+	verbose "Passed.\n"
+	return 0
+}
+
+# check driver whitelist
+running_under_whitelisted_driver()
+{
+	LOG=$(xset q|grep "Log file"|awk '{print $3}')
+	if [ "$LOG" = "" ]; then
+	    verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
+	    LOG=$XORG_DEFAULT_LOG;
+	fi
+	if [ -z "$LOG" ];then
+		verbose "AIEEEEH, no Log file found \n"
+		verbose "$(xset q) \n"
+	return 0
+	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; 
+		then
+			return 0
+		fi
+	done
+	verbose "No whitelisted driver found\n"
+	return 1
+}
+
+# check pciid blacklist
+have_blacklisted_pciid()
+{
+	OUTPUT=$(lspci -n)
+	for ID in ${BLACKLIST_PCIIDS}; do
+		if echo "$OUTPUT" | egrep -q "$ID"; then
+			verbose "Blacklisted PCIID '$ID' found \n"
+			return 0
+		fi
+	done
+	OUTPUT=$(lspci -vn | grep -i VGA)
+	verbose "Detected PCI ID for VGA: $OUTPUT\n"
+	return 1
+}
+
+build_env()
+{
+	if check_nvidia; then
+		ENV="__GL_YIELD=NOTHING "
+	fi
+	if [ "$INDIRECT" = "yes" ]; then
+		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+	fi
+	if check_xgl; then
+		if [ -f ${LIBGL_NVIDIA} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+			verbose "Enabling Xgl with nVidia drivers...\n"
+		fi
+		if [ -f ${LIBGL_FGLRX} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+			verbose "Enabling Xgl with fglrx ATi drivers...\n"
+		fi
+	fi
+
+	ENV="$ENV FROM_WRAPPER=yes"
+
+	if [ -n "$ENV" ]; then
+		export $ENV
+	fi
+}
+
+build_args()
+{
+	if [ $INDIRECT = "yes" ]; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
+	fi
+	if check_nvidia; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
+	fi
+}
+
+####################
+# Execution begins here.
+
+# Read configuration from XDG paths
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+	test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
+fi
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+	test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .  $XDG_CONFIG_HOME/compiz/compiz-manager
+fi
+
+# Don't use compiz when running the failsafe session
+if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
+	abort_with_fallback_wm
+fi
+
+if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
+	INDIRECT="yes";
+fi
+
+# if we run under Xgl, we can skip some tests here
+if ! check_xgl; then
+	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
+	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, 
+	# fallback
+	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
+		abort_with_fallback_wm
+	fi
+
+	if check_nvidia && ! check_nvidia_memory; then
+		abort_with_fallback_wm
+	fi
+
+	if ! check_fbconfig; then
+		abort_with_fallback_wm
+	fi
+fi
+
+# load the ccp plugin if present and fallback to plain gconf if not
+if [ -f ${PLUGIN_PATH}libccp.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
+elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+fi
+
+# get environment
+build_env
+build_args
+
+# start the gtk-window-decorator if present
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+	verbose "Starting emerald\n"
+	${COMPIZ_BIN_PATH}emerald --replace &
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+	verbose "Starting gtk-window-decorator\n"
+	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
+elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+	verbose "Starting kde-window-decorator\n"
+	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+	FALLBACKWM="${KWIN}"
+fi
+
+${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
+
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch
new file mode 100644
index 000000000..d43e84de6
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-no-gconf.patch
@@ -0,0 +1,20 @@
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b09153..9c22ea0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+ AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
+ if test "$use_gconf" = yes; then
+   AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])