diff --git a/dev-python/compizconfig-python/Manifest b/dev-python/compizconfig-python/Manifest
index c351afdc4..ce7427c8e 100644
--- a/dev-python/compizconfig-python/Manifest
+++ b/dev-python/compizconfig-python/Manifest
@@ -1,2 +1,4 @@
 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
 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
diff --git a/dev-python/compizconfig-python/compizconfig-python-0.7.4.ebuild b/dev-python/compizconfig-python/compizconfig-python-0.7.4.ebuild
new file mode 100644
index 000000000..e19110c4e
--- /dev/null
+++ b/dev-python/compizconfig-python/compizconfig-python-0.7.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/compizconfig-python/compizconfig-python-0.6.0.1.ebuild,v 1.6 2007/11/14 13:50:21 hanno Exp $
+
+DESCRIPTION="libcompizconfig 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=""
+
+DEPEND=">=x11-libs/libcompizconfig-${PV}
+	>=dev-libs/glib-2.6
+	dev-python/pyrex"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/x11-apps/ccsm/Manifest b/x11-apps/ccsm/Manifest
index 3b7b2df14..7ba006ad7 100644
--- a/x11-apps/ccsm/Manifest
+++ b/x11-apps/ccsm/Manifest
@@ -1,2 +1,4 @@
 DIST ccsm-0.7.2.tar.bz2 451473 RMD160 adbd26bca58e68afb8f1e95bd15c3475e32f4912 SHA1 85a986c658ec7f4e34c0675dcc966938cf1585dd SHA256 2e62be829b40e61d4cea67703a99a1100d0ba955959976b98d56f53786df7572
+DIST ccsm-0.7.4.tar.bz2 453850 RMD160 6605c55e08e4539710ef34e7aff80e720c87e345 SHA1 4db10e6a7da0c0d5bb2982dda2697f3a6588a670 SHA256 bbafe652ab2dd2c0e99718dc68a80a17410995836ef2c855c8e61029feeec708
 EBUILD ccsm-0.7.2.ebuild 638 RMD160 c3bb3e0dfb0409a9cd94e5d0c17804d61038b333 SHA1 80df6de8d69de927d9d4d3afece958b87858625b SHA256 c4a263c4ec95855d711121adf8326abb7f191b6c093405852949493a3c3d25e9
+EBUILD ccsm-0.7.4.ebuild 638 RMD160 c3bb3e0dfb0409a9cd94e5d0c17804d61038b333 SHA1 80df6de8d69de927d9d4d3afece958b87858625b SHA256 c4a263c4ec95855d711121adf8326abb7f191b6c093405852949493a3c3d25e9
diff --git a/x11-apps/ccsm/ccsm-0.7.4.ebuild b/x11-apps/ccsm/ccsm-0.7.4.ebuild
new file mode 100644
index 000000000..9fd1144bf
--- /dev/null
+++ b/x11-apps/ccsm/ccsm-0.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ccsm/ccsm-0.6.0.ebuild,v 1.4 2008/02/24 21:23:30 eva Exp $
+
+inherit distutils
+
+DESCRIPTION="Compizconfig Settings Manager"
+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=""
+
+DEPEND="dev-python/compizconfig-python
+	>=dev-python/pygtk-2.10"
+
+DOCS="AUTHORS PKG-INFO"
+
+src_compile() {
+	distutils_src_compile --prefix=/usr
+}
+
+src_install() {
+	distutils_src_install --prefix=/usr
+}
diff --git a/x11-libs/compiz-bcop/Manifest b/x11-libs/compiz-bcop/Manifest
index 65d8cc13f..2d75d393e 100644
--- a/x11-libs/compiz-bcop/Manifest
+++ b/x11-libs/compiz-bcop/Manifest
@@ -1,2 +1,4 @@
 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
 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
