gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-wm
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
87 files changed, 486 insertions, 838 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 30f747804f42..80280e055d14 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 86e8b8405597..f9efa9ff1c2f 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,6 +1,6 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12-r1.ebuild 800 BLAKE2B f8f5eea9b6db3dadc7a3dd30e864324158f55fd917f0fffcefeebe97f2b9a41ef55ad145fdf3592debec8414b2649e3d36cff94ad1a14b3fcad7689c099c986b SHA512 b03191aa54b4090e80333dba75e3a0c027e2f758144170848bd081bd5c98a8e5a58422836c4623f1b8e6a8ac964304f8e9c57dd560eaedb1ee9f18ea48a8b5f8
-EBUILD aewm-1.3.12.ebuild 924 BLAKE2B 3e672f88b219b1ea92d04f73236f101236afc9df4ae0e87c9b9968966b6eede4eed8f4b8a70f548b4b2c4d66511d157c1794d76652cfb46738761c5e4f105097 SHA512 be091793244569e0d64bd6e004a675fb1872d0133c176b2060cf1f620d9e6cef4a190ffcc6e15bea09f27e4623799a82858a11be21860f4166123c754f7cfc6a
+EBUILD aewm-1.3.12-r1.ebuild 827 BLAKE2B 9b7f046d9e26ec59ea37f922b218de494a4659abf6188075beae5d47698eb6d3a878e72d4cdacd82ab1b2c3632bf9a0174ea5d3197bed4c84a1b14e4c6611c64 SHA512 f41cf36caceb9deb29cdfa8d47f0124101a4e26266ab4f24cd2ca4b11aba1d2cb3acf0c14f3c14b43d416f2ee8a211169b0023b010713c6f8ab57dd485ff2518
+EBUILD aewm-1.3.12.ebuild 951 BLAKE2B c5a64882fbd441afe25a4cf8b6aa63a4ce5bcea3ca3d48b4e26ac01f1305425f1c6ae023fa909442e133e2d3409d4349a29da363380b27b7a69b7be3273c7e8a SHA512 2b35a53725d8324c7d16bab1e7396d1bbe9faa28f76ad572bc1a8faca91cf195021914efbab3d8697ff86594b7fc2e05ce62bbd0188672315e998c3c6da3b7d8
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
index e0a143a90091..c0d52983ed89 100644
--- a/x11-wm/aewm/aewm-1.3.12-r1.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A minimalistic X11 window manager"
 HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+SRC_URI="https://www.red-bean.com/decklin/aewm/${P}.tar.bz2"
 
 LICENSE="MIT 9wm"
 SLOT="0"
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
index 747d4455d975..ce671fffdc4b 100644
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="A minimalistic X11 window manager"
 HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+SRC_URI="https://www.red-bean.com/decklin/aewm/${P}.tar.bz2"
 
 LICENSE="MIT 9wm"
 SLOT="0"
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index dcc19931d1f3..e66f553de8f8 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -13,8 +13,8 @@ AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5a
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-3.5.9-r2.ebuild 3267 BLAKE2B f519ac55294cfc2a83105c24841eb1a2e50062d51a001ca8755c80555dcec6053e97f2021fc781e5d8fabe8451469c3df14980ed452b74467f024f3b79dc6619 SHA512 a87845d24e4d307fc8e7b44984312a389748a0c2b45e219806741f8c62bc8921b9535a4d4867dd2019e4973d281c4fa5c42920100bd0da1f2ef18e5d961c7096
-EBUILD awesome-4.2-r2.ebuild 4035 BLAKE2B 3be21e28b04474f1a00b7dcd9ba475621b1497e5ddec0abca0fdfa6f1886fd76daefeac7f98a988174551660c29cca0db0201bad5864240780bf5223f04d7a82 SHA512 4d65e4b5db4ac47ebf060e1227c31615d793b92d32bc53f0fe851f0265e612a1e4e96d76149041135bbde9cdc316c06c330742446c37c4c08832d42a8e4864fd
-EBUILD awesome-4.3.ebuild 3686 BLAKE2B 52dc4a4e1c32c827d2f6959b520f2ab85d48253bda43c82d3868ae337241f8cd8a1113c6fc8e2a197fd60953ac0f46ade809e450b67b9c2ae5515d855c99a253 SHA512 96d285068b309b0bd4839aa1c54bbbef4fb045fb6477d9f8109fe54dbaaf5075117dc24e0ef4fffc0cc51d8e912feda89f158e41e215eaf48c5d1044029576a5
-EBUILD awesome-9999.ebuild 3641 BLAKE2B 9633653cae787ede99239c46c5f974ae125f45c33caf7e3de494259c9934595bb55345a11aebccbfa1673e5ab9f1b7d598f41e5e30820372335f6508a089ebc7 SHA512 a07b36d9bc54dc831a9b81027d45ce4b3360f9c6556829a55e34f3e1449a4c1e77b9f1e89a32fa7f52d58963ff93d63cfc1a05c029cf0ab54d7afec0ac665e83
+EBUILD awesome-3.5.9-r3.ebuild 3272 BLAKE2B 9f98b3835f62419c0e890ebc78d123714cc748824d5ff370e83d098cd70c8f9387e7da101addb26100651f4d12527ab20267cb1e3056609b951e4537e68cfe2d SHA512 d336fdd35b882f7ea6fcac95ca3923734d899cc07f594fab8b3082e8deab94d57fa462154db6e5d317b8c89227a4c35822cc21383a9a4bdb3388c9d34f1d09d0
+EBUILD awesome-4.2-r3.ebuild 4040 BLAKE2B 70e8f434cc5529b8a936b40175c697b6a6a259a22122203f6cf25f56e0d16f455dcd1f497f09c29465f9ffaa8a05fab1460d42b2cba5867b1b66db9253766d94 SHA512 1475c897fe3118f2c867cc1be35239e25c2d8be85c424745a134a3ce45192b2329ccd0a85f798d67c00af07438f72e0ee06fa285a7490fea135a6a0ea5d9aca8
+EBUILD awesome-4.3-r1.ebuild 3691 BLAKE2B fb97627a397df7907731334973e755a1a361c812ea756e45b2415be768cff4bb6e66f5921896879e455c96e654f26be964fd8a89529ebebea9dbbe217fb8f2a8 SHA512 5eb8e24e3e991d88b03431d2bbf27a085d346853a1560d1106ed51bbff3c69ea9a8d61d967d6e76dfc57dbc0c89300468064a2354f93846d15f7b7e1d6f35635
+EBUILD awesome-9999.ebuild 3646 BLAKE2B 2ea63b2da7437fa85c82b4f48c7165dab620b683802c25f2318b9876244075b24b36fe2a664f0be1fd419f163bf75ce0264c69e4588e3d010b4be953104e0f12 SHA512 f83c61f3af6bd1a7a9633cade4ea7422b70a7b9c7c5ded0695f8697c0da9ae21789e6fd5ba15caf04b1f3fec7d93cdad6407a3e8a656efdf1d51a668bd179fb5
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r3.ebuild
index 619a51c6f336..95427fd20e6f 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r3.ebuild
@@ -18,7 +18,7 @@ COMMON_DEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
 	>=dev-lua/lgi-0.7
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libxcb-1.6
 	>=x11-libs/pango-1.19.3[introspection]
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r3.ebuild
index 5207dcc08a77..f603b5a15c20 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
 	>=dev-lua/lgi-0.8
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libxcb-1.6[xkb]
 	>=x11-libs/pango-1.19.3[introspection]
diff --git a/x11-wm/awesome/awesome-4.3.ebuild b/x11-wm/awesome/awesome-4.3-r1.ebuild
index a6b1dd576461..4e922c28dd5d 100644
--- a/x11-wm/awesome/awesome-4.3.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
 	>=dev-lua/lgi-0.8
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libxcb-1.6[xkb]
 	>=x11-libs/pango-1.19.3[introspection]
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index d3a7330d045f..a2093f7a67c9 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libxdg-basedir-1
 	>=dev-lua/lgi-0.8
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libxcb-1.6[xkb]
 	>=x11-libs/pango-1.19.3[introspection]
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index f5a04c061239..0ca7f513fe3c 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,4 +1,4 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
-EBUILD bspwm-0.9.9.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
-MISC metadata.xml 249 BLAKE2B 9cda07cfdcaf7357a47b6d01c0245f9e8e226de5be9a275f92871155c476a42b09c41795b11d42d961bb7ed0881fdd384aba2d4f69001fe384a80b34c72d1141 SHA512 a1787bc9776d150355d6141a11ba38f47ee750e1f0b8eb03b8cefb334696f4851c810e143f6dedb1ccb5e2e32dac80ebd70510a90877f6e75f1aa9e3d5fe3424
+EBUILD bspwm-0.9.9.ebuild 946 BLAKE2B 7b9dc2d1d5d6642c68fc1714bcd8110c6b7c61c5f7b4a7316d2d734d5141bf37dd70857422676effdfd8434399015548f42adf0ffd8b397d64a3efd5c9b41a0f SHA512 9233892ed375cf833d2d39afaf7b9c5c5cc94a2abc1abeea73cb77cab599adc46dadbdd7f8da99862c2273236847ea218b12a4ca54a28e3ddb8538847ac9cba1
+MISC metadata.xml 327 BLAKE2B 0ac0432bb0c38fca77a88690a6d85c1ace3569fc8099ce12551fd1cb4d532b3673e3c85b2655222113c4b24f139902967bfe2ad2ba638d8dfdbe874d1c9a8ff6 SHA512 fcafc9a074be2d2a64c868494a8ddb156cbc763e6d31e6999343e72df2d101469275e39eab02fc98c3ff2118203105f9b63d18277ae70997e85e021c7126293b
diff --git a/x11-wm/bspwm/bspwm-0.9.9.ebuild b/x11-wm/bspwm/bspwm-0.9.9.ebuild
index 484d61f26f28..0a9a67c88299 100644
--- a/x11-wm/bspwm/bspwm-0.9.9.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/x11-wm/bspwm/metadata.xml b/x11-wm/bspwm/metadata.xml
index 9b75804f0a2e..42a282722804 100644
--- a/x11-wm/bspwm/metadata.xml
+++ b/x11-wm/bspwm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">baskerville/bspwm</remote-id>
 	</upstream>
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 7854310464b9..dc4931e7da32 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
 EBUILD ctwm-4.0.2.ebuild 873 BLAKE2B 785289d97ae9b6391de850941e238b4d2bdb0f42533274b9b69efb81deb94b2042315fca1b18b9ed0f446611a3f7441bf9e4760fb241dcc06541ab5210545e53 SHA512 1be2be0f710a150245d913dc535b3dedf94d4d1fb4d13a1da94cd6a78ba33717c561ba7a71d66ecbfb2e74519dedfcc86fb30562d073440686b1fc4c53a7e17f
-EBUILD ctwm-4.0.3.ebuild 773 BLAKE2B b71619417e47c5af2a2bc29f33bcf3549f730578fb7172e6ff76011283934149ab86b8bc90c8b575d1e9b2d82d06c21caa9f33e2d1d4b5ece78bbbad477eef73 SHA512 3f8e58e1c128627d49fa5dfea0fab57a627264102df60eb8314eb2cc0970c9177e39dd5cf1f1350b2fc4870fb7f02dd251257903b1243ef7dceedd282c1d1cda
+EBUILD ctwm-4.0.3.ebuild 755 BLAKE2B cc9f769eb12704b3e85cf9fae7b9ab3ccd2dbe9dbdc58ab10f305fea0b2d88c7169aae20699d4e73a2438e4b219e7a573b396ece536f2e1b8ea20c7418013a59 SHA512 d2a870409fb742ab6bc50c4e84d10aabd83f9b9e1e1fdb1219efd0187d98c790d3175363512b6fab56ce339104d6f2088f082bbabc4c89f3d7a685c9623491ed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index cceee0bca32a..fbaccc9e453d 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="https://ctwm.org/"
@@ -30,7 +30,7 @@ DEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# implicit 'isspace'
 	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
