gentoo resync : 27.01.2018

28 files changed, 29 insertions, 799 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 2097c386556d..24beb0a53a56 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index a7926b021598..d6b7dff23eac 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -17,13 +17,13 @@ DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f22229
 DIST awesome-4.0.tar.xz 930664 BLAKE2B b30f410272b1d1224a1a145523f71ac6779c9592b572f798ff924bc26e62bd55ee5a0d45bc9d0ea8faa8362333b8eea51fccf954a49c71ee3090a4ebbf7e4de7 SHA512 80bdfe5f9166f5e9b0266cd630b48607d17605330d0f172666dbfa3f239ef04aeafafebe8949c3bf1c31a7bd372b60252d56c815048a24e015858585c3d0432b
 DIST awesome-4.1.tar.xz 960768 BLAKE2B e3d77fdbfca7ddb041069fa6a9bf1406b4bfbe96b09b26b6ecf7a7ea081e4f6d7d7766b2f06a7e3cd4c59bb7e16450bdde5bfb9d9c0b6a3760500b25fe44b733 SHA512 e0c1ed5fc8f0455258ec2566e430b24e52b78d1ae54357f5de1bf08f2e44682e9b2c5548905a90cc4526d98d2b6700e087b679abc9e620d3751ea420df9434f6
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
-EBUILD awesome-3.5.6-r2.ebuild 3258 BLAKE2B 14a7d55e719ec88e11c1a9221a1748dda59edbbf2acfc1eb6307ff01b86a26f041a4587e0ed2df4795b513f5651a4390538fe819b9b3e93d7ea74de2753943f3 SHA512 1b86f1e13001f9fd0a20638d75d8c4f8ea6bf8bc9377b255ea709859fcecedf3f23293518f9ee856362bf85c7d8af0d9835833eda7bc34f5f872ecfc6aa91e1f
-EBUILD awesome-3.5.7.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-3.5.8.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-3.5.9.ebuild 3290 BLAKE2B 3a6cf99c8619122351eab49bf0e3c328ef17f09ee6a6c16cce4e74390aa6e019cdfaad5c07218968581e5d3f0e8bd8a41d513b2f44a16338ed2df95fb5eb06e8 SHA512 11e2bb8263f33ae6335ef058bafa726bd1cca3980de27f3e76f3b2a51bb625019a163e0ab8418051a152620605cea68f46487b9495e4c081d5fe7d1a67c597e0
-EBUILD awesome-4.0-r1.ebuild 3038 BLAKE2B caf8794df4f1d46a30157ef006db00f98d80ec1d8b074812178e217acb234c0ad834b93cd7398300a6b8e1a6310d1e57022591f91f9d49394dd85c9ee517c787 SHA512 0b27b64a823bd8d61214a0d405031b466b0886f351ecbcb3fc02483f88dd1e4e4b2e796c0b6da91d92bba9267cb241723b2f28d61a862a7cba94d49c529db26e
-EBUILD awesome-4.0.ebuild 2839 BLAKE2B 04c2a2b739de4866eebd50e5fbb6b1b922a507e942e1feb4aa15c29596599bbbd5da75f679012c64a64462c64bd72effbedfa6fb94df2bc7fa8dbad9c3693b27 SHA512 a083ed4b9ae277e8e4059031d8fd1e8ed37885bc0019ea8c44155ecfcee5e036432623e07951dcb5f38e3ec431bd7f99b257b42efde949c44a83e08e4eb42674
-EBUILD awesome-4.1.ebuild 3022 BLAKE2B 0934e4f6717846f0f35b394180b094e2ea5e00731a48ed66e1dee2953bf4be05814a7892d1b5c02deaa4a896fcc90aaa511cdc23d028540139450c1be68a3133 SHA512 b42632f71c5075dc83608b7d3b61d430f2e805b777bd1833f93eb1848307c71e4887ba445378cafd50a4c238c0d2290a0436515e7132c7edd16436a6b59dfbaf
-EBUILD awesome-4.2.ebuild 3027 BLAKE2B 6157bb753de7cf7f21210edb06ddcad806893daa32f5b133bbc1b0a23bc919a5abeb89fe551276de4449bde7b572cddafb3568e4d4c5396c58ad701096bc292c SHA512 588e1f7847d304c67563f66ea457b0d9c7880bbfc1aa0c9bf36e7428a9ccdd3d1ee396a2cf6ae8996a1085f61c329364dec36e3a7390093df81666ca03fd8922
-EBUILD awesome-9999.ebuild 2998 BLAKE2B 5d2bf333630b9f284a9e03641bb34c7ac1528b8fae70a21705f83795d0829891b5187e86a3f050adb182d0d0ca84847f4a19565f9d055a7fe6b1e9722d0ae535 SHA512 e8c24a3a9a290ae90bc6bde550c564ec85dac3237603e875382c552e6ae3661572732a526f1e02951f187da13b093288550448aadd107dfd3d01ce51f26d1b1c
+EBUILD awesome-3.5.6-r2.ebuild 3296 BLAKE2B 175df7a0d594d5e75bbfab520e08279a1bd5457f2db16350f94c298489591362c56ef863b835aee5f2cfc4cc06b3230a6cc5118d222c1a47987f2db410a7dc16 SHA512 c86b35ccb4a459bcef7c63af82a0de219148d2f0da1cad713c605e762a6d9ea3bc191807cf3994643989c12a341d08c5223122c406470ae60fa5c68bc39b092a
+EBUILD awesome-3.5.7.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-3.5.8.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-3.5.9-r1.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
+EBUILD awesome-4.0-r1.ebuild 3076 BLAKE2B 030077553d5d7c1cd1ddc10ba96dc4f69108ca024c94734dd4bbfbb94f5b2cfb2873a6263a9c039beb5aff944e7ffe7e2ab7302dc5b4ba95ecfdbe158e6eb44a SHA512 f5034489d448cf22e5109f3b72a6c124f4abcaeb848bc38ad6e1c26e7abd6eaa4dc362c4811b3f2acba36be1db4aa7b176e78e905882f64bad242da66078f532
+EBUILD awesome-4.0.ebuild 2877 BLAKE2B da62c6f864b75b4b01fbdef8b84eb29e6d0165d4676cbaa8672887be39d8653718d561372cc1645a5e6ef8bc0356da3af2b75355c8110a3e8a1595fcd3bcd332 SHA512 acc26e8d979e7d0b823021d0036b903907eb8706bf9937d49a33bd797f6fdfdea4680052cdb0c68c898aaa82a7554b04e449276a9080495a3ba16d83bc1eff44
+EBUILD awesome-4.1.ebuild 3060 BLAKE2B d54dfc50dad0cc9c6ac1ec30c6a3b47c80139a7f129a490b316b3fb6ee8a41d1724569ab919b9aca189285e6f5381cf99320924faf4005d70d78a718bf4a216a SHA512 3badbe13e5fc9a4036cde1453ce9dd91c7201ae8ff791763164dbabae4640bcd145759a4ed5a28b211edc43e49dcfe70424517e6874593dd5e74421e13310a21
+EBUILD awesome-4.2.ebuild 3065 BLAKE2B a33abec87e5eff8b561ade7a2f251749860b2a1930e14cd68c6730fb9141062d3e4b6c96e8c24630c79639264af96a4850edc346f93f789fe279f5b4a2aec973 SHA512 afb5a47b4c9031ffd6a243069b572234e29934cc9a0adc8ef0d99a17f0676382ca8e6b11950f711dafb36826e9d1b710a811eaa5eadecb4723080f050679720d
+EBUILD awesome-9999.ebuild 3036 BLAKE2B 5d5697c6cf1e558131aaa87617c1d95d8e4730e7bc27e05682156aecdfc101f27c3ba93ed597e93fb2b42a6a61c3c4b7a93e791bc93fd7290550922f53c370a5 SHA512 8741e66a1e5667485b017925d4b1648c2ecd2fe108bbb2d18d0c3c301849d9d3eaea643bb2c600e3a9f003711eabc167cb313485d2932cc478cadaae3c3d79ab
 MISC metadata.xml 678 BLAKE2B 4ef555e57fed17cdc504cb597fbc7702d617d506dcefc3a25471bdaf947209e9a973ef21b49dbf46c678b6da7a1d2a9881e6439a438ac842e4b325b789b62759 SHA512 c50888d616bc887cdf1aec26469da7d8a0041f7f1904e7aeed4b763866827def72f5a06d30ac2da3d04b7d0c05929d87fac60b45c9e6aa5d107e464b92ee6ff9
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index ada253ff8f8e..cd7b7ca16cae 100644
--- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.7.ebuild
+++ b/x11-wm/awesome/awesome-3.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.8.ebuild
+++ b/x11-wm/awesome/awesome-3.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-3.5.9.ebuild b/x11-wm/awesome/awesome-3.5.9-r1.ebuild
index c3473fd22bd5..839456e65e9c 100644
--- a/x11-wm/awesome/awesome-3.5.9.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild
index 3dddc28075a9..826268e38185 100644
--- a/x11-wm/awesome/awesome-4.0-r1.ebuild
+++ b/x11-wm/awesome/awesome-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild
index eed4554091af..ee9a7cf8b691 100644
--- a/x11-wm/awesome/awesome-4.0.ebuild
+++ b/x11-wm/awesome/awesome-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild
index 65af18c4d489..2e8cefe90f62 100644
--- a/x11-wm/awesome/awesome-4.1.ebuild
+++ b/x11-wm/awesome/awesome-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild
index 61644c037673..170a680ce24f 100644
--- a/x11-wm/awesome/awesome-4.2.ebuild
+++ b/x11-wm/awesome/awesome-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 243752a5d4a3..d26ba4a2ba97 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/libxkbcommon[X]
 	>=x11-libs/libX11-1.3.99.901
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${RDEPEND}
diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
deleted file mode 100644
index 4a0e6bd3e241..000000000000
--- a/x11-wm/compiz-fusion/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD compiz-fusion-0.8.8-r1.ebuild 741 BLAKE2B 05af5e3b435e33cbc96700b268e62630a751a9827a6ace81764424829aada0e02b9a29f97599a234e0a58c9513fa6708115688558f09efa64f8da1bd25c77065 SHA512 55ea1d89e96bae8450345a82abf6cfc377cc174f30d01c500b2765451a0397482f75539a7f3658efbb741ff7308c6cc546e63da6d821b6022deed26a7f784c26
-MISC metadata.xml 496 BLAKE2B badb6cdf863f2a53c564899354d164499dab0e36c83a49005789fa1517473210ea00c9395094752138ebe1d4411a0c5bbef0de153490f780ffeca539aed95bcf SHA512 4319841dc5d6e2bf1f93f451431279d7df82a716654fca252fda3436ac3a7fb9944aac2e906981b18615a86ffdb8f65b579d33034e929b53c97514f8d0a0b0a6
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
deleted file mode 100644
index 115d647215f9..000000000000
--- a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compiz Fusion (meta)"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emerald gnome unsupported"
-
-RDEPEND="
-	>=x11-wm/compiz-${PV}
-	>=x11-plugins/compiz-plugins-main-${PV}
-	>=x11-plugins/compiz-plugins-extra-${PV}
-	>=x11-misc/ccsm-0.8.4
-	emerald? ( >=x11-wm/emerald-${PV} )
-	gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
-	unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${PV} )"
-
-pkg_postinst() {
-	ewarn "If you want to try out simple-ccsm, you'll need to emerge it"
-	ewarn "If you want to use emerald, set the emerald use flag"
-}
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
deleted file mode 100644
index 3913b8881187..000000000000
--- a/x11-wm/compiz-fusion/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
-  <flag name="unsupported">Install the <pkg>x11-plugins/compiz-plugins-unsupported</pkg> package.</flag>
-</use>
-<longdescription>
-compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
-</longdescription>
-</pkgmetadata>
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
deleted file mode 100644
index 3add2240e711..000000000000
--- a/x11-wm/compiz/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX compiz-gcc-4.7.patch 999 BLAKE2B 015326252bb0c9132bbfdf71151ba0b669f91989a0e007b64201f0b8fce5a61ac5493371bac999adef6eac1f9c2f9019c4c6055ea67982a11696cf831e6587af SHA512 e08563d928578ad74faa29168b3c3442cc0ab4e908ff4f430a7e23bcb2057e3da10f9742e8abbdaad9df6f56a039134e8a32f73ae214e240065d6d4ddd3a92bf
-AUX compiz-manager 9835 BLAKE2B a77c11f00ac02d8b8d955e585a4bfb1dcea331844659e7f40a87d068458a9bb5c8b330a8cb2978ae79f9117e96c1b3a23305a26dac3afe91ac52dc1f58c152c8 SHA512 5cf4c1023754128c456d48db257a308461de0cbd9ebd427a4c281ada0b77659013723362959ae39fa31f24de36929fdfe6ea96d9788cba568f35d2dc86bc263a
-AUX compiz-no-gconf.patch 630 BLAKE2B 65147cc70530482a35ce309984f6090b28f991286e277aedb1eb4b9c4d5caab1a8cceb0da7abdfaf644803cf04e0cb78b17c347376c4ae665a07f4e2e23eaf46 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9
-AUX compiz.desktop 258 BLAKE2B ee7464d4e0ac53ecfc0731b063ec3b6a2530a909521f8a9df5ef380ce26bf9e84e23aef69390ca977d2db53edd3bdb7cbaa288f210da38bea1cf1151108c5876 SHA512 ab9084fe8d44a9a053e84483774d9db2b1b8def4fbb16ca9c74af18271ec0f7d3d7dbe607fa7e0687bbe6f6d9ef8ee17701e1a88c15adea822f45450f4ebb291
-DIST compiz-0.8.8.tar.bz2 1123892 BLAKE2B 0de05006efca091cc136c018fa265c42364d7c97654f8fc75e5b5ed80b0b30f50f20b1acd273dafccd2bfb592b1e7d4652ad45c4d3290c16edf5d5138a5be184 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644
-EBUILD compiz-0.8.8-r3.ebuild 3466 BLAKE2B 694eb0d03e0fb9c4644f6e65be7beb6a6cf2cbad416c951786c170ab708bae4cdc477fec0f820dd01778b7dae04015c354abdb1d74edfe5ddae06dbbe4ef5825 SHA512 6565dc9124563e8dfde7dac09dacfb2d017d937e3aed5982222f4195871984b4b1f3ea089f220dde73355cafe397ff25abba11233b02247cd2714bb423a9f850
-MISC metadata.xml 630 BLAKE2B 565c4597c33e3c26a59b163a5f05941caafbbbb00d0725ebf4c17bc50756e47da2c92bc6f8646053b199419627f0a3f1ebcbc7640054579598ddfc774d21d5a9 SHA512 6640ccef9ce07714d737e9dc682177c34e36927082c3a5fb1af1c115c2b173bc914a650f122a5845179b2f927d0b03538c0a3481790a9ea97966f9973309308f
diff --git a/x11-wm/compiz/compiz-0.8.8-r3.ebuild b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
deleted file mode 100644
index 36d5c22ae14c..000000000000
--- a/x11-wm/compiz/compiz-0.8.8-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gconf gtk +svg"
-
-COMMONDEPEND="
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/libpng:0=
-	>=media-libs/mesa-6.5.1-r1
-	>=x11-base/xorg-server-1.1.1-r1
-	>=x11-libs/libX11-1.4
-	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
-	virtual/glu
-	cairo? (
-		x11-libs/cairo[X]
-	)
-	dbus? (
-		>=sys-apps/dbus-1.0
-		dev-libs/dbus-glib
-	)
-	fuse? ( sys-fs/fuse )
-	gnome? (
-		>=gnome-base/gnome-control-center-2.16.1:2
-		gnome-base/gnome-desktop:2
-		gconf? ( gnome-base/gconf:2 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8.0:2
-		>=x11-libs/libwnck-2.18.3:1
-		x11-libs/pango
-	)
-	svg? (
-		>=gnome-base/librsvg-2.14.0:2
-		>=x11-libs/cairo-1.0
-	)
-"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
-"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/mesa-progs
-	x11-apps/xdpyinfo
-	x11-apps/xset
-	x11-apps/xvinfo
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
-	echo metadata/core.xml.in >> po/POTFILES.skip
-
-	# Patch for compatibility with gcc 4.7
-	epatch "${FILESDIR}"/${PN}-gcc-4.7.patch
-
-	if ! use gnome || ! use gconf; then
-		epatch "${FILESDIR}"/${PN}-no-gconf.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# We make gconf optional by itself, but only if gnome is also
-	# enabled, otherwise we simply disable it.
-	if use gnome; then
-		myconf="${myconf} $(use_enable gconf)"
-	else
-		myconf="${myconf} --disable-gconf"
-	fi
-
-	econf \
-		--enable-fast-install \
-		--disable-static \
-		--disable-gnome-keybindings \
-		--with-default-plugins \
-		$(use_enable svg librsvg) \
-		$(use_enable cairo annotate) \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-glib) \
-		$(use_enable fuse) \
-		$(use_enable gnome) \
-		$(use_enable gnome metacity) \
-		$(use_enable gtk) \
-		--disable-kde4 \
-		--disable-kde \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	# Install compiz-manager
-	dobin "${FILESDIR}"/compiz-manager
-
-	# Add the full-path to lspci
-	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die
-
-	# Fix the hardcoded lib paths
-	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die
-
-	# 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/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"
-	EOF
-
-	domenu "${FILESDIR}"/compiz.desktop
-}
-
-pkg_preinst() {
-	use gnome && use gconf && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	use gnome && use gconf && 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-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch
deleted file mode 100644
index 28315baec5b8..000000000000
--- a/x11-wm/compiz/files/compiz-gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
-@@ -59,6 +59,9 @@
- 
- #include "paintredirector.h"
- 
-+// header for gcc-4.7 compatibility
-+#include "unistd.h"
-+
- KWD::Window::Window (WId  parentId,
- 		     WId  clientId,
- 		     WId  frame,
---- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
-+++ configure.ac	2012-09-12 23:40:37.253686000 +0400
-@@ -72,11 +72,6 @@
-   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
--
-   if test "x$enable_ansi" = "xyes"; then
-     case " $CFLAGS " in
-     *[[\ \	]]-ansi[[\ \	]]*) ;;
-@@ -95,11 +90,6 @@
-   *[[\ \	]]-Wall[[\ \	]]*) ;;
-   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
-   esac
--
--  case " $CXXFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
- fi
- 
- AC_C_BIGENDIAN
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
deleted file mode 100644
index 74d45da2590e..000000000000
--- a/x11-wm/compiz/files/compiz-manager
+++ /dev/null
@@ -1,384 +0,0 @@
-#!/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 -m1 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
deleted file mode 100644
index d43e84de6815..000000000000
--- a/x11-wm/compiz/files/compiz-no-gconf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- 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])
diff --git a/x11-wm/compiz/files/compiz.desktop b/x11-wm/compiz/files/compiz.desktop
deleted file mode 100644
index 22cf642b2360..000000000000
--- a/x11-wm/compiz/files/compiz.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Compiz
-Name[en_GB]=Compiz
-Exec=compiz ccp
-NoDisplay=true
-# name we put on the WM spec check window
-X-GNOME-WMName=Compiz
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-X-GNOME-Autostart-Notify=true
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
deleted file mode 100644
index 3c7523d47903..000000000000
--- a/x11-wm/compiz/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="fuse">
-      Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.
-    </flag>
-    <flag name="gconf">
-      Enable the GConf-based configuration backend; it is not required
-      to work with GNOME, and might actually be faster if it's not
-      used.
-    </flag>
-  </use>
-  <longdescription>
-    compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
-  </longdescription>
-</pkgmetadata>
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
deleted file mode 100644
index 9bd344d3151a..000000000000
--- a/x11-wm/emerald/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX emerald-0.8.8-fix-cairo-crash.patch 460 BLAKE2B 8120a4e243ca5afa1f78e1613f1df07f100b8e47f1aa46e32efa0e160d63cd63f154a8a3b2ed2c1f149750f50975e5f46841bf1ac194315cba38edaf9be3cb58 SHA512 64859292aa31c52ae7ee02a650d5a156404aa595567a24b4b3ae8098f670f663fbaea5e69f9526ffef4dd8111326bf1900937ed239aefce4c13bb7e6c1029ab8
-AUX emerald-0.8.8-pkgconfig-pollution.patch 357 BLAKE2B 67bc0bccc1cee7d372ea1a2c3bc99a042e1fee0c7a575ea4198bada1500ba7815cba6288639e1d9c8bf4d13c4ccb85bb8156b4b1f3fc39ad4132086e99e1d173 SHA512 f3041aeb5e00476e6cf2f612427f33a28d28718fd20352f4bfc7cc19d246769b2db254f02bf3f2f26ecc2f47c7b6a9e945846a9b56a40dc8ff96bd904bc6d2bf
-DIST emerald-0.8.8.tar.bz2 528715 BLAKE2B a33443088011da93c139de4d35dbfb5bce3b287e3bec746a0c5a24b299fbf039a85c6d2a7bcab7d446c324282e7edca6a15afbbaa6f4a302c6e4dc6711c1b527 SHA512 c19300ed03b168a01d3c8b7fd90e9f594d5a8165b04d5228de2294301f31619f1126e9ce618e49d666e5b5609eb52ea1434f165f67dc6843ae17b6664305427e
-EBUILD emerald-0.8.8-r1.ebuild 1205 BLAKE2B fb9ec1ec65d949200f570ba03a1337c6170f73036cf0d51a74860e6df0ef81208004183fd4a91b6dffadef2c751909176feb2ca7b6b6872484c00f407d36868f SHA512 c018167e65d74b8faf0cd03e7f115208601c265ee5bcc49abc54dfcdabb0d14dd78c088c3a6590ce0bf996c1773c5e794b2aaad5320d4bd1bbed4d1d8eedada7
-MISC metadata.xml 294 BLAKE2B 930045cf8d7a81bc1fdc984ab3f3c8b06cf7fa2e89f5aeef3c72f8018be08ef10aec4a1908c18f48caab429e1618e2e522057103d7dfa19822eb373eafd44dac SHA512 f242070859c227a491ff306797f546b70e4ebbcc8c2d4753dec4df9db92fd3daedde225da9b5dd8391af1ecc45b6378dc3c22d2bc763e2b8d6859767089c51ac
diff --git a/x11-wm/emerald/emerald-0.8.8-r1.ebuild b/x11-wm/emerald/emerald-0.8.8-r1.ebuild
deleted file mode 100644
index 0c2f0e94a1af..000000000000
--- a/x11-wm/emerald/emerald-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-THEMES_RELEASE=0.5.2
-
-DESCRIPTION="Emerald Window Decorator"
-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"
-
-PDEPEND="~x11-themes/emerald-themes-${THEMES_RELEASE}"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.8.0:2
-	>=x11-libs/libwnck-2.14.2:1
-	>=x11-wm/compiz-${PV}
-"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.15
-"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
-
-src_prepare() {
-	# Fix pkg-config file pollution wrt #380197
-	eapply "${FILESDIR}/${P}-pkgconfig-pollution.patch"
-	# Fix crashes with some UTF-8 characters in window title
-	eapply "${FILESDIR}/${P}-fix-cairo-crash.patch"
-	# fix build with gtk+-2.22 - bug 341143
-	sed -i -e '/#define G[DT]K_DISABLE_DEPRECATED/s:^://:' \
-		include/emerald.h || die
-	# Fix underlinking
-	append-libs -ldl -lm
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-fast-install \
-		--disable-mime-update
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch b/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
deleted file mode 100644
index 34ba3585c963..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.8-fix-cairo-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/compiz-reloaded/emerald/commit/7f712c5f4fb2dbc8bbe298acc8fef239815aea08

-

---- a/src/main.c	2011-04-21 16:06:20.000000000 +0400

-+++ b/src/main.c	2016-09-01 14:35:08.142020100 +0300

-@@ -1644,6 +1644,7 @@

- 

- 	    /* ===================active text colors */

- 	    cairo_set_source_alpha_color(cr, &fs->text_halo);

-+	    pango_cairo_update_layout(cr, d->layout);

- 	    pango_cairo_layout_path(cr, d->layout);

- 	    cairo_stroke(cr);

- 

diff --git a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch b/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
deleted file mode 100644
index 7d8a784853fd..000000000000
--- a/x11-wm/emerald/files/emerald-0.8.8-pkgconfig-pollution.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libengine/emeraldengine.pc.in
-+++ b/libengine/emeraldengine.pc.in
-@@ -7,6 +7,7 @@
- Description: Library for Emerald Engines
- Version: @VERSION@
- 
--Requires: @EMERALD_REQUIRES@
--Libs: @EMERALD_LIBS@
-+Requires.private: @EMERALD_REQUIRES@
-+Libs: -L${libdir} -lemeraldengine
-+Libs.private: @EMERALD_LIBS@
- Cflags: @EMERALD_CFLAGS@ -I${includedir}/emerald
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
deleted file mode 100644
index 8243e00ccf6b..000000000000
--- a/x11-wm/emerald/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
-</pkgmetadata>
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index e501cd52fd42..4b246c6d799a 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -8,5 +8,5 @@ AUX 3.24.4-gudev-232.patch 1034 BLAKE2B 8f6bfbaa50dca872c6ad21eaef5b23af8d757491
 DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c
 DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3
 EBUILD mutter-3.22.4-r1.ebuild 4117 BLAKE2B 4d526168d3a2f353d03a3b7ce40f6f4d7cb26bfa11127b7c4c776c62db73e2510ff7703ba2ea6fd82b31dbec51606098213b3fcaa70a590fd26f24aae2c66b60 SHA512 36e28f4334d87b8d2319c19ec384593b2d8bba8e206b21d13e043ba3381cb8215ee5836d8427e0b4bb025efa23ea0f89175e6c04c278cb340f40d6961152d8a7
-EBUILD mutter-3.24.4.ebuild 3716 BLAKE2B d3dbc0238d89b4e85640c26e0edcb7989bcfe76048c67b826b80a6be32206992126e518a8f0b8f6bcc90f083932f9b9e07abea68ffeaa83b117b91b0cc8f6e79 SHA512 700111bb0ab9547013f42438de65aa025ea7c7c04058f08a7c2c39f42c8ad7d65a841fa0aed1e3708f834046ce07200e12cc366e27dca1b4d563f7d61ae5f95a
+EBUILD mutter-3.24.4.ebuild 3715 BLAKE2B 1f247be1fa63f9b81cf47b4160b74ac26255b0a4b4186d1420ca5d29f8217e9bfec07e3c650bd9cbba2a5de37fdfa26aa56353385aac0e0bba20ab8f2c791699 SHA512 81790eeba90028413e43bba871946516ab7a890ad36df1f7442acc4525fbee6b9178f7df6a8d27b8e80c0d78fa8f1b14d613e0001222f8078fe9e051b56b03f3
 MISC metadata.xml 325 BLAKE2B 3ee20e50b2bbbab4ac5083cf64dd2817b397a0e8a77895f5aa7197f016af1e958d6debe92e6e69c10319b1d468f80f16831aa57a0dda1f57173732056b5856c4 SHA512 2732e366e7870b21a854e6bccf57d479c754fe5a9cf17673c3a78e231a1b476b684fd97497f8ab51c57137d066f9bfa6590458f56e5f42c5c38e1cd00962fe80
diff --git a/x11-wm/mutter/mutter-3.24.4.ebuild b/x11-wm/mutter/mutter-3.24.4.ebuild
index f52fd7fb8eb0..8f31f1764842 100644
--- a/x11-wm/mutter/mutter-3.24.4.ebuild
+++ b/x11-wm/mutter/mutter-3.24.4.ebuild
@@ -12,7 +12,7 @@ SLOT="0/0"
 
 IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944