diff --git a/x11-libs/compiz-bcop/compiz-bcop-0.7.4.ebuild b/x11-libs/compiz-bcop/compiz-bcop-0.7.4.ebuild
new file mode 100644
index 000000000..3d19f470b
--- /dev/null
+++ b/x11-libs/compiz-bcop/compiz-bcop-0.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/compiz-bcop/compiz-bcop-0.6.0.ebuild,v 1.4 2007/10/25 13:58:39 tester Exp $
+
+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=""
+
+DEPEND="dev-libs/libxslt"
+
+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 21ca42458..b79ddf85b 100644
--- a/x11-libs/compizconfig-backend-gconf/Manifest
+++ b/x11-libs/compizconfig-backend-gconf/Manifest
@@ -1,2 +1,4 @@
 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
 EBUILD compizconfig-backend-gconf-0.7.2.ebuild 630 RMD160 e9ae048d7fcb43f943e844ffe00dbc637a41eb9b SHA1 300d9b21fb7e2c20f2b8c0e44a8f6691fdb3205e SHA256 05670e23af76f3be4d1e16df301f81ef1d3a7ef3b07259cc5578abd138a485f7
+EBUILD compizconfig-backend-gconf-0.7.4.ebuild 630 RMD160 e9ae048d7fcb43f943e844ffe00dbc637a41eb9b SHA1 300d9b21fb7e2c20f2b8c0e44a8f6691fdb3205e SHA256 05670e23af76f3be4d1e16df301f81ef1d3a7ef3b07259cc5578abd138a485f7
diff --git a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.4.ebuild b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.4.ebuild
new file mode 100644
index 000000000..04f90ce00
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.6.0.ebuild,v 1.5 2007/10/25 13:52:10 tester Exp $
+
+DESCRIPTION="libcompizconfig 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=""
+DEPEND=">=x11-wm/compiz-${PV}
+	>=x11-libs/libcompizconfig-${PV}
+	>=gnome-base/gconf-2.0"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/x11-libs/compizconfig-backend-kconfig/Manifest b/x11-libs/compizconfig-backend-kconfig/Manifest
index d814d9fa0..627dd8931 100644
--- a/x11-libs/compizconfig-backend-kconfig/Manifest
+++ b/x11-libs/compizconfig-backend-kconfig/Manifest
@@ -1,2 +1,4 @@
 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
 EBUILD compizconfig-backend-kconfig-0.7.2.ebuild 565 RMD160 5d6f892bb932d62b6b01ed0d57295929458796fe SHA1 cc1be173abd5ab45f0e1121274e1170d4d3b44c7 SHA256 d3ecdc034b6c3b37ef77bf7feae2954ff58f2d66e2a21cbf09359c5a7370c20b
+EBUILD compizconfig-backend-kconfig-0.7.4.ebuild 565 RMD160 5d6f892bb932d62b6b01ed0d57295929458796fe SHA1 cc1be173abd5ab45f0e1121274e1170d4d3b44c7 SHA256 d3ecdc034b6c3b37ef77bf7feae2954ff58f2d66e2a21cbf09359c5a7370c20b
diff --git a/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.4.ebuild b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.4.ebuild
new file mode 100644
index 000000000..0ed63a741
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/compizconfig-backend-kconfig/compizconfig-backend-kconfig-0.6.0.ebuild,v 1.5 2007/11/01 01:08:14 tester Exp $
+
+inherit kde
+
+DESCRIPTION="libcompizconfig kde config 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=""
+
+DEPEND=">=x11-wm/compiz-${PV}
+	>=x11-libs/libcompizconfig-${PV}"
+
+need-kde 3.5
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
index 0ba7725ef..90165d318 100644
--- a/x11-libs/libcompizconfig/Manifest
+++ b/x11-libs/libcompizconfig/Manifest
@@ -1,2 +1,4 @@
 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
 EBUILD libcompizconfig-0.7.2.ebuild 598 RMD160 5df3cd060b018f44ea9cb184baa067d213407a5b SHA1 147d8bc05c332342f8cdfa9cd20f234f1b6e9a1c SHA256 e40cbce4464173b1d719e0458fc0e0b9d887e25342a68bcfdf21cc001e14c9d0
