diff --git a/portage/package.unmask b/portage/package.unmask
index 825570b..c6c8498 100644
--- a/portage/package.unmask
+++ b/portage/package.unmask
@@ -6,7 +6,4 @@ x11-apps/simple-ccsm::pinkbyte
x11-libs/compiz-bcop::pinkbyte
x11-libs/compizconfig-backend-gconf::pinkbyte
x11-libs/compizconfig-backend-kconfig4::pinkbyte
-x11-plugins/compiz-plugins-extra::pinkbyte
-x11-plugins/compiz-plugins-main::pinkbyte
-x11-plugins/compiz-plugins-unsupported::pinkbyte
x11-wm/compiz-fusion::pinkbyte
diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
deleted file mode 100644
index dad7e2c..0000000
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX compiz-plugins-extra-0.8.8-libnotify.patch 701 RMD160 be292728a4da1e3647919feb8c377fd3b079d001 SHA1 f4a1db4145840d4ef61be6d08f35c44726b66798 SHA256 8ebc9f57ed80476387a8142facd60e231dd1aa70ff5df508421cd7ca27616bcc
-AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
-DIST compiz-plugins-extra-0.8.8.tar.bz2 2689953 RMD160 948fc491075f202759a31a3395fcd31deb6fa101 SHA1 ce592993696c0b5d4e0bb13171897b4c25b3844e SHA256 bdce203098c62370b01b87741b04d3d9bc37e918789acce07120c4f081d5bbe3
-EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1362 RMD160 cf9e0bcd591be126171e7265917d05b0dd2b6d1e SHA1 368395db9f46b20bca12cbb081f7f1e0110dd42f SHA256 14c848899c5e850fb57573461c87112965937116874aac9c5a2f1418fa8bdee4
-MISC metadata.xml 635 RMD160 254ac795726f3ed90c85945f1c3bca9597cfc1d2 SHA1 cae4d4184b4530628dac878f077bca339b2fec24 SHA256 e2023c254ee05395db536f19d88d1735ddcec97e260a50a5db717249e0f3ba93
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild
deleted file mode 100644
index 4b30607..0000000
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.5 2011/03/21 19:47:45 nirbheek Exp $
-
-EAPI="4"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Extra Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gconf libnotify"
-
-RDEPEND="
- >=gnome-base/librsvg-2.14.0:2
- virtual/jpeg:0
- >=x11-libs/compiz-bcop-${PV}
- >=x11-plugins/compiz-plugins-main-${PV}
- >=x11-wm/compiz-${PV}[gconf?]
- libnotify? ( x11-libs/libnotify )
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- >=sys-devel/gettext-0.15
- x11-libs/cairo
- gconf? ( gnome-base/gconf:2 )
-"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-src_prepare() {
- if ! use gconf; then
- epatch "${FILESDIR}"/${PN}-no-gconf.patch
- fi
- epatch "${FILESDIR}/${P}-libnotify.patch"
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-fast-install \
- --disable-static \
- $(use_enable gconf schemas) \
- $(use_with libnotify)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
-
-pkg_preinst() {
- use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
- use gconf && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch
deleted file mode 100644
index cb04c01..0000000
--- a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.8-libnotify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.org 2011-06-03 19:44:45.848405096 +0200
-+++ configure.ac 2011-06-03 19:50:54.353341075 +0200
-@@ -136,7 +136,7 @@
- PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no])
- AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes")
-
--PKG_CHECK_MODULES(LIBNOTIFY, libnotify gtk+-2.0, [have_libnotify=yes], [have_libnotify=no])
-+AC_ARG_WITH([libnotify], [AS_HELP_STRING([--with-libnotify], [Build with libnotify support @<:@default=auto@:>@])])
- AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes")
- if test "$have_libnotify" = yes; then
- AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin])
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
deleted file mode 100644
index 49bf16b..0000000
--- a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- 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-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
deleted file mode 100644
index 907c491..0000000
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-desktop-effects
-
->Package with several compiz-fusion plugins:
-addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
-goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
-
-
-
-
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
deleted file mode 100644
index d874ce5..0000000
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
-DIST compiz-plugins-main-0.8.8.tar.bz2 1230627 RMD160 b6835f95d2f5e3e46bf36fe4e5347b08debcda19 SHA1 3c99841b744ae6c4a3edf2019626484880607dc6 SHA256 c79278b5369660d6274661a2c196f1cb016ef2b5d34e30bd18dbaeb241bee248
-EBUILD compiz-plugins-main-0.8.8-r9999.ebuild 1199 RMD160 02afe6e70cb5bc8feed60ac8bb6e284ad4e815b8 SHA1 4bfeb171a8743ed3c4cc42b0a8e8d1ab929bc0e0 SHA256 4abdd82b1872e7f636c105535080d2b1d0c7a3ff8ff5b455c0ac7a2a58980baa
-MISC metadata.xml 612 RMD160 2c509701c4d10caa747d3d5ecdac89d591d92fba SHA1 fa635c34711c80e4f7d430c67421aeb7839daca1 SHA256 70c3031e9483ffa40727107ea5272d67501f24a44d2e7040356572490c4e34a6
diff --git a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild
deleted file mode 100644
index f92fe67..0000000
--- a/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.8-r9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/compiz-plugins-main-0.8.6-r1.ebuild,v 1.4 2011/03/21 19:50:33 nirbheek Exp $
-
-EAPI="4"
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Compiz Fusion Window Decorator Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gconf"
-
-RDEPEND="
- >=gnome-base/librsvg-2.14.0:2
- virtual/jpeg:0
- x11-libs/cairo
- >=x11-libs/compiz-bcop-${PV}
- >=x11-wm/compiz-${PV}[gconf?]
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- >=sys-devel/gettext-0.15
- gconf? ( gnome-base/gconf:2 )
-"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-src_prepare() {
- if ! use gconf; then
- epatch "${FILESDIR}"/${PN}-no-gconf.patch
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- --enable-fast-install \
- --disable-static \
- $(use_enable gconf schemas)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
-
-pkg_preinst() {
- use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
- use gconf && gnome2_gconf_install
-}
diff --git a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
deleted file mode 100644
index 63222a5..0000000
--- a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- 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-plugins-main/metadata.xml b/x11-plugins/compiz-plugins-main/metadata.xml
deleted file mode 100644
index f80d46d..0000000
--- a/x11-plugins/compiz-plugins-main/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-desktop-effects
-
-Package with the base compiz-fusion plugins:
-animation, colourfilter, expo, ezoom, jpeg, neg, opacify, put, resizeinfo, ring,
-scaleaddon, shift, snap, text, thumbnail, vpswitch,, wall, winrules, workarounds.
-
-
-
diff --git a/x11-plugins/compiz-plugins-unsupported/Manifest b/x11-plugins/compiz-plugins-unsupported/Manifest
deleted file mode 100644
index 182e01c..0000000
--- a/x11-plugins/compiz-plugins-unsupported/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST compiz-plugins-unsupported-0.8.8.tar.bz2 1155793 RMD160 d5aa9550ca8fadf3c968f5f9820b66b111b990bc SHA1 e3d47d2c5bb61b57b859c3541453136046f4e80a SHA256 0b2ed265eda34dd60e1155280cb944bef07499f5f8178fc2498c243b2809481e
-EBUILD compiz-plugins-unsupported-0.8.8-r9999.ebuild 833 RMD160 09dc20fa30fd770c05f8c4fa2adce437afe68af0 SHA1 0482daae6eab28912ba5ed91c0fe1765ddc59c45 SHA256 b7d066171cf19a3815a47fce78015cf14a89af8469a349d37d1a85ef2678061b
-MISC metadata.xml 586 RMD160 95d079833d5993cddce7367e5750dd30597688fe SHA1 3ef0bd09dcd77a37767f7163ce3af6f8957e0312 SHA256 628eb48cfaa4a337b9d01b233404238deff5e2dfc2618490c0737fce00fd8f8a
diff --git a/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8-r9999.ebuild
deleted file mode 100644
index 5e08eec..0000000
--- a/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.8-r9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-unsupported/compiz-plugins-unsupported-0.8.4-r1.ebuild,v 1.3 2011/03/21 19:51:02 nirbheek Exp $
-
-EAPI="4"
-
-DESCRIPTION="Compiz Fusion Window Decorator Unsupported Plugins"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=gnome-base/librsvg-2.14.0:2
- virtual/jpeg:0
- >=x11-libs/compiz-bcop-${PV}
- >=x11-plugins/compiz-plugins-main-${PV}
- >=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- >=sys-devel/gettext-0.15
- x11-libs/cairo
-"
-
-RESTRICT="mirror"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
diff --git a/x11-plugins/compiz-plugins-unsupported/metadata.xml b/x11-plugins/compiz-plugins-unsupported/metadata.xml
deleted file mode 100644
index 5f65de8..0000000
--- a/x11-plugins/compiz-plugins-unsupported/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- pinkbyte@mail.ru
- Pinkbyte
- Maintainer. Assign bugs to him
-
-
- naota@gentoo.org
- Naohiro Aota
- Proxy maintainer. CC him on bugs
-
-desktop-effects
-
-Package with several compiz-fusion plugins:
-fakeargb, mswitch, snow, tile.
-
-