@@ -42,5 +42,5 @@ src_configure() {
 		-DDOCDIR=/usr/share/doc/${PF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 22976bc87491..4db7e1ad373e 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,5 +1,5 @@
 DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
 EBUILD cwm-5.6.ebuild 1004 BLAKE2B 27ef899c7d0fb99f273a31a0cfa0f5429bbd0b24c692af1e15fa5cd5c22f347d65e93120b1564ed6b9fc0d563801340f6dfaa7d2559dac5693c791a0beca2f2c SHA512 bcfcb3689de10912b31c88601185bb23e1f99305cf0c6a79d3ea02760b5ea0b8f213f63b6b84b1e3471049b9b3a7fb3df374580883e972e3fde69921dcd92493
-EBUILD cwm-9999.ebuild 869 BLAKE2B f238c43aef6e7aab6e7ed17590dd41b4fc78a6ae0b0a019074de9b5af0f309c73d8536ddf83e9dd392b94959811137e4ffb7fc600826ae5f416c1a3cf93440b9 SHA512 90f25e9c1742674a489f1fff80a69f318c530d10286cf47ed6e0317bb0b9f56009cb943427df8f15bfd6b577c6040d40d229c7fc0ded9a8601b044aa43f15e77
+EBUILD cwm-9999.ebuild 870 BLAKE2B 17a5b61890a88ff72178add1339caa550254dd1266069c239ae5200d47ba7b5d21cc03f7187f1ae3f89454e131286e3a7658f4fd0480413ebfd77011dd3a1b3f SHA512 6ac0ce705cef59471a0d4066b9af783df6e2a4caa335c1634ee61d687d4616629cdb1504ab3d22c793b4276a4d8a27f1c0b086cd71e74725978555a20eee8bd0
 MISC metadata.xml 248 BLAKE2B 86a7b2f7d520b71d9bbed3427dc2c32a5ede55db3ee30766436b19c61a8507efc10d0de50bf84f16bc8cf73dd5b2c0cb31ac17221303dff9bd08ce8fb0e23666 SHA512 07df1249bbdd7c937f1b711b88f3d26f9de18c594692b6446022ea4562570abaa08ed2c83d31d8730707036704fa7decc5b382ec8586adaabd7f1205be4433f8
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index 573b8cfaaa4e..8e881833ac13 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs git-2
+inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
 HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index c2183ece815d..fc7fb6fa746d 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,6 +1,6 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
-DIST e16-1.0.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
 DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
-EBUILD e16-1.0.19.ebuild 2890 BLAKE2B bbabc819922d8f4174e44bb53d3e7c68cf3fcd390f08c276a8b06f8506ebdf4b7b3b05334096343c8797acd235222e9de93bf32dc69dd7876f873ed93e6fe841 SHA512 de0d6644a1a998df765d6e827a48c24041eb3d460ddd8a453b1b043ab8fa9e9337e3e2bd8e3a7ec0466bf8efcc637c3ff0f4d4f87c72e026140186b6d44ce6d4
+DIST e16-1.0.21.tar.xz 1440484 BLAKE2B ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2 SHA512 0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
 EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
+EBUILD e16-1.0.21.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
 MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.19.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 8f543706ab66..5d940a12f3f6 100644
--- a/x11-wm/e16/e16-1.0.19.ebuild
+++ b/x11-wm/e16/e16-1.0.21.ebuild
@@ -6,28 +6,48 @@ EAPI=7
 DESCRIPTION="Enlightenment Window Manager (E16)"
 HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="audiofile container dbus debug +dialogs doc examples gnome
 libhack modules nls opengl +pango sndfile sound +themes xcomposite
 +xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
 
+REQUIRED_USE="
+	audiofile? ( sound )
+	opengl? ( xcomposite )
+	sndfile? ( sound )
+	sound? ( ^^ ( sndfile audiofile ) )
+"
+
 BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
 "
-CDEPEND="
+COMMON_DEPEND="
+	media-libs/freetype:2
+	media-libs/imlib2[X]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
 	dbus? ( sys-apps/dbus )
-	doc? ( app-doc/e16-docs )
-	nls? ( virtual/libintl )
-	opengl? ( media-libs/glu media-libs/mesa[X(+)] )
-	pango? ( x11-libs/pango[X] )
+	opengl? (
+		media-libs/glu
+		media-libs/mesa
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
 	sound? (
-		|| ( media-sound/pulseaudio media-sound/apulse[sdk] )
+		|| (
+			media-sound/apulse[sdk]
+			media-sound/pulseaudio
+		)
 		sndfile? ( media-libs/libsndfile )
-		audiofile? ( media-libs/audiofile )
+		audiofile? ( media-libs/audiofile:= )
 	)
 	xcomposite? (
 		x11-libs/libXcomposite
@@ -39,28 +59,21 @@ CDEPEND="
 	xpresent? ( x11-libs/libXpresent )
 	xrandr? ( x11-libs/libXrandr )
 	xrender? ( x11-libs/libXrender )
-	xsm? ( x11-libs/libICE x11-libs/libSM )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
 	zoom? ( x11-libs/libXxf86vm )
-	=media-libs/freetype-2*
-	>=media-libs/imlib2-1.3.0[X]
-	virtual/libiconv
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-misc/xbitmaps
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
 	themes? ( x11-themes/e16-themes )
 	!x11-wm/enlightenment:0
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
-REQUIRED_USE="
-	audiofile? ( sound )
-	opengl? ( xcomposite )
-	sndfile? ( sound )
-	sound? ( ^^ ( sndfile audiofile ) )
-"
 
 PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
 
diff --git a/x11-wm/echinus/Manifest b/x11-wm/echinus/Manifest
index 919d954fbd24..c3fd0e787658 100644
--- a/x11-wm/echinus/Manifest
+++ b/x11-wm/echinus/Manifest
@@ -1,5 +1,5 @@
-AUX echinus-0.4.9-gentoo.diff 1726 BLAKE2B 1210fc069bf3d96c2d3714059054e0863491ca5edbea2d1da8ee581859017672aebb3e4c8dedc5bf3d97abda422458f6f7214952c49cda490a20e90acb8388f7 SHA512 09164473f568385b7989bfb6f1c0529eb224aa7060ca39baa81ec61a545fde58d711092db1a6cd5feef6409bc2031c5d1ba71e2c176c2d527478a331fb84e016
+AUX echinus-0.4.9-gentoo.diff 2214 BLAKE2B 60dd119006f6e4ccd67cce54a108f684818ad66949916bdd23e83825b486b6c828c5cb626f91ef837306d72a2936afc86ddc4c60116891586d6e6547c402869f SHA512 be8e619129ff6ddbb2020e6a96c0689955fc68a7b0f6871fc08d0c3da96ddae09e439114ebc0de85411c9f86af643d2c332ff8a2e6113cca97b395876c1a5d71
 AUX echinus.desktop 100 BLAKE2B 5f9dab316e812c5ae2293525e4731c66dd45f92b8d727abd2698a99debc8f91b809e6b445d057744d1872a9823abdb3e53b888a31c174fddc6019daa49264447 SHA512 df3450598a78a6484323735ee95b8c03e0b8bed40335e495a6c41dafabbccdb1e52987c383093576bfb05fa017c2bf474ec53fff30975ebd07fe6ea08196e566
 DIST echinus-0.4.9.tar.gz 32934 BLAKE2B 50fff8a78b65f6fa2f8506016dc4556e656ba2e2c6096cb7e7d175607cf63ab145081d000b5dc795108b6b8573c18318925bb3830ecea5658125fb66a301963b SHA512 a735291129bc287c6ed8c0f5d98c3d81db6da19d903a5fd5b44af5ec55d0b90dc7a559fc0cbd3e0dcced4a25783307adbd777a0c79fbd91ed78e9867544c47bf
-EBUILD echinus-0.4.9.ebuild 1607 BLAKE2B 111acc57a34a873c2e4ba096bea5a3354b02d9ff9dd617a4939234c27da7bac1208eec926256e19b2925017c9ec1bc13ac1188d386345096ee9db5dfe0c15a0c SHA512 87f745d1c61bbbf3eda4d8c844010449e92e3cf001d346353abcff448c2d5b5978e3c3356afb5a787e9ab8717f487f12d9f3f3eeba14781b187ba2914f43e093
+EBUILD echinus-0.4.9.ebuild 1511 BLAKE2B 34f64bdf118c3aa899d0fe255aa759dbacd9c3abe8f6d2670c3387ae47675e52dbcfb5efba0706834a4beebe9f69cfcef4da64fddf6cdc4bf02383af8afbcf04 SHA512 d673c4dea76b8b63ff68cd9552132974b9d232a3d87a07400412f74f8fef382bc2c687f53aba9d6fa0bdb7e639f91a4a0661be02bcdbc32e9f94288f68708831
 MISC metadata.xml 253 BLAKE2B c4c0d013c216042f0b28f5c862217d07832125864810826e75650ff3237cdad06fc84cd90c0901228036a8e5b84c60a69fc1c51feecfb536b8acd74041416d9d SHA512 120e3b08d73b91ae3fcf18fb497938d5225851b757de10c859f2fbc7d3cbfd7f66e74bdaaa6d8f189c06706ae6643236c7223002242747e7dd204e36d740d132
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
index 6ed20ef6b800..214543732284 100644
--- a/x11-wm/echinus/echinus-0.4.9.ebuild
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="A window manager for X in the spirit of dwm"
 HOMEPAGE="https://plhk.ru/"
@@ -14,30 +14,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="xrandr"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXft
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-pkg_setup() {
-	tc-export CC
-	use xrandr && export MULTIHEAD=1
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.diff )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	sed -i -e "s|CONFDIR|/usr/share/${PN}|g" echinus.1 README || die
+src_configure() {
+	use xrandr && export MULTIHEAD=1
 	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die
+
+	tc-export CC
 }
 
 src_install() {
 	dobin ${PN}
 	doman ${PN}.1
-	dodoc README
+	einstalldocs
+
 	insinto /usr/share/${PN}
 	doins {close,iconify,max}.xbm ${PN}rc
+
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 }
@@ -51,7 +51,7 @@ pkg_postinst() {
 		elog ""
 	fi
 	elog "A standard config file with its pixmaps has been installed to:"
-	elog "${EPREFIX}/usr/share/${PN}/examples"
+	elog "${EROOT}/usr/share/${PN}/examples"
 	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
 	elog ""
 	elog "For changing the modkey you can use \"Echinus*modkey: X\""
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
index 75b8b48c121a..2bada877b17a 100644
--- a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
@@ -48,6 +48,17 @@
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
  #LDFLAGS = ${LIBS}
+--- a/echinus.1
++++ b/echinus.1
+@@ -40,7 +40,7 @@
+ loads the configuration file from
+ .Pa ~/.echinus/echinusrc,
+ if present, then looks for the system-wide configuration file
+-.Pa CONFDIR/echinusrc .
++.Pa /usr/share/echinus/echinusrc .
+ .El
+ .Pp
+ The following notation is used in this page:
 --- a/Makefile
 +++ b/Makefile
 @@ -19,13 +19,13 @@
@@ -66,3 +77,14 @@
  
  clean:
  	@echo cleaning
+--- a/README
++++ b/README
+@@ -22,7 +22,7 @@
+ On new install:
+ 
+ % mkdir ~/.echinus
+-% cp -r CONFDIR ~/.echinus
++% cp -r /usr/share/echinus ~/.echinus
+ 
+ 1.Configuration file
+ --------------------
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 151476bb75ce..081fc44b8396 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -3,5 +3,5 @@ AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d0
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
 EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
-EBUILD enlightenment-0.23.1.ebuild 2727 BLAKE2B 5762d29cf862a1864edf0fe7e8ee856e52a977e50bad5ad4b17793c496f9e18067fd135e826de0bfa6bbd862bc8a7dd61b53135b9f3688a3ca233d7c4886a269 SHA512 bfd0d029838fb9c93b39f2d1db85ee67ac915603fc0170edc6c18260a887a55e8f1acc7fc2e6a3c99db7d12462309477391f69772ec014f4e3944cbe6d0c436d
+EBUILD enlightenment-0.23.1.ebuild 2800 BLAKE2B a58c4c71ca9d01f421a215905295cca214635c65d9b945e90fb23da916a740d86e74734d78976a61844eae6d788096bd50bf6533dc899f82863af8f2dcce32ff SHA512 905c40929ba275ee9c04c04fe873e970c147734d9ddd8e60bd925e952755d2e3431287e7b0496077e990df7aea28b1bdee44dbd01a33d7951e8c4f437dff197f
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
index ac2cc1030190..74caaded4b5c 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
@@ -104,6 +104,7 @@ pkg_postinst() {
 	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
 	optfeature "system and process monitor" sys-process/evisum
 	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a modern flat enlightenment WM theme" x11-themes/e-flat-theme
 	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
 }
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 3f2389d33c63..c8473234d82c 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -2,12 +2,10 @@ AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9
 AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
 AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
 AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220
-AUX osx-has-otool.patch 472 BLAKE2B 6341fa70a3e58bfeb63d2a829a86dd8a134fbcb1f4c0c3137619ea22de3df567f03c4ea2c6999c17442adbc636dea1a92dfd6a7e01e9725b13329143c3f9c249 SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a
+AUX osx-has-otool.patch 476 BLAKE2B 0c1bae602dc169aa4cb3b7bbe9712935ac117962e644ebdae428740dd72caf5a34690267446ed9f5e3829a9b87a15916dd44e8c63e898e685b16091f1008a9a0 SHA512 a955035154a7607e7f4c9f64fa85bbc43c79cc6cd9654b854b40d1948b5cc3a8f8f8cb50c9906eb7691f755d14e7a588fa2237b44e12c5073b40d2dd470acf1e
 AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e1124b0c6d0cf4fcec84a612cc525e038625d87cf8d13b9d6a8212c7916a789ab45872e17c978f7bcc54142 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r3.ebuild 3139 BLAKE2B 42b73e75a4b21e4c3411d6ed93f72811f70596927a4b86c16871a0565e57e2567a4b1a7143e0403f753e992cc31b8d0fa216ba166c02672107ed3d493d201823 SHA512 08da466e88dfdcd6e004d6a9fa920647719449f4f16151bb28ecac167a8a4a790b61c0af4c62418cc181c7e092af184986c05a2f81ea613cfe61f6210b908be8
-EBUILD fluxbox-1.3.7-r4.ebuild 3176 BLAKE2B f32bccc0a559807535e1f961de63b3de5e614b6e059e968ff4bdd8776108f1263d7418501336cabe00b6048bb8c261339036b70e7071ff7783cda60419c26a86 SHA512 b7d234563f2ff220eedca38dccf10dea62e4ff390423e60c9fc298a1af0c0c76f4f5095e1183f1a69f7f3e6472ca88e8f97d7583d02e4db56da55de2b94eb67f
-EBUILD fluxbox-9999.ebuild 2989 BLAKE2B fd1ca1cb0e2bd290436a65da63b431204996ae1f046b3a8876d42fee5177fef3c81dd9443a1d9855a1006964d2289f863b866df597f1c633a735050ccd62a0b7 SHA512 4c77a116e4e5be9ac525b1047bd39f45763b6300d97c4efb34b8bbedbd3de9ba56cc4c7935b681b89cb3a38a7116f4513dd3641d30caf44ef07572aae4fa328c
-MISC metadata.xml 1000 BLAKE2B 37bb680df975da4d9074c20418218ba2da7ace4d50d89ab9b802a3b71ac1270a48c1ae33f25c1c3ec07719d6b021d4538a44a535f945c8b73de5a22d9b4eabd8 SHA512 7c3c819b2e19ea143255b2305722bb09f70cfc304f8becad482ffacbf751a934de96a3e3635cc95acd6e2529ef810a08eb7011632baf064fdc6ce27c307341d6
+EBUILD fluxbox-1.3.7-r4.ebuild 3011 BLAKE2B 700ef6d8d8dccb4a83037a40db40ee0783799e2b81eb4859c0a0debf27838cf215bdb408feb76d21b233649ccd5b1cb2331c3e4a625407e18c87b08676e62952 SHA512 3915646f058a7153ffa257ee79181bc69097e8c56565e3d72c3c41c7c848a8580a06618ea1b2552f7e6b392d34fff549da9d9830ac86322a5b6bb74874fc4a88
+MISC metadata.xml 892 BLAKE2B 83aa00ca67e0a6239d9086b9550969068155e9dee4a6dcca0340e553bd43097e9700bd68637bb0a94d0051b8b19a2a5abc2147ac16e0ae7b28836d7a9b79ae4d SHA512 fd8410c6214cf63d781b148ee2add0c46cfbd050cc22412afef43f3b2cfb6eca9a97f66518f138db0d5f695dcca522fccf44c422e481589718ab14394b8d741a
diff --git a/x11-wm/fluxbox/files/osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
index 7671dd83647c..d500af681f81 100644
--- a/x11-wm/fluxbox/files/osx-has-otool.patch
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -1,5 +1,5 @@
---- util/fbsetbg
-+++ util/fbsetbg
+--- a/util/fbsetbg
++++ b/util/fbsetbg
 @@ -356,7 +356,8 @@
              if [ ! "$wpsetter" = Esetroot ]; then
                  WPSETTER=$wpsetter
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
deleted file mode 100644
index 165e79552f94..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix xdg
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	truetype? ( media-libs/freetype )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Fix bug #551522; 1.3.8 will render this obsolete
-	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf $(use_enable bidi fribidi ) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable slit ) \
-		$(use_enable systray ) \
-		$(use_enable toolbar ) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	# Call fluxbox-generate_menu through bash since it lacks +x
-	# chmod 744 may be an equal fix
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		bash "${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	# Install the generated menu
-	insinto /usr/share/fluxbox
-	doins data/menu
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
-	# Styles menu framework
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxbox
-	doins "${FILESDIR}"/styles-menu-commonbox
-	doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index ec5b26ddccd2..c36ed4f3624f 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix xdg xdg-utils
+EAPI=7
 
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
+inherit flag-o-matic toolchain-funcs prefix xdg
 
 DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
 HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
 
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
+RDEPEND="bidi? ( >=dev-libs/fribidi-0.19.2 )
 	imlib? ( >=media-libs/imlib2-1.2.0[X] )
 	truetype? ( media-libs/freetype )
 	vim-syntax? ( app-vim/fluxbox-syntax )
@@ -30,27 +26,27 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-base/xorg-proto
-"
+	|| ( x11-misc/gxmessage x11-apps/xmessage )"
+
+BDEPEND="bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_prepare() {
+	default
 	# We need to be able to include directories rather than just plain
 	# files in menu [include] items. This patch will allow us to do clever
 	# things with style ebuilds.
-	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+	eapply "${FILESDIR}"/gentoo_style_location-1.1.x.patch
 
 	eprefixify util/fluxbox-generate_menu.in
 
-	epatch "${FILESDIR}"/osx-has-otool.patch
+	eapply "${FILESDIR}"/osx-has-otool.patch
 
 	# Fix bug #551522; 1.3.8 will render this obsolete
-	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+	eapply "${FILESDIR}"/fix-hidden-toolbar.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
@@ -65,9 +61,11 @@ src_prepare() {
 
 src_configure() {
 	xdg_environment_reset
+
 	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
 
-	econf $(use_enable bidi fribidi ) \
+	econf \
+		$(use_enable bidi fribidi ) \
 		$(use_enable imlib imlib2) \
 		$(use_enable nls) \
 		$(use_enable slit ) \
@@ -82,7 +80,6 @@ src_configure() {
 src_compile() {
 	default
 
-	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
 	# Call fluxbox-generate_menu through bash since it lacks +x
 	# chmod 744 may be an equal fix
@@ -90,7 +87,6 @@ src_compile() {
 		CHECKINIT="no. go away." HOME="${T}/home" \
 		bash "${S}/util/fluxbox-generate_menu" -is -ds \
 		|| die "menu generation failed"
-	eend $?
 }
 
 src_install() {
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
deleted file mode 100644
index 70aa43032016..000000000000
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs git-2 prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
-SRC_URI=""
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS=""
-
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	truetype? ( media-libs/freetype )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	./autogen.sh
-
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf $(use_enable bidi fribidi ) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable slit ) \
-		$(use_enable systray) \
-		$(use_enable toolbar ) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	# Call fluxbox-generate_menu through bash since it lacks +x
-	# chmod 744 may be an equal fix
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		bash "${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	# Install the generated menu
-	insinto /usr/share/fluxbox
-	doins data/menu
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
-	# Styles menu framework
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxbox
-	doins "${FILESDIR}"/styles-menu-commonbox
-	doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 0cbfa3e809bc..9666567c86b7 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -13,10 +13,6 @@
 		countless additional features.
 	</longdescription>
 	<use>
-		<flag name="bidi">
-			Enable bidirectional language support with
-			<pkg>dev-libs/fribidi</pkg>
-		</flag>
 		<flag name="slit">Enables the Fluxbox slit (or dock)</flag>
 		<flag name="systray">Enables the system tray in the Fluxbox toolbar</flag>
 		<flag name="toolbar">Enables the Fluxbox toolbar</flag>
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
index 8446a43438bd..6085bea2c37a 100644
--- a/x11-wm/goomwwm/Manifest
+++ b/x11-wm/goomwwm/Manifest
@@ -1,6 +1,6 @@
 DIST goomwwm-1.0.0-github.tar.gz 406143 BLAKE2B 0118dfec32a3598b0a23b3421643a211386c1bc302d523a4a63a78e34ba9f0673b0bae18b27b491ab153e3e0fb8031123c56425ac007c20651fb3ec8484ab7a5 SHA512 e37d80c8ea47fe136172c392521ec8d4dab361c3469d3d1626ed7c30385513301983c0ffde39f4c2e6f2dee8709da6a34f14f7bb89776f1ccde5103ab1a26764
 DIST goomwwm-1.0.0.tar.gz 69967 BLAKE2B 562666d3a2d9121d07f00a339776f8c510f04eefae0f49f3f9475af250803194b8f4b1eb2673799f3f8b365a6623e5c1b1e49e009ed830699fca51a0846c0ffa SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de
-EBUILD goomwwm-1.0.0-r1.ebuild 755 BLAKE2B 168968e8e5016af836c2836ab87a366e314cecf06f93a78557ef09631ccb9a5456a40390b5d5f38e03b293f129887d89c3069fd45e66c025028d47a22bcad697 SHA512 ae2bf63c3c1db85dd6000fbb8bb1f16d800c30f3544bfb34481b2aa0ab6f476ddbeeb07c497e247975084826987c192ddf4b976222e76f1d4ec73dac2eb68eb4
+EBUILD goomwwm-1.0.0-r1.ebuild 782 BLAKE2B b1aed786326c88674666ec71351e0df2252a9f0a4d42054bfd8c3c213603bf474fa46a49f63bda120aa9b4e0eedddc6078e638d2f15386ba2a37198a106e4d5b SHA512 be63ab31226ddabf87c0f50ab8857188b411490b9b091651fb9f8ba3ed6b217dbf4cabeaeb883b85fc2094a32617e31696695298a12ad42ff0cf81375aa551fe
 EBUILD goomwwm-1.0.0.ebuild 730 BLAKE2B 077ed6e144bd53b2db8970a219fcb249826bb2aea72a6083c960f1cd1d09905572bfd130928e78a38258fd4239f280ac623ec74d241db68bad0cb3d0f2f4a836 SHA512 b89d3655c8cb3d275517bf2de3323fd18e4e7b48314b84ba92a9e8435ec83438a70d837b7cfdb83a3eb0c703a9a0e42dafca52b34c91966d7faac65ff31e556f
-EBUILD goomwwm-9999.ebuild 714 BLAKE2B ef5322cce595e7503c7d1dd2c4f63b3132db82143ff9b2566e03fbcc80ef16fcb5aac5bb82718d50a9cba7fe036f5175ebe84d0f10b3ac2db83c875121680127 SHA512 543b57163cb0a5dd037d402596ebfe03c3ef4d08e3a60f096fc436ec5a89af36c99b0e0357bcd6407aa81a08864a09829472ff87016cf98519c952870949f7a1
+EBUILD goomwwm-9999.ebuild 741 BLAKE2B 7e2f6c5c125f6760339a8cbd2ea247af39fb15999c586a70e7c2f16f10f6c8a1adea9286ed8c9d0c36c5d19cb8cc1bca5ad49271fff51a2c7ff4816d248fdff6 SHA512 a7c19b6ad2708c67daa11898aa335c97ec59088bd377966ae39b440381dd3822cca502dc6e6047b7a25464ae9e97e241df1b245681ced4df8ebc957d34acb2fd
 MISC metadata.xml 328 BLAKE2B 292932626f6db147c5fda1ac53e606d808a43956fa046e5e65e7843b82a1476f16e1582af3567962bd99b4c5ef301b8a13ef581dbfdb75d460b3e83ed6524127 SHA512 e2a9ef6e4d4867c0a8188d08300444aa9f7e126fa60b1b811ddf2096c43b847cfb4dfda36b0e5f7fe9413ec5b5ac7677f953a10d9f824dc031673a7ca25628d6
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
index 4286eabe8d4a..5b01cd93002c 100644
--- a/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
+++ b/x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Get out of my way, Window Manager!"
 HOMEPAGE="https://github.com/seanpringle/goomwwm"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
+SRC_URI="https://github.com/seanpringle/goomwwm/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-wm/goomwwm/goomwwm-9999.ebuild b/x11-wm/goomwwm/goomwwm-9999.ebuild
index 99de6578f721..1a8c1374d950 100644
--- a/x11-wm/goomwwm/goomwwm-9999.ebuild
+++ b/x11-wm/goomwwm/goomwwm-9999.ebuild
@@ -6,7 +6,7 @@ inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Get out of my way, Window Manager!"
 HOMEPAGE="https://github.com/seanpringle/goomwwm"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/seanpringle/goomwwm"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 92aae2d7ca69..4c40351a4848 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,5 +1,4 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-EBUILD herbstluftwm-0.7.2-r1.ebuild 1540 BLAKE2B 70399b7c8a52331236e06b40d20bb21d9bbaae5b6c4677b2aea7b85efe3beeb90cd7391ba2207b374ffce6020d6607ec30963865a3d9fa6ad8617f8ad8da964e SHA512 f973f30cdbddb0ae6ec977817bd3264a99e3448dd69a5f980acacc962a4ece846ef2cbe2895dea85df5c07a306cc3d79d1785dcfb8bfd37bac221e5c79eb4546
-EBUILD herbstluftwm-0.7.2.ebuild 1557 BLAKE2B 8e44818c37fb80eb25f340d80092c77712ca44b521447a0f0583a8898940205806e0c0d18ecb525088ef3d8a738558e789360692deb205ae63f581b4fc399e0c SHA512 5a0772c7156db342a2de39f5b7a72c93f0c7b0c3b1163a11e9a904bbf98f33ec1b49c103617885493bf697a310c46fbdafe09d27f4bf85a11c541bf675d48675
+EBUILD herbstluftwm-0.7.2-r1.ebuild 1538 BLAKE2B b40044c84bb6357440574dfe8696458bac86ec4323033c567f2e342443232d0fad384898a2d686ef7cd0c6c71a02f5bc115b23430a36116fb0c9a007d894b618 SHA512 e776cb5c1992f67047a01bad629ef3cf9be1a493d4af4b5da5a6889912d7afb15bad4188ed2468c78ad59a99eda4f3a2417e2c3f41141cf9ab2ba7f21756bcd9
 EBUILD herbstluftwm-9999.ebuild 1540 BLAKE2B 70399b7c8a52331236e06b40d20bb21d9bbaae5b6c4677b2aea7b85efe3beeb90cd7391ba2207b374ffce6020d6607ec30963865a3d9fa6ad8617f8ad8da964e SHA512 f973f30cdbddb0ae6ec977817bd3264a99e3448dd69a5f980acacc962a4ece846ef2cbe2895dea85df5c07a306cc3d79d1785dcfb8bfd37bac221e5c79eb4546
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index c68ba3acf29a..ccc89776a452 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
 	BDEPEND="app-text/asciidoc"
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	BDEPEND=""
 fi
 
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
deleted file mode 100644
index 3ca73c0e8012..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
-	EXTRA_DEPEND="app-text/asciidoc"
-else
-	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	EXTRA_DEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-CDEPEND=">=dev-libs/glib-2.24:2
-	x11-libs/libX11
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${CDEPEND}
-	app-shells/bash
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${CDEPEND}
-	${EXTRA_DEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	tc-export CC LD CXX
-
-	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-	dobin herbstluftwm herbstclient
-	dodoc BUGS MIGRATION NEWS README.md
-
-	doman doc/{herbstluftwm,herbstclient}.1
-
-	exeinto /etc/xdg/herbstluftwm
-	doexe share/{autostart,panel.sh,restartpanels.sh}
-
-	insinto /usr/share/xsessions
-	doins share/herbstluftwm.desktop
-
-	newbashcomp share/herbstclient-completion herbstclient
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins share/_herbstclient
-	fi
-
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/examples
-		doexe scripts/*.sh
-		docinto examples
-		dodoc scripts/README
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 938101398d27..6f9c17b4f9b2 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -2,7 +2,6 @@ AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d
 AUX i3-gaps-4.17-musl.patch 2135 BLAKE2B 7b8609a5377cafc823798fd0d712d5d81e3de2c746f8d246907bfc791c7ec626cb26a8b3843d337c64bf0c28850703976d384e5a38303d6b5f342cad68eb6b80 SHA512 c6ae3f22d0303da5de7ca4c92734b043a76d7447559fe2ffc308a8d135076cf05ee53ef63eb28c1bd628a1edfb2d1a0ed2d090836cb5fc70f2b882ee1105dad3
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
 DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b SHA512 31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aec2222d3a63e37c8f7e1f9fc96567faa380ebff
-EBUILD i3-gaps-4.16.1-r1.ebuild 1724 BLAKE2B ad54e6d09e4149f1db755b34146665152ffa665884a1df045ffaa0e8324e213a04b7c68acbeefe9fe77a3feeb422f1cc29d485f547ed06075b7401112f8f77ae SHA512 12af6f447f3afa3d395628bbdbdf8763ec6000e8319354be53e09528d8708e43f8d1d0642443b0bf69a750bbcb76bfb7f5812154642e074f384517a17a4783f6
-EBUILD i3-gaps-4.16.1.ebuild 1727 BLAKE2B baceb7766ffb3113638ac33ba2bc24135dc067649dff1be81911f56d697247f6f1c95edfed41c5b3f2ff70ccf189997676a53d0a3ba7b8b0c78077da979c447d SHA512 d17165aaeef4e73552052d6cb2c8e3877ae7978836eee3d349a20966ff70544fccbd3155778cf0e400ffe17be358b053f7a50b58f2166850f9ce04a477050516
-EBUILD i3-gaps-4.17.1.ebuild 1726 BLAKE2B ed6032ccaae1089c2c6a3874aaaaffc090d9480634a995166c7d214c628b562a4a96625d1a586126f1fa2a649fd5851ac3d75610bf185d9b84d2ef5653b8c3ee SHA512 024abbc3412fbba63864a16a0fcead29e855eebb72fc8a88b0d20e69bff8bf623058ac5d982d72af2438550bd8552393e71a1e617a450ee39071c8f350450df1
+EBUILD i3-gaps-4.16.1-r2.ebuild 1727 BLAKE2B 62751058e1925261b33cf48848ab92dea55d5a275ae67045b1b732be3a5480324fc382da99d890212b1bc51d79a2e43d56df874804f0a31d1937c898ba9e07da SHA512 4ab64b6bb6c6c00e20141a7ef3ec74f7639cf38106d3fda1fe5576008515759afdb3d8bc08c5fe1da6f527ca0e79df03aac653f34683171e947283191662807f
+EBUILD i3-gaps-4.17.1-r1.ebuild 1736 BLAKE2B c270f41ab68d162444823807492581ea53f8458c7ec399f4f67ddccc7aec9175a043483265c302d6495d86d772b8d2c5b3b22ee0430fb071162bb1bc0aca58cf SHA512 2c249cc24778635ae593d9c7fe2d4314c9a4e4c75054ea87880d1f0565eb346d547322630bbde77971ac0d4ed6090deaa8f1e77ebc01ceddcdac752ecab842a7
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild
index ed9539d89182..6201522d7fdc 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/libev
 	dev-libs/libpcre
 	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
 	x11-libs/pango[X]
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
deleted file mode 100644
index c0e648622171..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3
-"
-
-S=${WORKDIR}/i3-${PV}
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		--enable-debug=no
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	einfo "There are several packages that you may find useful with ${PN} and"
-	einfo "their usage is suggested by the upstream maintainers, namely:"
-	einfo "  x11-misc/dmenu"
-	einfo "  x11-misc/i3lock"
-	einfo "  x11-misc/i3status"
-	einfo "Please refer to their description for additional info."
-}
diff --git a/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.17.1-r1.ebuild
index 0f5113ed0c6a..b9bc95e4bc24 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.17.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND="
@@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/libev
 	dev-libs/libpcre
 	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbcommon[X]
 	x11-libs/pango[X]
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 92a800020465..ec7391ddc3b2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -5,10 +5,10 @@ DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
 DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
-EBUILD i3-4.14.ebuild 2137 BLAKE2B b231eb56417b8c1d679d8578e3939973390c1bd4d8bedf1479124159070b4b9a3050b7bc274dfb83464b48a92b50aa0b3290bb5f3b6822f80ab85ddb024def74 SHA512 07a3f71719ce11fd5d90ddcec4551d943cc0832515650ae2bd4ba26b93cf49db89202389d63771c4c5e13b0b0b1b757231861dbef95fd8005fe8bcccc6352d2c
-EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
-EBUILD i3-4.16.1.ebuild 2325 BLAKE2B 8b944e98274f9b573712f90906f5c44f4770107743ec2742fb90d9076209b4b8db2ce4e0cc530a95b2064b969f5cde30b1af494d3b00bb6e9d5b8bf363ed2923 SHA512 325c3129b367ddace668f1f162466f94f970b8f0a3cde9f2d9d0be2506ae2389fb6946a94952035e5a8a8912e4b618dbda04e2ee72c9351a3fc851d2b042acd1
-EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
-EBUILD i3-4.17.1.ebuild 2324 BLAKE2B 5573454ae13e9e700b471155becf18b648c5aa3da86438eceb0ff2d0eb6b20b4412b00687143184b821c062356c532b8a84fed064c08c73b8d5f221b26ccf9c9 SHA512 ebbdb9d58ac64fded6da388fc736d0a1e056a377898f90eeb079002fdc9d30d53ef6c209613c11941792d3b8ca169148c2f0f67d7498a4f76e029397c9fb9f22
-EBUILD i3-9999.ebuild 1814 BLAKE2B 4bc786cad1c87f351da34303c63fa0d5e1874bb97852df7bef3ba4c9837a524c4abd18294c3be46752fe66c66efeb40f781e9964f0c1207c76b4145aa7d7583d SHA512 b3a4429575ac3440f026a73be0dc2d412bc4292a0e1640d20e4042f72c59ed7ade740f8f45fb7b6d7daf69f4cb09b863db923ad7f82b181caadfe2d57aa4bf60
+EBUILD i3-4.14-r1.ebuild 2140 BLAKE2B bf91812deb38d796df9a3ec03c0993f3dbcf4ab5616f7f01c0076b078758018437df33ebbb6a5b5c7c131edc8b59b1d48b44a301544fbd4b23f96eaeec9e3fc5 SHA512 1da2041e23f2520fa02b6d41ff0920157d041870b02575fbe4cfc20eb4875bbeb29cff2ef34d9545bd040337c4051de12f255a4f4b29b260c965c8c5e988c956
+EBUILD i3-4.15-r1.ebuild 2326 BLAKE2B 6b76a1f27ba7d9ec29b4da95a2daeb650f5367ef46f9d077ce204fe4f3f43c6dd2becdc1606512a86a5f83483d8b1f4aac37113d8b0dec564327d1238efd8671 SHA512 19ede426bcd7080bcf2cbfdffe97ab2e86fec334bb05921ec4689c013837f9fb2751c034fdb521e33d6678366aafea05b84d36c3a74a04a4e3ca5b7e94b15ea4
+EBUILD i3-4.16-r1.ebuild 2321 BLAKE2B ae8c859452db3aafd35af4147e07dd6ecc0d714d2ebb3345c7f88c15c3f9f50fa395d20373909a97a550c24c344ac0710aea9bbc02a97666abb3c7a036ec0149 SHA512 fad5da1b68628605ca72f19749101417f4f1e982e1a178af4dc8402011d7102102fdf14be7aa7683f30a13875aaa19fe4401ed78e8d894716e9460d833769ee1
+EBUILD i3-4.16.1-r1.ebuild 2328 BLAKE2B 6f680ba4b89bd1ae85347461439bfbc52636921e104a400799198242a7f6a127dda8d703d955072b2ac344e4880ba21d135dcca234c3b24ed355cee6a9276c98 SHA512 038e6c917346297f9c20c02fc4b7e31a074516e34566a7c5b76ef2099f08b8ce59aa12dd464fbda8774a4331d14632a835515f00552452c4d78f8e461401a93f
+EBUILD i3-4.17.1-r1.ebuild 2327 BLAKE2B 2b4882b8e5dfb5d12ffc49318f7f38f9ff56fc829c53ba2774482e6aca677c1f2508cf055507aea5cadda5dc4b05772f9b06b49fe2447f456a21b93ab712c279 SHA512 025a09da399f91206343bf583061105befa2ec531b8af6e00a024c908d9d13a591a10d72656b5a6ed24abd6558ae252bbca56f07a45965568575fe93b01cf9a1
+EBUILD i3-9999.ebuild 1817 BLAKE2B 652042fe2ba3b661fac79473d9f1fad420b15fc96f8475573e0de153eb154e21f037c6e2b1aae19b08fad430648e9bcb6324b89db144dfd8a36c914aaabef8c7 SHA512 06c23c1654c1ea2908e8a89c23996c8571f83853db25d3c1b9deb8c5fe9d1dffadaa5b0e55d7374cbb0bb3ee65076d2ed8c6934b7d723f34edf7719ce5acde16
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.14.ebuild b/x11-wm/i3/i3-4.14-r1.ebuild
index f93c30e3ffaf..c2479d20a2f3 100644
--- a/x11-wm/i3/i3-4.14.ebuild
+++ b/x11-wm/i3/i3-4.14-r1.ebuild
@@ -28,7 +28,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	app-text/asciidoc
diff --git a/x11-wm/i3/i3-4.15.ebuild b/x11-wm/i3/i3-4.15-r1.ebuild
index 0bd559fa4aec..07e92cb76ae0 100644
--- a/x11-wm/i3/i3-4.15.ebuild
+++ b/x11-wm/i3/i3-4.15-r1.ebuild
@@ -28,7 +28,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	test? (
diff --git a/x11-wm/i3/i3-4.16.ebuild b/x11-wm/i3/i3-4.16-r1.ebuild
index 270dae55f6aa..d5211fefa602 100644
--- a/x11-wm/i3/i3-4.16.ebuild
+++ b/x11-wm/i3/i3-4.16-r1.ebuild
@@ -26,7 +26,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	test? (
diff --git a/x11-wm/i3/i3-4.16.1.ebuild b/x11-wm/i3/i3-4.16.1-r1.ebuild
index 40e2cfb9d89d..2dcf200dd638 100644
--- a/x11-wm/i3/i3-4.16.1.ebuild
+++ b/x11-wm/i3/i3-4.16.1-r1.ebuild
@@ -26,7 +26,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	test? (
diff --git a/x11-wm/i3/i3-4.17.1.ebuild b/x11-wm/i3/i3-4.17.1-r1.ebuild
index 70b10d43e8f7..c8d415f95459 100644
--- a/x11-wm/i3/i3-4.17.1.ebuild
+++ b/x11-wm/i3/i3-4.17.1-r1.ebuild
@@ -26,7 +26,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	test? (
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index d8f7ca7c3a62..6423c326f8f6 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -28,7 +28,7 @@ CDEPEND="dev-libs/libev
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/cairo-1.14.4[X,xcb(+)]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
 	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index ec7a87a1c0c3..7f1f8acbf829 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-DIST icewm-1.6.2.tar.lz 1673647 BLAKE2B 006424aa005483b85ca36bd4447ce814ca81cd7243fc8045242a02355c2b35e9cbf6de0f1225d9b5e7685aca2961a731f060f7442250ef4f1527594233e8eac8 SHA512 0da78b9caf5cbbd8f944b4c89a15cb8b0e998de2075b09f65338d23027cbf024bbb9cfe9fffbe5d9606f11832090cb6552be2693cca5a62c011024f36ec1a0f9
 DIST icewm-1.6.3.tar.lz 1678149 BLAKE2B cfb41b104f0e64172b1aa983b542dc42b6369061ad4365547b14f4f96bccba6610c9b4324ccdc691421354c387c37fa80e525658139ba4213b6ea8d86448e3cf SHA512 18d77695c22131fac98172c09e27c014c10e908f4fc0cbeeb376b9308a659f0a51b466c80fc39875d8e0cf52fd6b385e636faf96c55fcb80b2cb9c1d0eb57e41
+DIST icewm-1.6.4.tar.lz 1684348 BLAKE2B 63d2c609277f78ca438720c8f38108cf5b8f82361810773a79f42b161ccfb598f468cb6352ed3e1c7d523869ba6152be09e8f4ee008f300431dbe4fde4dc0325 SHA512 6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000
 EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
-EBUILD icewm-1.6.2-r1.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
 EBUILD icewm-1.6.3.ebuild 2673 BLAKE2B dd1c63f6b41603e4b8d263624ed183837c4d4d3a067af7da94c37dcd39edda67b10819245cc7ec2d86ed040892cdec2dd64935b0916f448eb4194938645cce64 SHA512 e7a0a485e014d3d4d27efe82e06ed34bdfafcceb64fb8f64b1531cd2b05fdcde59d30da2e9b3ed212eba271dca1273924f9114caa0ab4b1f677596c861744bfc
+EBUILD icewm-1.6.4.ebuild 2673 BLAKE2B 47e54e3738bf72d23905e423e1fda01f61bb849b02e75c4d9e241224821a0aa8b97254fa852243790bb3691c97f2112600bbf67869dccc1f3b21475e3793db1c SHA512 1052f64d37bcf4094b9a19122a00d8559ec6d47c7b1a8b530eb984d9aaa1d72b6c519bc052f6cdf6614cca6c77ea9b4bb558484a5b2267a931a097d2c8c0c1db
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.6.2-r1.ebuild b/x11-wm/icewm/icewm-1.6.4.ebuild
index 4c87bc3f6120..342a1affae01 100644
--- a/x11-wm/icewm/icewm-1.6.2-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 036ad2017142..8feb8570ab36 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -3,4 +3,4 @@ DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf47
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
 EBUILD jwm-2.3.2.ebuild 1413 BLAKE2B 26d6d5d28a0d5264cfa8325db447291ff2debf34ec1913a07547497dc7bb7687dd314127def500b91a72951b2fc084cd381914eec0ecf3da34be5d3a35d7feb1 SHA512 0e5259114cd399fd451c3079ae6b5d242072074b8c9d25e6250a0ff3fac2a25aa996bfde284e97e07a127b9dde95181c90e77d8c7c94ad966ab0ff70ea08cc03
 EBUILD jwm-2.3.7.ebuild 1822 BLAKE2B 9622c3e7cd73aa5d0a4c664fd9c38d96ac20319dc22e437bffc20be8613efc71f0ac4b758f24e8ebb522013610566b889d9df5fa32173a12bbd9ba4aa5cd0e16 SHA512 1830ce3972fe1454cf999633f01550a3aa412c63a1eb5039467c4d7a0dcef317da47eaa7b166ffc7fe0c9ba192d7ebab51213513df68d4f1bd2d2d89083dfe17
-MISC metadata.xml 898 BLAKE2B 0b366993a3e1c91c6f4abfba9f97144d00c2a002f81b898f9403c4a4ed79c9ad491edd6ad36a675287bbf4543e0faca6da127bbb8cf1eb9b0baa0e54beef3dc1 SHA512 87e56bee3a559b4056846016673eba8784f287b69162027ab0da9e2e9cd17d71fb8fb693dcd3fa1aa70017d567ca93160958a76eddb97ea97f2acf0a0ff2a019
+MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 194d92bfe46f..1f5b8e82302b 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">joewing/jwm</remote-id>
 		<changelog>http://joewing.net/projects/jwm/snapshots/ChangeLog</changelog>
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 69a252dd3770..fcd8d3afba92 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -7,6 +7,6 @@ DIST lumina-1.4.0_p1.tar.gz 22489599 BLAKE2B 0c183763dae0ca046fa5d1cebc184a7ba59
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 EBUILD lumina-1.3.0_p1.ebuild 1462 BLAKE2B d81c811e31ddd93b1740d6c11d715692af499d0c69617520f42f59647962d8d73cf111b4a68bb5e2bb294f75eeaad9c70118d81392f14013e8c9055d759c913b SHA512 0b582f54b18b3e19b78cf1dcff0aea0f6e053cce9b9ac68f1d77c43a8f90fff6de76c3496ff66d07c08ee575f4ead473b9c77e8ac83b329f587590acf0db887a
 EBUILD lumina-1.4.0_p1-r1.ebuild 2158 BLAKE2B ce102e9cf2a5dc026ae83205dedc31cfd3295de9c38bb88f899fd09e509067711620a5643fc7b5ff571547a9c8b134f3cdb5db3ae365af174cd8db774e71ad16 SHA512 5087d59aaa8be0b47672b5f66db4db3d068f47021e8a41e65d63f73fcc1192d93cb7fe36d48fb5b7dd7f02fa889832055a26c50ac7a78e3c3fef0e7c336b2bca
-EBUILD lumina-1.5.0-r1.ebuild 2415 BLAKE2B d07c5626412b5d838ed9cd9a81183b0b956e26ca854edeab173ad45355ffa08ef9698d38a70a15ced20b2c94b62c8b787ea741ccc9a5986c14a88dba03a69b35 SHA512 225155444c476e88ad1fb86bdcb23e0c2f1adde2948ff0b27b87fdea7393f049d1bed96ed0d885742a8c5c2820fe3c3e8ce4b09c308457f8fd1a6c55184865b6
+EBUILD lumina-1.5.0-r1.ebuild 2413 BLAKE2B 3ef16d92410e888f429767045519962327f942e88484c7e5b5a0fca22140c48eb23031f22a19117291d70b128d2429327c37043f7a21ee0657f3b2fb3c7e7469 SHA512 a110a66e1dad7c748ff773172a85635f7dc7e449a129ed4f741df664e149c08f1a48e129fa833dcde9388aee828f6983e248afa3d828f243fc903d4626df9ee4
 EBUILD lumina-9999.ebuild 1389 BLAKE2B ca047edaeac6f78d28e2862fba0001b93f327ceca3831c07cfd90bfb7c25a16c9fe10cf5471831d3a32500435d5a57394be8077519a75d371ebb602f6002e01a SHA512 86335a3461b6a7f4685589740f49c7d3bff78a5f09101bb506e2c480851ed1c1dd6985bf5840156229db5257c1285b9406729eb2078d66e779e0ae788752b79c
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.5.0-r1.ebuild b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
index 69a2ededf215..1a09bc9bc7b4 100644
--- a/x11-wm/lumina/lumina-1.5.0-r1.ebuild
+++ b/x11-wm/lumina/lumina-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="desktop-utils"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 02997052c4c4..f9df4373302d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,15 +1,10 @@
 AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
-AUX 3.28.3-no-gles2-fix.patch 1442 BLAKE2B f5cdaa84bf635d3f729f77ab0d5150a35c19fb52df5fad3a2b3fa7fe7d87cc36ab31f302fe0170870e9471e0ede55875a7d741be920e884f91406334477a495d SHA512 534915f1646773182c2f724d7c07b5e92b95549627d5d5cb7efc8222209d7c990e27fff40e997f189de22409383ff71d0a05e5f4c9379697aa09a14d7aacc4cb
-AUX 3.30-eglmesaext-include.patch 2013 BLAKE2B 35f1976d73bf4190896a85346088ef98a396d28ee68da3562c5e049cfa7c7817c0abf5cbcc41f65ba535245fff05164d59da3c32d25ecfd5ee5b0e7464ac3f0d SHA512 856db08f41c77bcc72109646cd327b46fc2696e3bdebffd66b036297174b9f3f0f1eea0e95458280fc598bc533814669cdac6cffe9188b42838801aaea8f8a17
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
 AUX 3.32.2-no-cogl-gles2.patch 2350 BLAKE2B 3d78e408009fe7486542127162b3ea580ccc070bf46addb5799b3bcecd435d364bdf942ebfd463360be0c9105c51dcd8cb86aeae0d5599fc50f8d322376add56 SHA512 0210fdd7c5a716788918987a2e61ef765a5ae0c6268a05cfbb75ce5b469336109c4677696cab94ec12006ac4abc616222ddb62a719c2e5cac59d4833b0794beb
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
-DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
-DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
 EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
-EBUILD mutter-3.30.2-r4.ebuild 4939 BLAKE2B d5de93e534ce0aa95ecf522144b1339165341da4c40625f76e89b448b44daaea9ba2e239f3b07895f776c8d8d6ab75f53bc398428b9b7415b8d2252cb45936b0 SHA512 58c1617818b288f9a0a212979d12e7ba841ca77faa16aa349d29a304209e30cb85fcc08c6a223f9ed0e59f9967f96d5e3807ab27aca67d26a00ab72dbe5458e5
 EBUILD mutter-3.32.2.ebuild 4616 BLAKE2B 8cd6df26f4acf74802c805735f5055eab857f32532b4ed267e1aa5b87120b6dff51d88e78c54d1745dc3244323c291c26a8abc9693a184ebf43730cb20357109 SHA512 68a16d5a4282d3db04c24914bedbf1e413910f4519db96dd5646bf1fa971c7f07c606803df34ac6c0c3bcd687f41fa8d09f1d9b099bf0a09c44acb78d016431e
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
deleted file mode 100644
index 43bb05f52458..000000000000
--- a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 1 Mar 2019 00:02:47 +0200
-Subject: [PATCH] build: Fix build without gles headers
-
-This is an ugly quick fix to hopefully fix non-wayland builds against
-mesa[-gles2].
-It assumes gnome-shell package USE=wayland requires USE=gles2, which it
-sort of does already at runtime already for hybrid graphics support, but
-we ensure with REQUIRED_USE.
-In meson upstream port for 3.32 this will be more properly conditional
-on the gles2 option instead.
----
- src/Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bcb3505c7..a68661b21 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
- 	backends/meta-egl.c			\
- 	backends/meta-egl.h			\
- 	backends/meta-egl-ext.h			\
--	backends/meta-gles3.c			\
--	backends/meta-gles3.h			\
--	backends/meta-gles3-table.h		\
- 	backends/meta-gpu.c			\
- 	backends/meta-gpu.h			\
- 	backends/meta-display-config-shared.h	\
-@@ -472,6 +469,9 @@ endif
- 
- if HAVE_NATIVE_BACKEND
- libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
-+	backends/meta-gles3.c			\
-+	backends/meta-gles3.h			\
-+	backends/meta-gles3-table.h		\
- 	backends/native/meta-backend-native.c		\
- 	backends/native/meta-backend-native.h		\
- 	backends/native/meta-backend-native-private.h	\
--- 
-2.17.0
-
diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
deleted file mode 100644
index 884d57cc6f05..000000000000
--- a/x11-wm/mutter/files/3.30-eglmesaext-include.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 20 Oct 2019 12:04:31 +0200
-Subject: [PATCH] EGL: Include EGL/eglmesaext.h
-
-The eglext.h shipped by libglvnd does not include the Mesa extensions,
-unlike the header shipped in Mesa.
-
-Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
----
- cogl/configure.ac           | 3 ++-
- src/backends/meta-egl-ext.h | 1 +
- src/backends/meta-egl.c     | 1 +
- src/backends/meta-egl.h     | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cogl/configure.ac b/cogl/configure.ac
-index 3be282fc2..f333b0512 100644
---- a/cogl/configure.ac
-+++ b/cogl/configure.ac
-@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
-           )
- 
-         COGL_EGL_INCLUDES="#include <EGL/egl.h>
--#include <EGL/eglext.h>"
-+#include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>"
-         AC_SUBST([COGL_EGL_INCLUDES])
-       ])
- 
-diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
-index 8705e7d5b..db0b74f76 100644
---- a/src/backends/meta-egl-ext.h
-+++ b/src/backends/meta-egl-ext.h
-@@ -29,6 +29,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- /*
-  * This is a little different to the tests shipped with EGL implementations,
-diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
-index 755ec4908..bd253c956 100644
---- a/src/backends/meta-egl.c
-+++ b/src/backends/meta-egl.c
-@@ -31,6 +31,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <gio/gio.h>
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
-index 060c7cd2d..2fef2642e 100644
---- a/src/backends/meta-egl.h
-+++ b/src/backends/meta-egl.h
-@@ -27,6 +27,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- #include <glib-object.h>
- 
- #define META_EGL_ERROR meta_egl_error_quark ()
--- 
-2.23.0
-
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
deleted file mode 100644
index 12b4bdab7b32..000000000000
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland"
-RESTRICT="!test? ( test )"
-# native backend requires gles3 for hybrid graphics blitting support and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems
-RDEPEND="
-	>=dev-libs/atk-2.5.3
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/json-glib-0.12.0
-	>=x11-libs/pango-1.30[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
-	<gnome-base/gsettings-desktop-schemas-3.31
-	gnome-base/gnome-desktop:3=
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.5
-	x11-libs/libXrender
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-misc/xkeyboard-config
-
-	gnome-extra/zenity
-	media-libs/mesa[X(+),egl,gles2?]
-
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-	udev? ( >=dev-libs/libgudev-232:= )
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
-	wayland? (
-		>=dev-libs/libgudev-232:=
-		>=dev-libs/libinput-1.4
-		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.16
-		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		>=virtual/libudev-136:=
-		x11-base/xorg-server[wayland]
-		x11-libs/libdrm:=
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4 )
-"
-
-PATCHES=(
-	# Some patches from gnome-3-30 branch on top of 3.30.2
-	"${WORKDIR}"/patches/
-	# Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
-	"${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
-
-	"${FILESDIR}"/3.30-eglmesaext-include.patch
-)
-
-src_prepare() {
-	# Disable building of noinst_PROGRAM for tests
-	if ! use test; then
-		sed -e '/^noinst_PROGRAMS/d' \
-			-i cogl/tests/conform/Makefile.{am,in} || die
-		sed -e '/noinst_PROGRAMS += testboxes/d' \
-			-i src/Makefile-tests.am || die
-		sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
-			-i src/Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-
-	# Leave the damn CFLAGS alone
-	sed -e 's/$CFLAGS -g/$CFLAGS /' \
-		-i clutter/configure || die
-	sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
-		-i cogl/configure || die
-	sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
-		-i configure || die
-}
-
-src_configure() {
-	# TODO: pipewire remote desktop support
-	# TODO: nvidia EGLDevice support
-	# TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package
-	# TODO: lack of --with-xwayland-grab-default-access-rules relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-	# Prefer gl driver by default
-	# GLX is forced by mutter but optional in clutter
-	# xlib-egl-platform required by mutter x11 backend
-	# native backend without wayland is useless
-	gnome2_src_configure \
-		--disable-static \
-		--enable-compile-warnings=minimum \
-		--enable-gl \
-		--enable-glx \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-verbose-mode \
-		--enable-xlib-egl-platform \
-		--with-default-driver=gl \
-		--with-libcanberra \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable introspection) \
-		$(use_enable screencast remote-desktop) \
-		$(use_enable wayland) \
-		$(use_enable wayland kms-egl-platform) \
-		$(use_enable wayland native-backend) \
-		$(use_enable wayland wayland-egl-server) \
-		$(use_with input_devices_wacom libwacom) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 63cef81d8e06..ddea9d51d477 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,7 +1,9 @@
 AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee91959f04b625eaf6c67587e77ac1d3c693ad177db88aa9bb858aab80422313a7709ec48daa594d29b14fd8f9805c1160e98a6 SHA512 35d36dd2ddef05e21491df75a1d14c3d26dd17a8da79577d06fb3b7ddf6a179c7e23bb777e4cbdaa4bb4ab745db023981645f3dbe4dcf75c7b4d5f46e18b96c8
+AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
 EBUILD openbox-3.6.1-r1.ebuild 2584 BLAKE2B 95dad82aebe611f66b5b4e6bf949faf3b2ea1ef8890c06733f603097ec88fc9284a9935cc5d61c7b432b11bb42744632f2ec687f380d53b914b6f72db0556f42 SHA512 3b82c0e85f29e7a7a08fda6a4e07c896e36e39382fab54c8ab0a161c4d8f41c64e7afaeeb80c5b7908c52e5383ef381732b21aaf5cd6cbc43831c58ba3776e47
+EBUILD openbox-3.6.1-r2.ebuild 2687 BLAKE2B 52ccce008a376c2b50b6a6c799e91564b76532d73135d806240546e2c617ecaf14263bd68975a099a513719e3c90ac327a09a119e6461194b5fe5011ffafd3fa SHA512 04bf5059164ff8908010d98c924d18a9f0ebba44da661fe8bfa0fd8a2d5df3878c7375473909d3ce342d61baa46da7d6f409d087c84d82dc19ae33b788925966
 EBUILD openbox-3.6.1.ebuild 2602 BLAKE2B a2da64beb0666f9d30f45aa25095fa14a7194aaa328b387d111c054a999e1078c2f8ce7ef3ad8e17e7a76bf9ea00f8c2a2d4b7e3a8ee43d712699f86a0741b42 SHA512 41e5e4cec298ef038a8177a92704424e3e32e19a57b3090e5f5dd0ffd91c5a6e338bf9ca7bf57b4d5d5bebd105e6d4bafc6113e88ef68fcb977ed385baa94a5a
 EBUILD openbox-9999.ebuild 2571 BLAKE2B 090fa6460c016b773f261a8b18193c877037eb5d4010fb7d4f559d6577c478010f327ea792383ab60182a746281c96ffbc10cdd07ae7875cdf4a4ab82f12f868 SHA512 e86a5a5cee36e22f8cba4f1438f65d29e39acbca9e3c99599ae9ac56535b1340d7b5ecb675513d818a1f1a2a27dc39842b2b231107a08bdb3536385aac3e0dc5
 MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
diff --git a/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch
new file mode 100644
index 000000000000..d28b536d64ad
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch
@@ -0,0 +1,126 @@
+diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart
+index 04a17a199..f2c75bbdd 100755
+--- a/data/autostart/openbox-xdg-autostart
++++ b/data/autostart/openbox-xdg-autostart
+@@ -19,6 +19,8 @@
+ #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #   GNU General Public License for more details.
+ 
++from __future__ import print_function
++
+ ME="openbox-xdg-autostart"
+ VERSION="1.1"
+ 
+@@ -28,9 +30,9 @@ try:
+     from xdg.DesktopEntry import DesktopEntry
+     from xdg.Exceptions import ParsingError
+ except ImportError:
+-    print
+-    print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+-    print
++    print()
++    print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr)
++    print()
+     sys.exit(1)
+ 
+ def main(argv=sys.argv):
+@@ -51,7 +53,7 @@ def main(argv=sys.argv):
+             try:
+                 autofile = AutostartFile(path)
+             except ParsingError:
+-                print "Invalid .desktop file: " + path
++                print("Invalid .desktop file: " + path)
+             else:
+                 if not autofile in files:
+                     files.append(autofile)
+@@ -99,9 +101,9 @@ class AutostartFile:
+ 
+     def _alert(self, str, info=False):
+         if info:
+-            print "\t ", str
++            print("\t ", str)
+         else:
+-            print "\t*", str
++            print("\t*", str)
+ 
+     def _showInEnvironment(self, envs, verbose=False):
+         default = not self.de.getOnlyShowIn()
+@@ -146,14 +148,14 @@ class AutostartFile:
+ 
+     def display(self, envs):
+         if self._shouldRun(envs):
+-            print "[*] " + self.de.getName()
++            print("[*] " + self.de.getName())
+         else:
+-            print "[ ] " + self.de.getName()
++            print("[ ] " + self.de.getName())
+         self._alert("File: " + self.path, info=True)
+         if self.de.getExec():
+             self._alert("Executes: " + self.de.getExec(), info=True)
+         self._shouldRun(envs, True)
+-        print
++        print()
+ 
+     def run(self, envs):
+         here = os.getcwd()
+@@ -165,34 +167,34 @@ class AutostartFile:
+         os.chdir(here)
+ 
+ def show_help():
+-    print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+-    print
+-    print "This tool will run xdg autostart .desktop files"
+-    print
+-    print "OPTIONS"
+-    print "  --list        Show a list of the files which would be run"
+-    print "                Files which would be run are marked with an asterix"
+-    print "                symbol [*].  For files which would not be run,"
+-    print "                information is given for why they are excluded"
+-    print "  --help        Show this help and exit"
+-    print "  --version     Show version and copyright information"
+-    print
+-    print "ENVIRONMENT specifies a list of environments for which to run autostart"
+-    print "applications.  If none are specified, only applications which do not "
+-    print "limit themselves to certain environments will be run."
+-    print
+-    print "ENVIRONMENT can be one or more of:"
+-    print "  GNOME         Gnome Desktop"
+-    print "  KDE           KDE Desktop"
+-    print "  ROX           ROX Desktop"
+-    print "  XFCE          XFCE Desktop"
+-    print "  Old           Legacy systems"
+-    print
++    print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++    print()
++    print("This tool will run xdg autostart .desktop files")
++    print()
++    print("OPTIONS")
++    print("  --list        Show a list of the files which would be run")
++    print("                Files which would be run are marked with an asterix")
++    print("                symbol [*].  For files which would not be run,")
++    print("                information is given for why they are excluded")
++    print("  --help        Show this help and exit")
++    print("  --version     Show version and copyright information")
++    print()
++    print("ENVIRONMENT specifies a list of environments for which to run autostart")
++    print("applications.  If none are specified, only applications which do not ")
++    print("limit themselves to certain environments will be run.")
++    print()
++    print("ENVIRONMENT can be one or more of:")
++    print("  GNOME         Gnome Desktop")
++    print("  KDE           KDE Desktop")
++    print("  ROX           ROX Desktop")
++    print("  XFCE          XFCE Desktop")
++    print("  Old           Legacy systems")
++    print()
+ 
+ def show_version():
+-    print ME, VERSION
+-    print "Copyright (c) 2008        Dana Jansens"
+-    print
++    print(ME, VERSION)
++    print("Copyright (c) 2008        Dana Jansens")
++    print()
+ 
+ if __name__ == "__main__":
+         sys.exit(main())
diff --git a/x11-wm/openbox/openbox-3.6.1-r2.ebuild b/x11-wm/openbox/openbox-3.6.1-r2.ebuild
new file mode 100644
index 000000000000..80c67975b171
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.1-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit multilib autotools python-single-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
+	# see https://github.com/danakj/openbox/pull/35
+	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || find "${D}" -name '*.la' -delete
+	if use xdg ; then
+		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 0ea5eb522801..2f353e8e91b7 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,3 +1,3 @@
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.9-r2.ebuild 1271 BLAKE2B 17b1eeff88bea97179c7a0a298b0f72ed12442b52cb43fdb90adaae93749d7da83df0c8ed21f4704554eac2c351a7020f77b746415b640457c8ce8e4754163b0 SHA512 63afd2f34af240e142635902d76cd0e9eb4f8d4c5194dce914928f7f7bfa23317a0bf9f6fe333625d60f4ea9fa311b5131b1057982545adbb95870d9dffd2640
+EBUILD page-1.9.9-r3.ebuild 1274 BLAKE2B 0f9a3d6dbeae7e57cce32fc659c83dc4c127678a47be0427968d9f8d6a52717f0326f8432aa56d55c4e5687c806a6e00dd9f2d61e4f69d2216d93b32d6aa47e4 SHA512 c911d236eefbb41153a1451b0c0dc56d2c27e8405bff702cc021b4fc93f6a9f6cb2579107068639eeb1795880ec83a4c872483015ff2a49f84377d9403e8598c
 MISC metadata.xml 498 BLAKE2B 5b05ebd39950f440c83dc9c2893f52e7d39d9515427aa29d04e6c7b9069787117aff644e795f6ce3e125b84f179d6c073294292f75b77f1af14828659f8bec4b SHA512 145a1353db0d958c3a2198f57c2d3e7e163b723ca794c96ca76a76e385e22233683a55bc62528193ca87444889423f38d4ab4fda833ecc8a51c1c87bc6400fca
diff --git a/x11-wm/page/page-1.9.9-r2.ebuild b/x11-wm/page/page-1.9.9-r3.ebuild
index 99ef8410fffa..4577c5cb1332 100644
--- a/x11-wm/page/page-1.9.9-r2.ebuild
+++ b/x11-wm/page/page-1.9.9-r3.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=x11-libs/libXcomposite-0.4.4-r1
 	>=x11-libs/libXrender-0.9.10
 	>=x11-libs/libXext-1.3.3
-	>=x11-libs/cairo-1.14.6[X,xcb]
+	>=x11-libs/cairo-1.14.6[X,xcb(+)]
 	>=x11-libs/pango-1.40.5
 	>=dev-libs/glib-2.50.3-r1:2"
 
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 5078992cde78..aefe3b5bd2a9 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,6 +1,6 @@
 AUX qtile-0.12.0-tests.patch 415 BLAKE2B f0701a380584a7e31b5141a8307a163ac8c54060279e9d994c9ee42b0454c376bd6350fa76e4d7eac5bd01623875f85f5d6b3fe9e4e6ad0dc872a70f7f9e0e23 SHA512 a3cef5aa6680baaef6ea22207efbe0b58ca3dddb7f713443422eac58893d33f5900a178bc2331073e3d5b6c408ddac0e087253f3a29f8f65c822747c4f080b84
 AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f33434fdd2ccd65dc24c71b7ea654ced6393404656f2f26d96dc45a2b7e580190da408a396e76af2897 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe
 DIST qtile-0.14.2.tar.gz 492274 BLAKE2B b5418424a4cea6844d500ea00b4fa5c4b93d529503a3ece1f651c82cd1c63689d8ba95a706fd97e7d93cf823a6155196d724f18e47f9fe283e4df2586e55b56f SHA512 c6653e8dca24cef4b1cf48c26b2a0feb4bc125a1c966e0a3ea078fd1d1bba9c7306facf620438795aa2d2daecbd6e58bcda954753ab6b27f6c0cbead3766d8c0
-EBUILD qtile-0.14.2.ebuild 1699 BLAKE2B e1a8d98659a008c27d12e5aaa0f694405b8aa55168600a9fd29c4194b199675d17d479cbc66934960842aed9ad1b6559dd7aca2c7f96cb69af793f9ea357e91e SHA512 ca0926f47f84b5683fa5d56aacc944994c0f59bb5bf08f5569af99e7215fe2b5fc92248e751143ec6c8e26e3b523598527b25095ca901e66cd0f7cc7d2ca0e2f
-EBUILD qtile-9999.ebuild 1699 BLAKE2B e1a8d98659a008c27d12e5aaa0f694405b8aa55168600a9fd29c4194b199675d17d479cbc66934960842aed9ad1b6559dd7aca2c7f96cb69af793f9ea357e91e SHA512 ca0926f47f84b5683fa5d56aacc944994c0f59bb5bf08f5569af99e7215fe2b5fc92248e751143ec6c8e26e3b523598527b25095ca901e66cd0f7cc7d2ca0e2f
+EBUILD qtile-0.14.2-r1.ebuild 1702 BLAKE2B c0a45e22dcae71d7e68147a8dcf1f58aa9c5eb1719259bd55e6a60c3243c3decfdeb07ee8ab07fb598d3cbd8b59ebf35c7a91b9c5403428c8ee84075054de597 SHA512 dc4dce038f4f8cef86dcadab388b77521264e23d5092f4c1c78cae239181ea71f1d92f9a1a02f9c334eac3b307f52cc10c59a1792f9194d8a6d3f2bc07321a6b
+EBUILD qtile-9999.ebuild 1702 BLAKE2B c0a45e22dcae71d7e68147a8dcf1f58aa9c5eb1719259bd55e6a60c3243c3decfdeb07ee8ab07fb598d3cbd8b59ebf35c7a91b9c5403428c8ee84075054de597 SHA512 dc4dce038f4f8cef86dcadab388b77521264e23d5092f4c1c78cae239181ea71f1d92f9a1a02f9c334eac3b307f52cc10c59a1792f9194d8a6d3f2bc07321a6b
 MISC metadata.xml 323 BLAKE2B e89bf065a17c1ae7499e749e1b2e0af729cb64cdadc6c2ad8b06d34290ae0afca0da51802e3b855c24c9ecd23e78bae8ba9ba89e3a7f464bcf88b90622a9a442 SHA512 33be266eccb74e19b4bc89ff482e44b3542543b3f693d00bb37f1e3cd08e2465632050119d2722410d23de278bb6b1a52e2769441ca3456d3c116ef890a99a7b
diff --git a/x11-wm/qtile/qtile-0.14.2.ebuild b/x11-wm/qtile/qtile-0.14.2-r1.ebuild
index d83d014def72..b9c5aecfceab 100644
--- a/x11-wm/qtile/qtile-0.14.2.ebuild
+++ b/x11-wm/qtile/qtile-0.14.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
@@ -23,7 +23,7 @@ IUSE="test"
 # docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
 
 RDEPEND="
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index d83d014def72..b9c5aecfceab 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx
 
@@ -23,7 +23,7 @@ IUSE="test"
 # docs require sphinxcontrib-blockdiag and sphinxcontrib-seqdiag
 
 RDEPEND="
-	x11-libs/cairo[xcb]
+	x11-libs/cairo[X,xcb(+)]
 	x11-libs/pango
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index ad5131a0ed7d..e6a2ef91f7dd 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -4,7 +4,7 @@ AUX ratpoison.el-gentoo.patch 220 BLAKE2B 4c5339912466401efcc6a3a3e23178af24da58
 AUX ratpoison.xsession 19 BLAKE2B fa3cca1a3a03b0b6da08f6976cd6436fd2e115961fd1c8b7f5603483b7be6e90a6f3f57e35ae06f9b9c609d3d02765c3e5e5085b10f80bd8abb6e7f51a29913c SHA512 684dbc8aa49355bac63254beaef79ec0d499f5f4d20976fae9daa686102c5120e564fc3a60eb9a770c0c648c998e49b63414fb92b8e5b5af0f5fc23695cd6b8e
 DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd51311f8ade6df95ce69be1ffef03fb2837adc4bf9eafa737d14d47e788ad4ff54885f3bb030acf278893a91f099a841 SHA512 10b44489e60d3186ca407a5bd87e23dbd737cdafee22ea7284ac4db8bb4463081af483460d1899161fbae2973f4d25fbd1bfd354e3ffb59735baf69bbd6f94f6
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
-EBUILD ratpoison-1.4.8-r1.ebuild 1795 BLAKE2B f298be8d314d32869e0be8480654995f172ca08494b7ab3834307f5bc332d77257a197a79fdf186e2c3ad88bfc270d06a4843330c0b5f6d98f552e168d498d36 SHA512 c882f15ef566f4e6282d004782556c0c19cd6109c6e7ec4dd4c6b4cffd4e2bd0447f97265b260f1d13a6a8f7a3816850cad69d2facdb7e9425ebf92c8bfae4d6
-EBUILD ratpoison-1.4.9.ebuild 1837 BLAKE2B bcfa5ff1ccc82531e56d45a5e337b9fdacde122e60283b48a23ec6d3c7951b8a0832f40d821cb17f2e1e688bd7700a12ad451da30805bda3725c5823063ca7e9 SHA512 0a0856e6a625e5b96b790932a98ad0499b8afb60b63f96a213f7d920218856605be4829c815327c2af6b1cf6f5d7f51c186118428bd78e51824967f6edba7bfc
-EBUILD ratpoison-9999.ebuild 1836 BLAKE2B 807832764e23876d896b1a2658be846a222d5cf09fc8100b920fd84dbdd6709bc1923a696ba345f794a443fbec6dbae555719de11b7f825c08d97092805c573a SHA512 18cd2b445b2c33a46d9a7ea7a68ea9beabf963f1fdf793dd70fbdc7cc4d62160f739c751a4c4099a98728a251e3d53f555f7f5dc5d9b3b4e92e7a6607b53fd9a
+EBUILD ratpoison-1.4.8-r1.ebuild 1805 BLAKE2B 1383dcb8b820e28eb5aabdcb5a73db12fffa57628ccf9995ba47fe823162a4ef5499466ff8cbc0e929b49c18973924a840efac44529f4b67789968691c526141 SHA512 2663165018dc02d8aa96fa678c53a379b62523c3091df68cdc953d52b7bf0a9217f04d0bd57bd94ca2e75e28de8cd10dc883423c733c3ee9b7f3a55cc25fe2ca
+EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 346a6f0f621e65687c4b0a7ac574b29ee448cd3374771c015b5cbd6a97b5120f384c8a54e963cfd1f95f085b34525497172d0f312184ed2fd3d13e6cccadbe76 SHA512 e4e816a68b567366c2982cf609c9ec41e866122417ed1886548fa708372476797c3e28bc02e25bd990a9fc6caea7de1447f4b1619c35846ff7b30c8351ef7025
+EBUILD ratpoison-9999.ebuild 1849 BLAKE2B 980bdfe6a063c8fd949f123cadb2086684b06a708fe0aa0df8fc811121f4108ef68454f52405a0bec625c531900cd146a546104242b95240b56ddeb2df5ac1c9 SHA512 3a764c4fa0cc0e7a48d6f079c618faceb00fd0a5755e28f061811802e052683e9d4c304ae263d09af43f7d591a8d226ca0f8b5b5e26c782a8694883d908d3335
 MISC metadata.xml 1036 BLAKE2B 5982e3f331cef53bcc5b9809dab21e7d6f7cae85665c66650e2b09b66e7a7657511eada8fa450bad6b27804cf20dc56867686222e2cb35edc614ab2ff0ea83a0 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149
diff --git a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
index 38c02775f2d7..6d854b0b3a2d 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	virtual/perl-Pod-Parser
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index 6a1d81a91a5a..07ae28d01454 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	xrandr? ( x11-libs/libXrandr )
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 35e96ec0241b..6b3032fb05c2 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	history? ( sys-libs/readline:= )
 	xft? ( x11-libs/libXft )
 	xrandr? ( x11-libs/libXrandr )
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 4faf03b76e69..498dd9c59557 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,5 +1,5 @@
 AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c541d6b389b1f87cf7b209bfd54cbdb0677e80ae34c31fb3fadb767f4f890fc51fb0412aebac308429dca SHA512 a05fe8328ed42c11fcf7ce43eac8278e53d69610a53118283d1292c89c690aa85b43090cbcfd0995a9e2e92cb61277848404a27b1797e33c80ad09db752d8ba5
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 DIST sawfish_1.12.0.tar.xz 2814340 BLAKE2B 58901cf62d10641ef32756a3283c6d53b27a68a4af7c578c49e6968045f5993f744eb0b6c7b81da08b91774f1fb8faec467a6a22cd046a2fea135f749ac24319 SHA512 e8f831a9f6206ccf4e2a823bc3464c11b9d2d38a72ada4a142f952813a56c620b511f9cd8912bbf06e38976e54f1d9445f68d6dd24ee5ed59918c18de379e71f
-EBUILD sawfish-1.12.0.ebuild 1974 BLAKE2B 0ac1c8e5cebb2cc29ad0ee65c4ded5d6ca87822eb5335bc15ea7aab13f2b0e2dc24af42517f3499c9939a17954977ba28c9c8046fe9eb15312c26b6b6176a0f7 SHA512 553bd0c1b176c02cd06c27e9a984363f344baf282be70217a7db04d1165e1538d02550a8b3259b0ce365301158f22bcf8fa2532da70d09e45d036b41a662029b
+EBUILD sawfish-1.12.0.ebuild 1987 BLAKE2B 02d28bf3bf01444b70d1955ceb0af0b6258b8c69ef0252ca90f1534f7a3e9669c7bdd4f1b28f58bd08a976e53ecbd406e5f2817894292b554b485158e3e50c15 SHA512 e865bbd6438cf8588355e3e5c01061aa28d7f314f00bc3fa88adbf37297e0c453d0f5315b2899b603341ef8f1499f69930b357fb4bad8393619d79af8316416a
 MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b
diff --git a/x11-wm/sawfish/sawfish-1.12.0.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index cb45251a0829..047ec674d713 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	>=dev-libs/librep-0.92.1
 	>=x11-libs/rep-gtk-0.90.7
 	x11-libs/pangox-compat
diff --git a/x11-wm/sithwm/Manifest b/x11-wm/sithwm/Manifest
index 9967f6cd67f5..a436188959f0 100644
--- a/x11-wm/sithwm/Manifest
+++ b/x11-wm/sithwm/Manifest
@@ -1,4 +1,5 @@
+AUX sithwm-1.2.3-install.patch 371 BLAKE2B f38d3b127e29fcb4a5cb2cecfe280001bc69a95b4e4c9265915d7676184060b329666008cf2d924c339d1c8cb3f980e686a03178f0298cd6512ae446924bccd9 SHA512 bcc6ba80515d0ce4f004058f73a7898d364c6a02d7dd4c4234c9c89ed8df2bc95da749145979cdc8cf0665d96d183de70e79a66989234849b40eb544d554f9b6
 AUX sithwm-1.2.3-warnings.patch 880 BLAKE2B 1ce24117a5642ceb7edf4700a5edea07acf844c972147efd160ed4532a4274a414f7cfc5ee196cdf8f770ef3a7887f13e2684960b1126740216e0dffbafc3a5b SHA512 1cd1ee4c6b6e71aacafdd10ada0c3f07c89cdf51a3b565408a440ad2fa1b40f5a266b73873a059be19fa232dec35817bc0aca2e58b6271ccce5753e7cdcddb89
 DIST sithwm-1.2.3.tgz 29976 BLAKE2B 23562cb338c6e1cb5f978ad04f49afe58cc16e73707ee3c893de88eb671ccee86bc29cc06a72e3912aabd0f894c55875a860c2d1fea472fd4971961e9ab6d4b7 SHA512 12b57d28da2a5b365b1c165ba6904d901990e69950986cc7be285060a58ccdc32edc4bd60a63d2eba3f6f7f695d461e424bce23542c18a13afd5aab2e91067dd
-EBUILD sithwm-1.2.3.ebuild 561 BLAKE2B a3b99436c3f3bc25897a0c7cf196bb6d105c009fe03d15032a4a22d6edb534e9e41aa0c11b77d0c805e41cd16d28b78c25cca9934b0d9f03cbdf4bb064a7ddf6 SHA512 a77a0dd1c1355b4f141d6c1fa927e275b5e06f65cbacbbcef36652c268b34765a3afa17da63968b654f21f49d90e2426358397772e966d04258ed962e0258497
+EBUILD sithwm-1.2.3.ebuild 508 BLAKE2B 5de8eacc97c987d636cb8cb9b2e3eac7fbbfcf9f176362b305055fc1fdd8be9ef46db717cdef8dc991c341bf3d8c5eda6b647ecd3abba70cc1c3c5509429fa8d SHA512 8b179b683540f691c9c583e770072c1156fd2c39903e8cd0cdd1dc89c0612ce2ef937634fca70f53508097cb49f80848491b08899bea4a9bba97f74dda4c4110
 MISC metadata.xml 298 BLAKE2B 07c5032c4ad4c8f3336f076162848d3008c34e1890497930bd9a0548039327ca0c0281d4f31f3e2816c44e7472918ae676d4c0157bb162edf2d4819d227c6a17 SHA512 330598be770732387d2229bef4d884ee22ec5330ba60784e026d6b24d9e9554778c9e8d4d6143df6475548c4a2033dc2f69a724f6e58f9fb94eb9fe4e4ecc289
diff --git a/x11-wm/sithwm/files/sithwm-1.2.3-install.patch b/x11-wm/sithwm/files/sithwm-1.2.3-install.patch
new file mode 100644
index 000000000000..58d557c4360a
--- /dev/null
+++ b/x11-wm/sithwm/files/sithwm-1.2.3-install.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -64,7 +64,7 @@
+ install: sithwm
+ 	if [ -f sithwm.exe ]; then mv sithwm.exe sithwm; fi
+ 	mkdir -p $(prefix)/bin $(prefix)/share/man/man1 $(confdir)
+-	install -s sithwm $(prefix)/bin
++	install sithwm $(prefix)/bin
+ 	install sithwm.1 $(prefix)/share/man/man1
+ 	install default.sithwmrc $(confdir)
+ 	@if test -x /usr/bin/update-menus; then \
diff --git a/x11-wm/sithwm/sithwm-1.2.3.ebuild b/x11-wm/sithwm/sithwm-1.2.3.ebuild
index 74bd02edc37a..caa3c5dbdb8c 100644
--- a/x11-wm/sithwm/sithwm-1.2.3.ebuild
+++ b/x11-wm/sithwm/sithwm-1.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Minimalist Window Manager for X"
 HOMEPAGE="http://sithwm.darkside.no/"
@@ -12,16 +12,14 @@ SRC_URI="http://sithwm.darkside.no/sn/sithwm-1.2.3.tgz"
 LICENSE="GPL-2+ MIT 9wm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
-	sed -e 's|install -s|install|g' \
-		-i Makefile || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-install.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index bee8c0805387..536b6dd9952a 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -3,5 +3,5 @@ AUX spectrwm-3.2.0-gentoo.patch 1571 BLAKE2B b100631f6c47f45789c4931fcfd38c38040
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
-EBUILD spectrwm-3.2.0.ebuild 997 BLAKE2B 719d2c94665daf695fdb5241b97b63bb6b32414de0ac8092bd0b3b299d38e0c3dd69a50febea767d6a64d7dd16801d909609a6bb5b9c3e4fe76abc4b0c17f396 SHA512 9ba4c9e98bd68f6336ab021ec0541f2aea0b68594a29c533681a776535802e8c8a7c0cc8c3ff887860fc9c5631fe3ce4a9e49b49b67aa1470e1cd6be409fd4c3
+EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B 2d02912e17bdc158ad118ff656c7e6236688dd14f574d3eea156f0a3668ce4c335d30edb5f422e3a6e0c6afb3b94a96be9264deb8216c75719e9b4092b174354 SHA512 4ecc03f075519c803ff011efb5362b35f0e1d49d70dccf4240f5e97c14218dcdcd7e80cbd5b09290e1180cd22fb199b03b5998f6cb954de2acfad6466a57817d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/spectrwm/spectrwm-3.2.0.ebuild b/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
index 6607081b734d..793c2c081554 100644
--- a/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
@@ -6,7 +6,7 @@ inherit desktop multilib toolchain-funcs
 
 DESCRIPTION="Small dynamic tiling window manager for X11"
 HOMEPAGE="https://github.com/conformal/spectrwm"
-SRC_URI="${HOMEPAGE}/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
index 3dbd7d1d0e4a..3c57657c261f 100644
--- a/x11-wm/stumpwm-contrib/Manifest
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -1,4 +1,4 @@
 DIST stumpwm-contrib-20180128.tar.bz2 575171 BLAKE2B 57f5cab26ecfd0721ae3c167ad09922920b171fc95250eb6e98936033623837d50d70179a2262093b4db978477da3ae0bc5e920ac0cfc1e291f60ef6b7c0c260 SHA512 76bc7bf0b5a752264f3719d38773362cf134edb8ce128d2213a0d636485d12ae86b52d111d07688ce0b2a97e1e4282b391491a738e77946d225ddc22c84e8156
-EBUILD stumpwm-contrib-20180128.ebuild 681 BLAKE2B 0fed95f3c3636d1de908f2134347fca5a76a65551011aefe7ad6e0042b8916a66b0110d55794fcb4537cb4975746bf508e0e4ee0b4fc4866e48ba7c2a6bec0ea SHA512 cd7bfcc3726e5a5c383dadb050df148ee43bde861fd89032381f97a2ebaaa95e52550bb74600af8d4b22c28fe7093c6db9d9267d8875b93cecde82b090fbfeed
+EBUILD stumpwm-contrib-20180128.ebuild 713 BLAKE2B b9c491827dddb426de950894aca0865b4d85c6346765b2a26d648c83e53c9640de5266106a841cde2bc4a8a51ff23d62e604c863ecb49192d26f3ac4bb329aeb SHA512 43e42bd3d006558f150a2b5884ae6f606872621b04468772a1915c08533c25b179a66217193c0355ec962181aebcafe94343cbd2c13994af6e7401919990987c
 EBUILD stumpwm-contrib-99999999.ebuild 735 BLAKE2B 19a856505ec722f994f5ab2a3aebb67a776a8dae5085f8c35ac4a812076f52aab5aaa40503b1761b69bef4b9e85534325ecab92ab1dd5c245d8257b690d1c947 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0
 MISC metadata.xml 255 BLAKE2B f30e3b194bb8bbc77080091f42d8bf540ed44b4f4b58960d122a954bf4742730b8caa944e99072e97fe6f044a2b4ce488177d10a9ed04c1ea144365947a57cbf SHA512 d5e0c96cb700db370abae6832b26a5d93f4798b9d7bfde2c33a103d2e6bdd8f28659d87657d7c75d3912f5556e01a3999c44fd9880c5b27a5ff94d062b4d701c
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild
index fbd35c2db101..e918dd0fd7b4 100644
--- a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}"
+	EGIT_REPO_URI="https://github.com/stumpwm/stumpwm-contrib/"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index 5fbc9dc5d802..01b690b5d4a1 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,5 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
 DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
-EBUILD stumpwm-18.05.ebuild 1636 BLAKE2B 9ad4bfb55786e66731069b3c54d6a5c62dd66d6bb3c54f597ac21b5f807a00847c93837242fcdb13437a0e21c95f156d96c407659b9e89cc3643f3bff156e0aa SHA512 ed4381c2b597db24ea622ff2b0de301be55a70a7917e4cbeb144b8a881e32b9f656b8c01987734a4fa698799ff5b61f19356e3d5d14e1c0f3dce30409e13a87f
+EBUILD stumpwm-18.05.ebuild 1646 BLAKE2B 6cce435c613b5c8ea8f4e48631765f383c54a5ab19d09802cec5a31cd8e8223f0549029f2f8b044b5a033c6b4bd39af69bec2dd86cf666bb37713c9f9c016231 SHA512 4972f9f062a9a2fd5a19d9b4a0a05dee91bc96ddd39d638946486d4a5b218a65da2b4bcd6526b00b4b3ccd32a8b39d6ab2696dcce107d4446ccb54fe3c9295b2
 MISC metadata.xml 2220 BLAKE2B f41cb5a9738d00631d9fa733f705d8717db4c75640914d7e5b115fa18a6bf1869c7019e79d8330f2cf4d514ed7c48eda7b2bf5f8f9a22a11fff9022c9b7cf927 SHA512 457b833b3e03bac4189c980e12de25289c1f8c6b26cffdd40e09c410554f5d48aa06ea559cf9cf86c0d00014c50c06af902802303736fed7ac086244266ed0bb
diff --git a/x11-wm/stumpwm/stumpwm-18.05.ebuild b/x11-wm/stumpwm/stumpwm-18.05.ebuild
index 1da69a1a8997..328b8223f97b 100644
--- a/x11-wm/stumpwm/stumpwm-18.05.ebuild
+++ b/x11-wm/stumpwm/stumpwm-18.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="dev-lisp/alexandria
 		dev-lisp/cl-ppcre
 		dev-lisp/clx
 		>=dev-lisp/sbcl-1.3.0
-		emacs? ( virtual/emacs app-emacs/slime )"
+		emacs? ( >=app-editors/emacs-23.1:* app-emacs/slime )"
 DEPEND="${RDEPEND}
 		sys-apps/texinfo
 		doc? ( virtual/texi2dvi )"
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index b01fb5b8f957..1acf673b650e 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,4 +1,4 @@
 AUX wm2-4-gentoo.patch 4265 BLAKE2B d4ab8f91b01dd3fa0b0b7499adeebca04950131ace81f3d19cd3ac0e5c3392ecd4398139b4edb53b1d66e9e37bef0d3130df12873dea064db8c2e41eb4b442d2 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df
 DIST wm2-4.tar.gz 32807 BLAKE2B 38598a8c47e3f8512ff75f79534ef97d9d54a47d243e2eeab15b84cfdaa412b25693843ae6266cbcaf4ce299a9e05f35d3a236fdde315a43df372984421515e9 SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
-EBUILD wm2-4-r1.ebuild 1387 BLAKE2B b9d2195a188a769901b23fa2e6a759c9f7e886d30a6d6379216c552083719f063c88e01ad6383d35420cbaff8508c483ed0e0efd5f6e92c3be69aea6d1cf9ceb SHA512 deedccd36937381aa2648d6cc8dfe0d8fbac92383e8689a7639d47ac9bac9bc06271c78ed070c38cbe680db2d00863bc8c1326beb1035ffb9243f273f0c8cb18
+EBUILD wm2-4-r1.ebuild 1384 BLAKE2B a2ebe33e6021899c6b432167a8d30e513c8c34df15618bc66c63ed3f9a723b6c871c85e97ed02797c3754f25bb0721313acb11ca427081cd672d105b03f1604c SHA512 9645791d5f7e1aec9b1b46daca632493b08fb1fe2e757bd4181150af7346930f72b0a6ec48b546a88b457b3ba1a850ca5e071d80c059e471c4da8f148a39df07
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index ea872773ae6f..dff832f2a2ec 100644
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
 SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="freedist"
+LICENSE="wm2 HPND"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 81d662de925d..ff1322b77f98 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -2,6 +2,6 @@ AUX wmfs-201003-desktop.patch 167 BLAKE2B 4150ba608826e4defb56161db0044f13402d08
 AUX wmfs-201003-pthread.patch 191 BLAKE2B 4a317083425e5dc6ae58529a6ebba7185a12a0adbdf5e428a1fa935718d18abe5c6c11470d32e2bedfeba1c777e47b2a76b3c269cf0e50d2ed4d6078cc9f71af SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc
 AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81d486b79e870466fc4ac94ec07e72cb1bd0e5d45752543b104386d852f619d749f42e6561ea6767cd797a46e0c434 SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
-EBUILD wmfs-201003.ebuild 770 BLAKE2B b522805acbabd18a4749443b4e60769d1b4b4d0073c678fd769bbe61eb30165143ac10c70c2a6049fc22be2d88ef27f5c378ebe6c1556b7384290153b05231f2 SHA512 ce196648c6540ba4efd0e9d9976793f658c15dff104977d13255c425eda81dc224fee7783153f5f978b36bf99e705e137c4250d5bac8fcbb4c07107ff0ff5372
-EBUILD wmfs-99999999.ebuild 1043 BLAKE2B 2d1816b24fa97a1731b83469d4060ec0355859f4a1ee37fd848ba71cf26f8b65c3f61b8cfe6c9757080486d0f5e1b168eba0cee9e0627620f57e89251cde288a SHA512 8104c132c095d9889e5543839bcf18ba5fd3395c63c74e31dd0b248a117148f72874fd3715846147ec7a29f6ce2b2fe055bdad454ffb3bb1f33e3ef11e1f7456
+EBUILD wmfs-201003.ebuild 789 BLAKE2B 76630661f09f93d2beb7a043c0923ea64e0b37bf6920e65dbfa985a702cb9511cd90f6d718b7a89d3d37656642f93f92da005be41bc54d696641ae12c8f22a95 SHA512 a6f4958fd22028021da5c1589dfd548b3be6d1991e69bfcafb42d41aa33cb36b5d4c401f29e32ea0d3ee8d36b92e026281c306a43675229e7364834d8cbaa0ff
+EBUILD wmfs-99999999.ebuild 1062 BLAKE2B ee93fc556d94b3c89c4a95b3faf434291c20331834bd1b2aba8f62f02f92f11bd604c0f9bc875a084ea8642734ff12010e40cc61ae55cd1fd773312c252a2c65 SHA512 ed2e9dd39507c9a130f4edd4f663424c96fcdf45c886923955f32f555b6e7625534927853255a9a9c1f97d785261bf2068b3832edf5e5089e1135ddd97cfa895
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
index ffa5e17c56fb..1fe2b2cdf6d6 100644
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ b/x11-wm/wmfs/wmfs-201003.ebuild
@@ -6,7 +6,7 @@ inherit cmake-utils eutils
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xorg62/wmfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index cbcb210e0993..f152990663f4 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -6,7 +6,7 @@ inherit eutils git-r3
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/xorg62/wmfs"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 7ab08671f486..77bc871c7025 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,6 @@
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbcd7834d487ca64018b43ef365478f18d8959f0602dd1f4a50f48332487aa413ad4b4f8a91946494ef223b1b2b2c887400e7f7077f429 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
+AUX xpra-3.0.2-dbus.patch 1128 BLAKE2B c908950df22a16174c7885543e93277902826b8b0273472e8e70ea563d1fe24a0c9ca624e65fe1b312e27d093a7d24acda8db685cd3bdae29bd712a23b5d0d2d SHA512 c2d913ccb82cac41bd16271a878459fc4468620d9f235c2aaab3af7d327a666c8830cea43ba49da7a4faf9b609e6b3b8bbbf02f377399778af01139af4a38c88
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
@@ -8,5 +9,5 @@ DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed22
 EBUILD xpra-2.2.2-r1.ebuild 4074 BLAKE2B 6e3faee346e422a113ba09c8cf355caa2ecc41c74c2ab1d720b32e6a3b051ba8b156785bc2c0a872ba186a18af2dd370b668dc512a4cfe3fdc6f421d9c16ae52 SHA512 24476f6100dd733d61316d695d644337b4c3bfcbd405cddc9429496fe64502a6605157a648c5417045db9b75c21343e072d87f12b239ed31c0289a87f96c06f3
 EBUILD xpra-2.2.6-r2.ebuild 4122 BLAKE2B 661931d507e047c6d78871adf14693b11a499eb05e96afadec6ac93678f890b715bcd884982fa9d76fb5ded069de09f5ee1df9a56d0d1668e25aa0b0d05eb82d SHA512 4a038cffd380329cb608d91ec5372df75fcb01724cf37dd24b10b222a91697d3a53e5042e631bdeb3c430f91c7ede8418aeaa31a9905624030947a55c7a608e4
 EBUILD xpra-2.4.3.ebuild 4161 BLAKE2B 29513d3a7d880f921bf474b5d2994315ba5b78ee38ea6d44ac1891ffd551571b42a5d6ffbdff24149c0df0a6898ae73f5585c3ade877f09475b2d7c2769cd116 SHA512 aa6a85ae73339fd65d7f971da9e77f7fee9803f5056e5273f07c7ae8a66fca40065546cf571fa9a2db8cdfe711f4f1ed86c893be8d0ff0490065f0e0d0ec9de5
-EBUILD xpra-3.0.2.ebuild 4283 BLAKE2B cc64121bc0b17e0304c456fe2bdeed4b87f78dc0604a54a402fc2453f695daf868166c4c0741721ea87da84f7c7648cc81f7601a73cfb633daea816bc2822e3a SHA512 4831ab12404ea3d0f0129c34403508d558126cebfb37cdfdf0339f0e4ce661aba6e143407bae356fba69e07c372ab9f5177f277f353f8b114d74e7a8d5ac2362
+EBUILD xpra-3.0.2.ebuild 4339 BLAKE2B 2188887c73f3c057ebb43e4f3c9031f2a83dd34b86df9aba6b4fb2485cc40e1fbd3d81fa2b3608d5fd0ccb2b10120e385a11c8989b1e7b2908f62d77605d4c95 SHA512 a155a6ed3217842ac004c8672e201cb376775d2e1984c98ccb0260953e46c308109edfb06ff6d8a1fb957a06753735eeb8132182ba668756c6efc0c126e78fae
 MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
new file mode 100644
index 000000000000..e0f14b8ba59d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
@@ -0,0 +1,29 @@
+Remove dbus functionality if USE=dbus is not specified.
+
+Index: xpra-3.0.2/xpra/scripts/server.py
+===================================================================
+--- xpra-3.0.2.orig/xpra/scripts/server.py
++++ xpra-3.0.2/xpra/scripts/server.py
+@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode,
+         log("chdir(%s)", opts.chdir)
+         os.chdir(opts.chdir)
+ 
+-    dbus_pid, dbus_env = 0, {}
+     if not shadowing and POSIX and not OSX and not clobber:
+         no_gtk()
+         assert starting or starting_desktop or proxying
+-        from xpra.server.dbus.dbus_start import start_dbus
+-        dbus_pid, dbus_env = start_dbus(opts.dbus_launch)
+-        if dbus_env:
+-            os.environ.update(dbus_env)
+ 
+     display = None
+     if not proxying:
+@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode,
+         app.display_name = display_name
+         app.init(opts)
+         app.init_sockets(sockets)
+-        app.init_dbus(dbus_pid, dbus_env)
+         if not shadowing and (xvfb_pid or clobber):
+             app.init_display_pid(xvfb_pid)
+         app.original_desktop_display = desktop_display
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
index c57900d96ee6..f3cb1bc10dec 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -97,6 +97,8 @@ pkg_postinst() {
 }
 
 python_prepare_all() {
+	use dbus || eapply ${FILESDIR}/${PN}-3.0.2-dbus.patch
+
 	hprefixify -w '/os.path/' setup.py
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-wm
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)