+EBUILD libcompizconfig-0.7.4.ebuild 598 RMD160 5df3cd060b018f44ea9cb184baa067d213407a5b SHA1 147d8bc05c332342f8cdfa9cd20f234f1b6e9a1c SHA256 e40cbce4464173b1d719e0458fc0e0b9d887e25342a68bcfdf21cc001e14c9d0
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.7.4.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.7.4.ebuild
new file mode 100644
index 000000000..351449909
--- /dev/null
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.7.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/libcompizconfig-0.6.0.ebuild,v 1.4 2007/10/25 13:51:10 tester Exp $
+
+DESCRIPTION="Compiz configuration library"
+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=""
+
+DEPEND=">=x11-wm/compiz-0.7.2
+	dev-libs/libxml2"
+
+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 d53a80cdd..142442d4b 100644
--- a/x11-plugins/compiz-fusion-plugins-extra/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-extra/Manifest
@@ -1,2 +1,4 @@
 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
 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 646 RMD160 0050f67ca13a30f1128c56758b80a26f77e763f4 SHA1 f3556a88e8471cec6aaee114d2152ace6ae6c10c SHA256 1fd66718f4e8476ff28e9bcd154881f84a31e226d498b3b08902f1a4d49d5ae4
diff --git a/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.4.ebuild b/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.4.ebuild
new file mode 100644
index 000000000..742a6c7af
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.7.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-0.6.0.ebuild,v 1.5 2007/10/25 14:02:29 tester Exp $
+
+DESCRIPTION="Compiz Fusion 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=""
+RESTRICT="test"
+
+DEPEND="x11-plugins/compiz-fusion-plugins-main"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/x11-plugins/compiz-fusion-plugins-main/Manifest b/x11-plugins/compiz-fusion-plugins-main/Manifest
index 03c8141d1..4bcc5a581 100644
--- a/x11-plugins/compiz-fusion-plugins-main/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-main/Manifest
@@ -1,2 +1,4 @@
 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
 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 863 RMD160 4867fcebfbd509e524624a79cf7a3d6b589b84b2 SHA1 6f08221aa5149a1c1ed11368eb6b38c8af222709 SHA256 b6b9b162046f2141ed143845893952666880df59943b3e9fc6e64808e9411b7e
diff --git a/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.4.ebuild b/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.4.ebuild
new file mode 100644
index 000000000..156ae6f42
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.7.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-fusion-plugins-main/compiz-fusion-plugins-main-0.6.0.ebuild,v 1.7 2007/10/31 00:26:38 hanno Exp $
+
+DESCRIPTION="Compiz Fusion main 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="jpeg"
+RESTRICT="test"
+
+DEPEND=">=x11-wm/compiz-${PV}
+	jpeg? ( media-libs/jpeg )
+	>=gnome-base/librsvg-2.14.0
+	>=x11-libs/compiz-bcop-${PV}
+	>=sys-devel/gettext-0.15
+	>=dev-libs/libxml2-2.6.30"
+
+src_compile() {
+	econf $(use_enable jpeg) || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/x11-plugins/compiz-fusion-plugins-unsupported/Manifest b/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
index 185560dba..4094f5309 100644
--- a/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
+++ b/x11-plugins/compiz-fusion-plugins-unsupported/Manifest
@@ -1,2 +1,4 @@
 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
 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 634 RMD160 a8a78e6d383845fc12cb3ea3cb69f30a18d403ea SHA1 f902e6391502be750c0923d45d88ff6d39ef6ab6 SHA256 f83797b9afe83a9e6306ad8f7105767184bc68aca1ea0b91e9bcd0fb45f92634
diff --git a/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.4.ebuild b/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.4.ebuild
new file mode 100644
index 000000000..28226bc5c
--- /dev/null
+++ b/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-fusion-plugins-unsupported/compiz-fusion-plugins-unsupported-0.6.0.ebuild,v 1.5 2007/10/25 14:25:45 tester Exp $
+
+DESCRIPTION="Compiz Fusion 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="test"
+DEPEND=">=x11-wm/compiz-${PV}
+	>=x11-libs/compiz-bcop-${PV}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
index 85768df99..52f6355b5 100644
--- a/x11-wm/compiz-fusion/Manifest
+++ b/x11-wm/compiz-fusion/Manifest
@@ -1 +1,2 @@
 EBUILD compiz-fusion-0.7.2.ebuild 846 RMD160 e1c19e9e2a1d92cf3b07c772f13852a9ebf6b8db SHA1 a3673fba67d7c3d74d602bf10f59f7f888e716db SHA256 ea51637f723ffcf77eaf790692eae0befd62097380063195a4af8acb5a762dc2
+EBUILD compiz-fusion-0.7.4.ebuild 846 RMD160 e1c19e9e2a1d92cf3b07c772f13852a9ebf6b8db SHA1 a3673fba67d7c3d74d602bf10f59f7f888e716db SHA256 ea51637f723ffcf77eaf790692eae0befd62097380063195a4af8acb5a762dc2
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.7.4.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.7.4.ebuild
new file mode 100644
index 000000000..c652962b8
--- /dev/null
+++ b/x11-wm/compiz-fusion/compiz-fusion-0.7.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz-fusion/compiz-fusion-0.6.0.ebuild,v 1.3 2007/11/01 01:10:01 tester Exp $
+
+DESCRIPTION="Compiz Fusion meta package"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome kde"
+
+DEPEND="
+	>=x11-plugins/compiz-fusion-plugins-main-${PV}
+	>=x11-plugins/compiz-fusion-plugins-extra-${PV}
+	>=x11-themes/emerald-themes-0.5.2
+	>=x11-apps/ccsm-${PV}
+	gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
+	kde? ( >=x11-libs/compizconfig-backend-kconfig-${PV} )"
+
+pkg_postinst() {
+	einfo "Upstream provides an unsupported-package, which is not part of this meta ebuild."
+	einfo "To install it \"emerge compiz-fusion-plugins-unsupported\"."
+}
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index f972ceb7e..37128ffba 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -3,5 +3,7 @@ AUX compiz-0.7.0-compiz-core.patch 342 RMD160 cf43fcf249ec4835cbd24171f335c619ac
 AUX compiz-0.7.0-configure.patch 271 RMD160 de160dc02bfec766282f876e8268943a9c1cb315 SHA1 4611407c4c72cdb7ced287e824a5c02362ba52e4 SHA256 39b89ea5666f847222c4c4a97fbf5062483bd0c387ebef0b28b21faa7bad3846
 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
 EBUILD compiz-0.7.0.ebuild 1669 RMD160 7de2c7488e5732c8ed3895e4953972bb9fe00a76 SHA1 33ff1f332279d76b1ab0aeb0da50596520134888 SHA256 d5304802b4603fe845700eaf6864f6e60a05ce639c12d2be42bd1595eb712c2f
 EBUILD compiz-0.7.2.ebuild 2167 RMD160 4e55c515494f7a150cf4c2e0f3c57bd71b7f5e11 SHA1 19ccacf902007563e4920b759f4308d963451855 SHA256 aff86eac33cdcafafa76ab23407452de6bb80bb6029f812d9ef7f76fbbd22e8a
+EBUILD compiz-0.7.4.ebuild 2167 RMD160 f78bb882bea3bb57ee3ffd830b91778706cf3b4c SHA1 d3cd8783030a444c4092093ac729f5978e897f8e SHA256 8997efe192bd6897ad7f913979e37f47df0358682194995fe86750bcfa5afa1c
diff --git a/x11-wm/compiz/compiz-0.7.4.ebuild b/x11-wm/compiz/compiz-0.7.4.ebuild
new file mode 100644
index 000000000..8474655e8
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.7.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 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.2 2007/11/26 16:51:23 corsair Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="3D composite- and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+RESTRICT="nomirror"
+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 gnome kde kde4 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
+	x11-libs/libxcb
+	gnome-base/gconf
+	>=x11-libs/libwnck-2.18.3
+	dev-libs/libxslt
+	gnome? ( >=gnome-base/control-center-2.16.1 )
+	svg? ( gnome-base/librsvg )
+	dbus? ( >=sys-apps/dbus-1.0 )
+	kde? (
+		|| ( kde-base/kdebase:3.5 kde-base/kwin:3.5 )
+		dev-libs/dbus-qt3-old )"
+
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs"
+
+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"
+
+	built_with_use libX11 xcb && \
+	built_with_use cairo xcb && \
+	built_with_use mesa xcb || \
+	die "libX11, cairo and mesa must all be built with the xcb useflag!"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/compiz-0.7.0-CVE-2007-3920.patch"
+	epatch "${FILESDIR}/compiz-0.7.0-configure.patch"
+	epatch "${FILESDIR}/compiz-0.7.0-compiz-core.patch"
+}
+
+src_compile() {
+	econf --with-default-plugins \
+		--enable-gtk \
+		--enable-gconf \
+		`use_enable gnome` \
+		`use_enable gnome metacity` \
+		`use_enable kde` \
+		`use_enable kde4` \
+		`use_enable svg librsvg` \
+		`use_enable dbus` \
+		`use_enable dbus dbus-glib` || die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
+
+pkg_postinst() {
+	ewarn "Dont forget to restore your opengl config if you set it to xorg-x11!"
+}
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
index ff99bc3ba..0aabee830 100644
--- a/x11-wm/emerald/Manifest
+++ b/x11-wm/emerald/Manifest
@@ -1,2 +1,4 @@
 DIST emerald-0.7.2.tar.bz2 581083 RMD160 8a3f9849f092474bcd4d343f80ff26414ce70fc6 SHA1 b364bd0d19ed8add92796cb28fc8bab4dfdb3e76 SHA256 c9d0c6c2fc39cb4a5596b78f7be20da2f5c0c63bcc912eaaa879c31b87df6dd7
+DIST emerald-0.7.4.tar.bz2 581507 RMD160 e299e46113311ab079daaaeb28db3291def71b45 SHA1 a591ca207531323b57aa5dc86a066d2893f06e83 SHA256 a59db8a20ab932955be1d0645e867d891ada534ab79a13a8500fdc4636c81483
 EBUILD emerald-0.7.2.ebuild 591 RMD160 66c3114d60a870b277f32a541cc1ebd482f5699f SHA1 a968a5907d96a85e874f7e6c0b45008ebf7696d6 SHA256 7bd0d84234bdb794b7d321914cf7d70aed0be106e2104de980b3cc09e12cf17d
+EBUILD emerald-0.7.4.ebuild 591 RMD160 66c3114d60a870b277f32a541cc1ebd482f5699f SHA1 a968a5907d96a85e874f7e6c0b45008ebf7696d6 SHA256 7bd0d84234bdb794b7d321914cf7d70aed0be106e2104de980b3cc09e12cf17d
diff --git a/x11-wm/emerald/emerald-0.7.4.ebuild b/x11-wm/emerald/emerald-0.7.4.ebuild
new file mode 100644
index 000000000..3fc67e8db
--- /dev/null
+++ b/x11-wm/emerald/emerald-0.7.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.5.2.ebuild,v 1.4 2007/11/26 16:52:11 corsair Exp $
+
+inherit gnome2
+
+DESCRIPTION="Emerald window decorator, part of Compiz Fusion"
+HOMEPAGE="http://compiz-fusion.org"
+SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND=">=x11-libs/gtk+-2.8.0
+	>=x11-libs/libwnck-2.14.2
+	>=x11-wm/compiz-0.6.2"
+
+DOCS="TODO README AUTHORS"