gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /x11-wm
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
65 files changed, 291 insertions, 233 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a7a70ea039e5..2449623dba40 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index f5497ccfad09..6ddd62d0befd 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -1,5 +1,5 @@
 AUX aewm++-1.1.5-gcc43.patch 1011 BLAKE2B 8450e4a1028275196533a3d41450ef094bbd58c442fea8e8963e43155659a6e935ee612adecd8aa29654999c9599bfe1c1e800e749944faa724c9be0dd4756ca SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd
 AUX aewm++-1.1.5-makefile.patch 853 BLAKE2B d5f90e83b0c4e7b10c6afc057578ad5db820c5ac31840eff812a3ae482dd2609fb6657c45817318abace461577bbd4e973c3e67d5b6c8ad5b0df76ce60aace62 SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc
 DIST aewm++-1.1.5.tar.gz 24553 BLAKE2B f6a013cbc33476a809623c434dd0d1dc38766d27beb42e042c39e8a51db03410ea5cbdfae0f2169df46722d72d25542d920fad4881d48f589a832847177e4961 SHA512 84fe2d51e82a2098a42ad405da705810e5d3b93513a30cd688f7bb8c717875b286b64bbd8e48ab799e4ee14ac27097fb98276f89bcfeb9301dc8187d0bcad370
-EBUILD aewm++-1.1.5-r2.ebuild 572 BLAKE2B cd3971939e4569effb91d82ac7f4f325e2eca86644fa8a216b86aa46227af634c9dcabc00946388d1c9d357dad36b1636abfd2d32bb8655c57ca8225bde3b9b3 SHA512 0dc9de98fb400d0164a357d3348ee2a52ed90a6c180640235b97186dcf955745ca93c305a5ecd14539daa857cf7da6fedd92d15329106c5e08c4529bdb15ede5
+EBUILD aewm++-1.1.5-r2.ebuild 562 BLAKE2B d388aab4646b94eff392faada9b050db7b4be1d2e68975a3043541c34c2c57e475d1da9b332f779a29cefd45ac82ce83396b186caeb8425309c0f9f783c61b6c SHA512 367d7be30c0275b5a2daf53cb89520664d3dfa0b46e6a8e6a31f15b1e3687d370ff491145a986960de1edfd04592108b5eab6cf540430b9357f535e58339729a
 MISC metadata.xml 461 BLAKE2B 1629877b72d2339d7ff8d53e34f217f9cd025d6c9bec873d9fe35020663c6b4f93878bd46c6c4d4600c62bf32a1d2ec10d5f763520390d7ebe7c50e482c51b0e SHA512 d26ec6f5aadf0ad8fce04d95bed45a4cc2b5ff8c12f36ad522171e2589829b8805720e2b1c1f3e5c636c9737cc391ff57d7397d406478d204077b55729047eb1
diff --git a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
index be82ae9aeef9..7660ce10b3f7 100644
--- a/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
+++ b/x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 94bb8de5f111..00c0d911e0e6 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,4 +1,4 @@
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12.ebuild 934 BLAKE2B 849dee900b8b885539807dcf0b460f78d293f81f916da596dea36bf995308e1d37178d8c50d761c3dd7fc089983f549fd6af6d0f9bd0f73762df00d638efa14a SHA512 d102bb3b05fd7a89fb36ef49367e3519eff99ce7116840ceb2a8ee2ac3fecf0321c2f595d0dc43c6f95e5407ad2dff0f6c22d152415cb6516508ade8a7e2faba
+EBUILD aewm-1.3.12.ebuild 924 BLAKE2B 3e672f88b219b1ea92d04f73236f101236afc9df4ae0e87c9b9968966b6eede4eed8f4b8a70f548b4b2c4d66511d157c1794d76652cfb46738761c5e4f105097 SHA512 be091793244569e0d64bd6e004a675fb1872d0133c176b2060cf1f620d9e6cef4a190ffcc6e15bea09f27e4623799a82858a11be21860f4166123c754f7cfc6a
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12.ebuild b/x11-wm/aewm/aewm-1.3.12.ebuild
index b2dd5c524da5..747d4455d975 100644
--- a/x11-wm/aewm/aewm-1.3.12.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index c878171c3079..382d1265249b 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 3298 BLAKE2B 1434e7a70af6d92b5b1ed21e82fbfe779875ac9be77f1c90a526c80f1108aaadeb6ce1182d8ba8fdd23c8f56d1917aa2c55acc3b1b644e95ba6684477df94712 SHA512 9bac97ce35e34a5f4f383b95e5eaf7f8786c1d18dbd6576c8549c9fd0998a90c04356affb3980d856f06fa59525189fee10e8a02d1da369ee1a6603c6c1328ec
-EBUILD awesome-4.2-r2.ebuild 4045 BLAKE2B d3ed09bc96c9ad51317e7595861712410565d8a10ca99a1433227093b680aa4bc69e9338a13bac2133458b1be9d9070db23e95d8c7a4ab27fef91c113feea74c SHA512 ce1d6e58763eb20b31e55ec08a0c555a586744d36a5d6feb9b509d0356e1f73fbe1118213638c3fb330789165332a609958f3795ea6c4c31813f751858d2d598
-EBUILD awesome-4.3.ebuild 3696 BLAKE2B f95e5c0623a137b23bfa4b304ea440e9961a5e14415494554207ceaca40b1f784dbee7a5bbfc432408f3f2fa7daeda33776213d8101c2a394c2925c2f5918d19 SHA512 2b156917643e67c005841f919f081b9f5645a56826532808eeb9644096073cc57f969fa9b30997483ed5c2691ae71e73dcf9f6e82eabf96b7bb44e2e2133defa
+EBUILD awesome-3.5.9-r2.ebuild 3288 BLAKE2B b93b5e412dd1b54249a1cb2459ab26cb49c228bac8a2587dcdb10395097b115a3411f0076376572b471aa17c827e39a1a9ec0964752acf7b7a36cc8e1f5b3bae SHA512 2fa288d128df52d1eeeedbeeebd4b3a3c456ab18c5920c9e5b10b60f8d796d2d141a34345e8b2c106db0b35c1b581e0d636d0b96bbee4304c66c8f27d89edce7
+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 3640 BLAKE2B 91184513d785b8ed8784531d3a1a69a14a67818a07147cb74f07d52e0ab8bbb2e5b0fb5915173171eaf714fb855b3e1111a49c74cfa5a7db0beb4fea5532b604 SHA512 8e44954f42557f380b54fd01c2cff621831979a2a1677af44424241e5b112100bcf58ebe01744e96367726d1cbd5d243bfc8ef9bf1e4d2105b16d7620684f0ec
 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-r2.ebuild
index 31b4a95fd889..099659de11bc 100644
--- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
 COMMON_DEPEND="
diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild
index 5b186adec6dd..5207dcc08a77 100644
--- a/x11-wm/awesome/awesome-4.2-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
 RESTRICT="test"
 
diff --git a/x11-wm/awesome/awesome-4.3.ebuild b/x11-wm/awesome/awesome-4.3.ebuild
index 76a6928f1f24..a6b1dd576461 100644
--- a/x11-wm/awesome/awesome-4.3.ebuild
+++ b/x11-wm/awesome/awesome-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="dbus doc elibc_FreeBSD gnome luajit test"
 RESTRICT="test"
 
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index bf57410d69a6..682a42be3a57 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -3,5 +3,7 @@ AUX blackbox-0.70.1-gcc-4.3.patch 3274 BLAKE2B 0c29f4a2e97e4339cdd436c4bc18ba9ba
 AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 BLAKE2B a0b40fc2b0ad66731387224a653485c5b6bf7b7de204bd9e58dca0b09fb1856c6acaabb0bcfced71f4b934eae5eeb54fda4fec26c64a3b98feee2c96c73ce178 SHA512 5728aad146c8d32d55d72e696c21b5d4381859ecdf38fad064e41c25c9516d91ff965137bf1f9fea0028115b7f08b7d38d5e7760837c009b91e2942598f97c87
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
-EBUILD blackbox-0.70.1-r1.ebuild 1325 BLAKE2B 665314a56d6356457909d99994b98398ebebb29baa2a42ba16225799327e0767634d44a190115277bcd9876ecb3d515275e28ffdfa879e2a3ef980ad40685c1b SHA512 ad572e61477e837ca950024354fd24fdd4d9b99a6e0399467568dfbe8be547c8e9746a1ac3625d3273ee08ea476abb3cfd4ae1ecc4920119bd0ab1cf10c5d1af
-MISC metadata.xml 490 BLAKE2B 0ca863be035220ffd4a469ec8acfabca05ccc05f45e0fac9972e9a329704270699128d11eb83c3605863cc2d4e53a7fcf3b91104d0efb1fafc76e72f88fedb96 SHA512 e750812e501f74eb1b6f04eeda051bc651a474e0cb667648e68ea46207a1bdcc6d596bf38362dd02fa0c1d48225ee382b00ef276e886c7c525eb0bdc775d76c2
+DIST blackbox-0.75.tar.gz 394605 BLAKE2B 6e1338f946fe1d211d88f060178a17c452ca2b5f700d8ab73c62e2f01fd7bc81a52d06dcb42941c133528b144a6707c6ecc4711cb10630ce2921214d0b699669 SHA512 64d1ec45f9cb143dc5e3688a490acb3e20e303c57f778656dda227215b2fa13ca2db753aebc7b1ea9605a9d66c69ff8cfdf8010dc2f37ddc4609d9d3865ec068
+EBUILD blackbox-0.70.1-r1.ebuild 1315 BLAKE2B e34089de7408e8f6fb4de21adb63528725d6689308cb42b182747dada0114e8f72cf7480ec116917dc4d9faa6887797d3d14eca18a2dcf52f402de1c400fe670 SHA512 98587bb44cee7ec3817bc4a23ebbd0ec6514d0a4742ce87166bf97c2312119bb97edb7be5f7943d079283d6fc244b6ec66f5b7dd2e6ac11350809762672669b8
+EBUILD blackbox-0.75.ebuild 1148 BLAKE2B 3eaecd18635dd012a38cc63d090d7f7b55119af6fb72075433451576ba1c96fa1f8ab4b84b4ac66e540e3dddcc0da2086e314ba2dbd7fa6518b6ae87106def2f SHA512 2b822b833ab08e6d6764107fe6ee7eaf52bb1bba9f40e9c279b1e1323ff6068eab62169af3de71922ba728e3040c687a49832ef9c966f46a1af3cdae033d4203
+MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 225deb800cf9..f7b1db1f20a6 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls truetype debug"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/blackbox/blackbox-0.75.ebuild b/x11-wm/blackbox/blackbox-0.75.ebuild
new file mode 100644
index 000000000000..895457f69ad3
--- /dev/null
+++ b/x11-wm/blackbox/blackbox-0.75.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A small, fast, full-featured window manager for X"
+HOMEPAGE="https://github.com/bbidulock/blackboxwm"
+SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls truetype debug"
+
+RDEPEND="x11-libs/libXft
+	x11-libs/libXt
+	nls? ( sys-devel/gettext )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/blackboxwm-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/X11/${PN} \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable truetype xft)
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
+
+	prune_libtool_files --all
+}
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index 5d2ee1af2e01..4897d4fba49e 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<longdescription>
 		Blackbox is that fast, light window manager you have been looking for
 		without all those annoying library dependencies. If you have a C++
 		compiler and the X Window System you can compile and use it.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">blackboxwm</remote-id>
+		<remote-id type="github">bbidulock/blackboxwm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 6fc857c911bf..3f380f4c881b 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 878 BLAKE2B 4bd7b7a394707aa325203ce972947e1a2cbe88de61faf436773b2c464ccba2164b2e7865c591656cbbcde9485152347f9b75f67be6092ae727a4bc4bd73b90b6 SHA512 a2951928b6cd49fe015a20d696e58415271c68658b6fb93036d7a1ce85d96ff40fdbedbad14702eea6afca75fcb74f182c526bc1b2412ea957aef837c655e075
-EBUILD ctwm-4.0.3.ebuild 777 BLAKE2B de7c71f6b2632b6ac0e399c4f2bb2f79e057c86b2101dc1ec1c0e4d0fc9f1903e85fc3fb8fcb6a1fc414386a86937d6d5176202f0a43d332ad0588d6c13f7c78 SHA512 2a040d73b35c07be0274cbf6ac1d7a1f4e43958194049db624bfab6dfbc7a4e0c00088727be14a6fe5646e3cd8cb6b0a64dbedc857dada3044a461750ae75aaa
+EBUILD ctwm-4.0.2.ebuild 868 BLAKE2B 8001b32750d405464c2326185248e8db89f2edd6489188dc13e36a349c3843fff7f06c6099276f0a388d86b2509c63ace738ce58ad710625adcc44276f25641d SHA512 1d21f83315d948a31e50e7fc21d026e2ae5179012f59c2334c719fc4420914c9368bd38e48b50dad1278c0d2654490706f590f505b6f3a257aba9782e8c48843
+EBUILD ctwm-4.0.3.ebuild 767 BLAKE2B e4ba76289be984aa4d458c449930512833e05495e641a5e3d8eb56afa93513d224f20167a2374287ffc386a7910b8b15257203d464f14643c9878d6d6d7565ba SHA512 53804148aed3f2034427917361db1ec7bc8a9bdc210351a4afbefe53a62e0ccfaee08c229ac1676d9231ccae8bbaf01d1e1330eb916d9f4e658176fe40ad8111
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
index 7160731c35e1..b19c081cece3 100644
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 63fd567ef40a..76858cabf874 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	x11-libs/libICE
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 7c515d536dc5..8686c0c6c1b1 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -2,7 +2,7 @@ AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
-EBUILD dwm-6.1-r1.ebuild 1500 BLAKE2B 4f54fe37788a67fc2c9b7813277dcb3834d43ef71898f3ed6c8b15769eaa90437fbdd681408c902a9d5c1018e81efd028703aafc40c4be5f84c6804b7e2124f2 SHA512 227965d0b76a92c0610ee841c53d35bbc9ebca94ddf298fb80a0970e0bc1112d43f872a33382625085ec1759b60d532eedceb32128b9aff5606014066313544c
-EBUILD dwm-6.2.ebuild 1089 BLAKE2B 947e7aea798fdd1462b42445f59cd44940da7ec44f1545f7b28c629a3f9f8bb4bb0c5ddbd9b3ef32fbe6f24286ba766ca42767075a90d87e8adddc216b46ceca SHA512 0beb68183cf8a327d6e7fc7aaf561ecbf6e7d8995f6e3115b3c7f91f70fdbf5b7564f23bb3f93db713110ae671bfcb00ad668f3107af403c75fa3517ce120c09
+EBUILD dwm-6.1-r1.ebuild 1490 BLAKE2B d37910e5a5d8dab132a74773d96e8e07c13fb651b5f3ddfc55bf2cdaafeb3415de7f35ae2152312c70d17d922881056b8c4a204da82a00715be59e0e7f9a1eb3 SHA512 1d585462b675b5a7dfb322ae1c4c572006b56665024f6ba56ca6e58fb7dfd65b55adfe2adf94c678c0c44cd916bc1616438f7b0e8629a40758a794e43a874220
+EBUILD dwm-6.2.ebuild 1079 BLAKE2B f5c8b0c78e26eb19b45d7dacc41b023c5432a6935cca5063d5b666702367b3296a812da573ccf6276eb9281a2f3edadd6d32e5fa868518f184e25b7a08fa9afb SHA512 5fab8fa58ae25ce91201757d2bf447ed61378ffe9e087244b6f98cf0c2dfb70daecd3088a61d88158fecd1a0b8f623dbeb0f8428687b1886664f0f45406396c0
 EBUILD dwm-9999.ebuild 990 BLAKE2B 8deec468299dd197361b29dc829c44c1b0d181112f18e829b40a9642e217775c54255f9d63c3718ceb8aadf30112cc225379316a9f76de12d63df160662c738c SHA512 7937a6d7d8961ef0508bd1ba74c7bb9ecbad5ff984ce3bc1560a15644d0fea8596d2637a001c3e838d1bfb07ecf77dfa4944c7faee9f987ea36638e527de485f
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
index 27ca2fa28dd4..c47fada5686c 100644
--- a/x11-wm/dwm/dwm-6.1-r1.ebuild
+++ b/x11-wm/dwm/dwm-6.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/dwm/dwm-6.2.ebuild b/x11-wm/dwm/dwm-6.2.ebuild
index 0344b44e7166..084d507db930 100644
--- a/x11-wm/dwm/dwm-6.2.ebuild
+++ b/x11-wm/dwm/dwm-6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 6703d2d3b0c6..151476bb75ce 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,12 +1,7 @@
 AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
-DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f2713db26eef36ac204f666dded8a07e91edd260192d413b88e82609c700a71a3459defe8dcae6b778601473c32565799c15c8 SHA512 e49ed9d1d1725cbfd488eb654c3fbe60700382e26136d568b23452cff0112c49953633fd7ac9df7b64f910d37679681b2b9b417d710f46608e97c4060362c7d8
 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.0.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
-<<<<<<< HEAD
-=======
-EBUILD enlightenment-0.23.1.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
->>>>>>> next
+EBUILD enlightenment-0.23.1.ebuild 2727 BLAKE2B 5762d29cf862a1864edf0fe7e8ee856e52a977e50bad5ad4b17793c496f9e18067fd135e826de0bfa6bbd862bc8a7dd61b53135b9f3688a3ca233d7c4886a269 SHA512 bfd0d029838fb9c93b39f2d1db85ee67ac915603fc0170edc6c18260a887a55e8f1acc7fc2e6a3c99db7d12462309477391f69772ec014f4e3944cbe6d0c436d
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.23.0.ebuild b/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
deleted file mode 100644
index f919e54034ab..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-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"
-IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
-
-REQUIRED_USE="xwayland? ( wayland )"
-
-RDEPEND="
-	>=dev-libs/efl-1.22.3[eet,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	bluetooth? ( net-wireless/bluez )
-	connman? ( dev-libs/efl[connman] )
-	geolocation? ( app-misc/geoclue:2.0 )
-	packagekit? ( app-admin/packagekit-base )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		>=dev-libs/efl-1.22.0[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-	xwayland? (
-		dev-libs/efl[X,wayland]
-		x11-base/xorg-server[wayland]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-enlightenment-menu=true
-
-		-D bluez4=false
-		-D install-sysactions=false
-		-D mount-eeze=false
-
-		$(meson_use udisks mount-udisks)
-		$(meson_use bluetooth bluez5)
-		$(meson_use connman)
-		$(meson_use geolocation)
-		$(meson_use nls)
-		$(meson_use packagekit)
-		$(meson_use pam)
-		$(meson_use systemd)
-		$(meson_use wayland wl)
-		$(meson_use wifi wireless)
-		$(meson_use xwayland)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	use doc && local HTML_DOCS=( doc/. )
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	einfo "Additional programs to complete full EFL suite: "
-	optfeature "an EFL-based IDE" dev-util/edi
-	optfeature "image viewer" media-gfx/ephoto
-	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 matching GTK theme" x11-themes/e-gtk-theme
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
index f919e54034ab..ac2cc1030190 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
@@ -98,6 +98,7 @@ pkg_postinst() {
 	xdg_mimeinfo_database_update
 
 	einfo "Additional programs to complete full EFL suite: "
+	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
 	optfeature "an EFL-based IDE" dev-util/edi
 	optfeature "image viewer" media-gfx/ephoto
 	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index 4d7ababe61ec..34fabcb0910f 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,6 +1,6 @@
 AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288
 DIST evilwm-1.0.1.tar.gz 31468 BLAKE2B 64ee8c0e429c4eefd908a700e727845f2de1e7531cdfb51133014c05cb350eb0bed02476f8a81155b5f70b6b164279ce220aa82d2e9ec8d017b54076a7158f6e SHA512 f9a5abe13ce7ae9fa9a72962316dd7a847419f29a6ab7270315da5a71058c51bde620d34fa690f9de29838490e1da68efe72c6ef33745d69e3e026de98ed3938
 DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb11aa755bd21a141ad66387a7e95106231277caff84579bfd61183a554427319c7d85ec20716c69fc3cd0968 SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d
-EBUILD evilwm-1.0.1-r1.ebuild 1233 BLAKE2B 99f09ec16d1fd500850ccced08436bebd51f81042bf156a3bafb8bf2680bdb8f4479ac6430f88fb0dde6b77b32fb37af99a9b5c9be6fade813e63fd2b37f58e3 SHA512 62ebacf436d095c3ac289ddef9f42563db114321081e4f18f74bbceaa4db03d5d265fc3ee288babda3ee57cc7c9aad9473cf86656093bd4e17e20fac0febf580
-EBUILD evilwm-1.1.1.ebuild 1126 BLAKE2B 18e4e7b222f1dfe4d87db64e5c62769a6f7aa24646b2660589a02e42b7abaf18861190b5c30c86d724a9398b4fe0a88b0a0effec43666b0051158aefffe69122 SHA512 a9927f36d4bf6bff96149ae301afc2da870618e0da508619c55adfb5a39ec8205f17c9865e89e49b32d9501439fed5d804996998cd8607d598f1ada84f725308
+EBUILD evilwm-1.0.1-r1.ebuild 1223 BLAKE2B e7bbe7e1b43028dfd6e744cccfc700e793397ed9914f479d2d2f642c6a25dfd7ca091edc56e1f11f4d8547aff0221af0bf5c26d60d9714f7640b2317b3d0b587 SHA512 c72165ef346973903a2bc3095fa3a4b0c49514120ea373db0ed5b9491893230957e6a96fd0c6f776315031bb48b43e254d2c2bea393a9854e42d045e28e6ce13
+EBUILD evilwm-1.1.1.ebuild 1116 BLAKE2B e9bea1716873f640641cf308013c04461b410ca13f974cdea94f73145f83c7cf8895919a204d15af4cd5dc8460e017d75561211b2df7c7b4f230e02de3ed8797 SHA512 52926c749e4adcfaeda8b2e4917c506f9400dcfcf1e49c24e63b7b6182825a4c98fe9596c47aae00b23b139d727a90a9dbb13b81cc262f99fa596ebf8cddfb0b
 MISC metadata.xml 629 BLAKE2B 8fdd2e1f8890c3f40133a3026b38e99ca807fbb861def884e574e5d3faef342fe39b65a8da91b0d0d5cd23a89f996cc47bd2113a40ecaf9996def58438922d24 SHA512 b4b8fd73b2ec512b1307265bbe7f5c4c67e8a78beedda86beecb9fd8cce164b776ccc75a586499c0a6cac7f31cb54908d767ad35bb427ae03390057c77727999
diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
index 24472c3a050a..71d479b782aa 100644
--- a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
index 78d001de8a73..3b606f61497f 100644
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 510565b8e581..efa360686b72 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -7,7 +7,7 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e
 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 3161 BLAKE2B 1cbb67f575779a24d910a5e8a264876d4f0ee180b6d0b22206e9ea60a432ec3592639309e2e0c4c49c82ddc8469dbb589dec6d5a222ca758026cb53158ae7ba3 SHA512 2a51804ad745a5f67027afbe86099f9928d32c58fe995f74488e7832aaebda3b419140ad6bc1a93527accb55a5684842406a2be1b4ca3e74cb5d37751389f073
-EBUILD fluxbox-1.3.7-r4.ebuild 3203 BLAKE2B 43f02729b38eb94d55cca497b92020c608f20120fbbf424620c7805fe121f90053408ab1d251c78524e79b0809bd43209db4cbf672ad28a6b053a994d9adf8ec SHA512 eb518836570debdee0aa768ed44f998bef1e917a6cd5fd03582582c8995a081c002fb86d7cb05f3dbdb7802b5eb762741fb22becb797659b081248753ac0584f
+EBUILD fluxbox-1.3.7-r3.ebuild 3139 BLAKE2B 42b73e75a4b21e4c3411d6ed93f72811f70596927a4b86c16871a0565e57e2567a4b1a7143e0403f753e992cc31b8d0fa216ba166c02672107ed3d493d201823 SHA512 08da466e88dfdcd6e004d6a9fa920647719449f4f16151bb28ecac167a8a4a790b61c0af4c62418cc181c7e092af184986c05a2f81ea613cfe61f6210b908be8
+EBUILD fluxbox-1.3.7-r4.ebuild 3181 BLAKE2B 1c770932e24e23ecce3c91a92855668aec1a2d62e5a63c07c59f38854ae0a010b17b485c77aa2768dbaae7d2682522af04207278a9ade6fb94360c838de0a124 SHA512 d7106919280deb96f94bd41226c6249d910fe821c0c800cecb856550a2f16879143bf714b522834a9d6780dcaa7200f5e80883d382d8253bbe83017377524ab0
 EBUILD fluxbox-9999.ebuild 2989 BLAKE2B fd1ca1cb0e2bd290436a65da63b431204996ae1f046b3a8876d42fee5177fef3c81dd9443a1d9855a1006964d2289f863b866df597f1c633a735050ccd62a0b7 SHA512 4c77a116e4e5be9ac525b1047bd39f45763b6300d97c4efb34b8bbedbd3de9ba56cc4c7935b681b89cb3a38a7116f4513dd3641d30caf44ef07572aae4fa328c
 MISC metadata.xml 1000 BLAKE2B 37bb680df975da4d9074c20418218ba2da7ace4d50d89ab9b802a3b71ac1270a48c1ae33f25c1c3ec07719d6b021d4538a44a535f945c8b73de5a22d9b4eabd8 SHA512 7c3c819b2e19ea143255b2305722bb09f70cfc304f8becad482ffacbf751a934de96a3e3635cc95acd6e2529ef810a08eb7011632baf064fdc6ce27c307341d6
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
index e77bc234f23a..165e79552f94 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
@@ -14,7 +14,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!!<=x11-misc/fbdesk-1.2.1
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index 9b32e3c6335c..626346fbc060 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -14,7 +14,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!!<=x11-misc/fbdesk-1.2.1
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 01c6ee82215a..733c54d504e4 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -6,5 +6,5 @@ AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6
 DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
 EBUILD fvwm-2.6.5-r3.ebuild 4836 BLAKE2B e29921f9446cba23a2a252254f73fa7c3af3dcb67aa1d96865c5a84ad71ff02555f459e60dd54731f1110ad72d52da3f70f78a4b1cf56b9e1718461e76ecae69 SHA512 a541d24e9af5ffda54079bcb998496e68beec0ddd49c3f686ed828110f2872fea706d22cd662552dc10ee9fdd4ad2530b44e2d0b94f43176c0c16095797c18c9
-EBUILD fvwm-2.6.8-r2.ebuild 4155 BLAKE2B 314c6982645449e98021bc7c9a6830f41d3ce2b60a5ad33147b985c3e668ba6a07878b12c15be803b100f3e002dc80a9c985ed5c805aed196bdfb12ccd110f62 SHA512 28795e230d8ce1038c639e538821d214ba4e90d351a1d21ee74e3ad4117a2345984995d3227a50d4a43aa081dc8e4f8f32203e2d91f553ae475df2172acf488e
+EBUILD fvwm-2.6.8-r2.ebuild 4145 BLAKE2B 9706fddeb0107445c644660b80de1c7926e0e2df4a54f9a2574509123934a2ae6e315565a97052549efef413d16e73d001596a64e2e4b9ff0f30d27b67d6fe88 SHA512 d32a9ca91344023b5741c48cd63b766f0c2b22bb3a45a2c6a2234b8492bd9048bd85946e3295d5671f4b2451fd9e14b8bf9c83d86919291cdb6eb25b2c263867
 MISC metadata.xml 765 BLAKE2B 003f88ef882dda6da8b314975c8f40ea450faff79e086f962946e3634ec8722dc8b0d821692d8daa4d80ac6025d9b7e21827e64ccca3407ea60a79c12d752b3f SHA512 0feb8344498792784c3d640455316527855b7d37f1e6d3109776bec2749b48819bcc6b88f55b214d6675eab671add82e9338c52817cf4e0b25a20ae390519581
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index 02edbfa8a8f9..eb52e364b68c 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 FVWM"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
 
 COMMON_DEPEND="
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 54d7b3e1863b..938101398d27 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,5 +1,8 @@
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
+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
-EBUILD i3-gaps-4.16.1-r1.ebuild 1726 BLAKE2B ed6032ccaae1089c2c6a3874aaaaffc090d9480634a995166c7d214c628b562a4a96625d1a586126f1fa2a649fd5851ac3d75610bf185d9b84d2ef5653b8c3ee SHA512 024abbc3412fbba63864a16a0fcead29e855eebb72fc8a88b0d20e69bff8bf623058ac5d982d72af2438550bd8552393e71a1e617a450ee39071c8f350450df1
+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
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
new file mode 100644
index 000000000000..d4f9113e6b15
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
@@ -0,0 +1,71 @@
+--- a/i3bar/src/main.c
++++ b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+  *
+  */
+ static char *expand_path(char *path) {
+-    static glob_t globbuf;
+-    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-        ELOG("glob() failed\n");
+-        exit(EXIT_FAILURE);
++    char *home, *expanded;
++
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
++        }
+     }
+-    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-    globfree(&globbuf);
+-    return result;
++
++    return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
++++ b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+  *
+  */
+ char *resolve_tilde(const char *path) {
+-    static glob_t globbuf;
+-    char *head, *tail, *result;
++    char *home, *expanded;
+
+-    tail = strchr(path, '/');
+-    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-    free(head);
+-    /* no match, or many wildcard matches are bad */
+-    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-        result = sstrdup(path);
+-    else if (res != 0) {
+-        err(EXIT_FAILURE, "glob() failed");
+-    } else {
+-        head = globbuf.gl_pathv[0];
+-        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, tail);
++    if (strncmp(path, "~/", 2) == 0) {
++        home = getenv("HOME");
++        if (home != NULL) {
++            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
++            expanded = scalloc(strlen(home)+strlen(path), 1);
++            strcpy(expanded, home);
++            strcat(expanded, path+1);
++            return expanded;
+         }
+     }
+-    globfree(&globbuf);
+
+-    return result;
++    return sstrdup(path);
+ }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
index 0f5113ed0c6a..ed9539d89182 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.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 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
new file mode 100644
index 000000000000..0f5113ed0c6a
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+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="doc"
+
+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="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-lang/perl
+	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
+	eautoreconf
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+}
+
+my_src_configure() {
+	# disable sanitizer: otherwise injects -O0 -g
+	local myeconfargs=(
+		$(use_enable doc docs)
+		--enable-debug=no
+		--enable-mans
+		--disable-sanitizers
+	)
+	econf "${myeconfargs[@]}"
+}
+
+my_src_install_all() {
+	doman "${BUILD_DIR}"/man/*.1
+	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/jwm/Manifest b/x11-wm/jwm/Manifest
index 7e2f03e80bcf..036ad2017142 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,6 +1,6 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
 DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
-EBUILD jwm-2.3.2.ebuild 1423 BLAKE2B d9033cea48ccf8414941bb5a6e2aecdd64e59e2aef5074a599df926729f7a8dce38424ae95beaf89e11fdd66ec2eeda00c8eb134be100520cb22f684680ef806 SHA512 18379ea09e94db1c5996752ccb75d13c5417b548863804c2c58885125b8d463e897e2baf233298008fe6a1bd829035e72221c471afdee78af3e8d3dc17370645
-EBUILD jwm-2.3.7.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
+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
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index b1ada2e713ec..f36dc844c028 100644
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE="bidi debug jpeg png truetype xinerama xpm"
 
 RDEPEND="xpm? ( x11-libs/libXpm )
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
index 44d5478bb9ef..ca8612d564d2 100644
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
 
 RDEPEND="dev-libs/expat
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 1f2588ab4934..007b509bb9b7 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r2.ebuild 1057 BLAKE2B a7afdecda207c950831fcf873c551929168ed37735749c62affc636cbb682c1e8f5bc708467f5944190418865d88f2bc9ee457819549b166c4c823b026caaf56 SHA512 c17d3d863ed37be157893696f03d1eaaf9dbfc5d80ab50640e95dd797249ab9d1e790357c7800e68f628ee73e9f483ac9f8e5c6f3b1d8915fea2cabca6a865ea
+EBUILD larswm-7.5.3-r2.ebuild 1047 BLAKE2B 4c6e45f35500f6313c95ff82e2f0b2f0238d4777a5914257aceb1282d370c54e1b5aecd3e7c5c0b877da88a0895a24c8b03688980cdfacf3c82160f2b65893d8 SHA512 606a46d0fe535cedfdc002c26d2aed3a33f9d4050af1ec9a640115ca9115793ce9c504b24b7cb5d7900ab81676a1d56eb63aa8c4a20c95500f13a2698e062249
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index e3ae4ba69ed7..1384cb89495c 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index 545eb07de67a..c9ee96bcf8d2 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -1,3 +1,3 @@
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
-EBUILD lwm-1.2.4.ebuild 846 BLAKE2B 121047c38e7a21b3bbe501ff7d36a153d66481f6be28372d7381be5d76c886de13eff9488a421c281c9d24fb4e0854bb4b6a1dc25c9af1e5e98ab67ca01f59e4 SHA512 d420e0b3b76af67f7240b802b6babee9fb618d9de9e68ba1969be9f30834c4a8976429e167d95811b792770739f0a16ec15fb7bd246dbbcb2655ed49251c0eff
+EBUILD lwm-1.2.4.ebuild 836 BLAKE2B b199ba3cdc0c8db6ab8419eb2ba91718222bf924180216746c4fcdb8d00d13d44c94753b760e789d938a51cd1178134c1da1e6a4f8bce40b6837a5773fff9776 SHA512 178b7b33b82726d6d9c5e5b360deec0381a62c03d4937472a4c2c0477c90f448633cd2c051af650148a2e26435f65be82e23d7ff954b5ae4ea9474564503a0ba
 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 7301a62bd4d5..563b885460e9 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The ultimate lightweight window manager"
 SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
 HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
 
-KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 39e5b983c944..7ac3c0a1e750 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,7 +1,7 @@
 AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee91959f04b625eaf6c67587e77ac1d3c693ad177db88aa9bb858aab80422313a7709ec48daa594d29b14fd8f9805c1160e98a6 SHA512 35d36dd2ddef05e21491df75a1d14c3d26dd17a8da79577d06fb3b7ddf6a179c7e23bb777e4cbdaa4bb4ab745db023981645f3dbe4dcf75c7b4d5f46e18b96c8
 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 2594 BLAKE2B ef9ff892778fc44f4cfbd9fa1f2ac7998024ebb12a5bc954b71697960d6f276cce5693efed765fe71bf9adc23cb0a3ebf488bc818e1fb2758a85e1e5290c9277 SHA512 a4ba6d7defee0404602347b17c042a546559148e8e621f30bdbf422a92e5dee8c5b497d6a67b8e2a6aae6a2a4c79d9f77f06c86fa28aa4c308abb4053a4a7c13
-EBUILD openbox-3.6.1.ebuild 2618 BLAKE2B 96a755efebc4fde2ac341048e767893cc9c82c0cb47a4140146ec352a6dcbc773b89a355173e3008afa3c8bd98b6db7405081dc1fd09240bd693bd31f4cd8d44 SHA512 a3c2c1f42534ad94f90ef5273c5e2a684345e73845d345b83f1ec0304104e7ccd5f9b30b09105f447c3b67ff95691f57d423f9066ad8931b0484a1b4c4d7e2dd
-EBUILD openbox-9999.ebuild 2581 BLAKE2B ef4f0613b93adb868ed877750c25ca29b8c0c1ebea7e7eb5dce9e2d1143ed6701ce28650b02b6ad7559c65340c6a5c3dcdcfa8e312a0dda764d539b3d8670338 SHA512 239f7cab61eda0dd244ceab1b18ca3f12e0edab8bf965a5d1a2ccebf2c4e1368d2b3cf8c96568d28bb11ec41554b5279004ca7a9c4c416e90398c46343e77109
+EBUILD openbox-3.6.1-r1.ebuild 2584 BLAKE2B 95dad82aebe611f66b5b4e6bf949faf3b2ea1ef8890c06733f603097ec88fc9284a9935cc5d61c7b432b11bb42744632f2ec687f380d53b914b6f72db0556f42 SHA512 3b82c0e85f29e7a7a08fda6a4e07c896e36e39382fab54c8ab0a161c4d8f41c64e7afaeeb80c5b7908c52e5383ef381732b21aaf5cd6cbc43831c58ba3776e47
+EBUILD openbox-3.6.1.ebuild 2608 BLAKE2B 2b7d6ac171c0801bd902503a28fdb07efc9cdcf14926049c27fa1cd91152e4c4cb569b51f2b0d59a7637abc0c65308fabbe2649fd96e2479c18a257244ee1c25 SHA512 4c7c696b8b63145b9e80b51b6510abe31f818ab5bdb33390947b9c34c3c9883d7a2d44b5328214911bef129f2cd36b3f4e1064ea182841c73f855758c568595f
+EBUILD openbox-9999.ebuild 2571 BLAKE2B 090fa6460c016b773f261a8b18193c877037eb5d4010fb7d4f559d6577c478010f327ea792383ab60182a746281c96ffbc10cdd07ae7875cdf4a4ab82f12f868 SHA512 e86a5a5cee36e22f8cba4f1438f65d29e39acbca9e3c99599ae9ac56535b1340d7b5ecb675513d818a1f1a2a27dc39842b2b231107a08bdb3536385aac3e0dc5
 MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 9b85a6952800..accf171ec29a 100644
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 530cbedae414..4fee4c0952ca 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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-fbsd ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 4341bc332ae1..27180a3f68e3 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index c9416fe8f72e..48b587f5c4da 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,6 +1,6 @@
 DIST pekwm-0.1.17.tar.bz2 405742 BLAKE2B 6cb47f92f8d32358ece8502fd706880478403ec01bb1aea0a042b2f9a110672c923c7289583f4b63b0e190b3979631c60760fae70174ecb205dfccf15baac398 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r1.ebuild 1705 BLAKE2B 67f449a9837e209e5179a77535e20743464245986b014dc8ebb41b318e8c9e291c6ef9d624ab4475044b9ba087365758ec1c3e6ef9bb14eb501ef209350f3996 SHA512 a9a859e4ebf9b38e1eb1a4185462e956c4d9c08865d9b2c38a5ee6a7deee6ff21054af03c249dae6e2fdd706d85678c5269878078ea02d18ee07f8c6d84ebc0d
-EBUILD pekwm-0.1.17-r2.ebuild 1848 BLAKE2B a36026b0214f4f80058d01e83e5b5ab16b37eb499db70d6f21cd096e1405595b22268d55fc87aa2eb9729fb3b47a50cabcdfd83a41e5df0bd9e024468d82ed92 SHA512 b85fad7e124d116d0426a30ea350e479cbdbf6554f49ca410a0635f17f60442c6dd761954973d8074874b55935d3d11f4626c1750c15b1f5c67fd98e847a92a4
+EBUILD pekwm-0.1.17-r1.ebuild 1695 BLAKE2B 4f9f97e2ed2bfe595283c2bd5e7dae38f620d640b6bf4e9422a5bc4434628c77a51fba7aafc82ef988551d45d948b2949d0470903fce65520c12c3d846af909c SHA512 1c0471b6b671428e1227bfbad8ebbe48a0783bcfcf4561d5c3db74dd907264bbd30eb3c3654bbd5a1bde0a520417186e3e6a1c8d5bc862c0fc691969389a7e0c
+EBUILD pekwm-0.1.17-r2.ebuild 1838 BLAKE2B 40795ce2f870024b519d76ea7989a62d805cf92b98b47a99ec3d3546fcbe756dad66f6c435e4c5adf3429a705e380c03fd34e1e037827b4ba48d1cabda106149 SHA512 2716cace727eec86daeef1b53754339cf50962421ff48b09a8c928dab4b7735cc369518a00165653f582df6410b0a55f05a0d716eda0580d0d9ad07990c9b7f3
 MISC metadata.xml 1043 BLAKE2B 0f25d178a73e10fab1bf25342cbc22c7353c7c3687e92473076a39ed37b90f96826dce5b32997976bbda17e1d13b1e706f7a42c635001807b5e63224045af73b SHA512 b49fe56ed6f19963222c1268e8ef524525767594b969e6359f3efb6aef3b3dd25ebf9e7cb31bc8150c5b3d4e282d3a814d61b657a5e79eeddeb40730fd2f9b50
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
index 0eb0537b1d5d..ec556a922a71 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=" amd64 ~mips ppc x86 ~x86-fbsd"
+KEYWORDS=" amd64 ~mips ppc x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
index cd3c4a3b07f5..c5b8371db7c8 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 4d76f3e054de..ad5131a0ed7d 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 1805 BLAKE2B 0c2019dc6ef6ffb9da23f9080ca73d662ab5acafc9c020770c11da60b2b911560fcc878f95000c023f55b7c5d551ceb52365ee7f3cae75bc992eecedf8ee2dda SHA512 59963dff1a5ffa529180cd8386bce013d0c34acf8141eacefaf798fd219ae4bc18842f5a07453167fb0dcf2823a8e12dfb1313a5fb7c8f55f65ecb93dfd6bbb7
-EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 97cf322b05d5caf5490601807b31aaa42a9e03075661ef1742863d6f7e53a6f91689b4177cd3755018b3dd51258bceb831927a5f7d1b054bbd915de91777727d SHA512 25ce182945ab4dd1d3088e1aa85e6f9b803086dc468bd9c2fca35730c290249cd79ee635998f6c669c9c9699852ccf88d91f4a7622d3805634e2fe67d96b648c
+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
 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 a53471373a97..38c02775f2d7 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft"
 
 RDEPEND="
diff --git a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
index 465f6f275d83..6a1d81a91a5a 100644
--- a/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs +history sloppy +xft +xrandr"
 
 RDEPEND="
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 1fd3be3b6b1e..0d6f822b0bd5 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 2003 BLAKE2B 69689730543c20f1de8e8633b97c0abd4149c9b14f66b505ee13a546e396f91c6555bfcaacb7b39dccaf5d56767b3b1c30db571cc8f857cb9b1dea4c19ff04df SHA512 a10c759e1409c32c138e18659d0f9dcde2a9ffa00434a2f2cccbfd5e6bac5f736d8216939fdc992349365dd84c217eaaefdceaddf404fd8d8604896e0af84d9e
+EBUILD sawfish-1.12.0.ebuild 1993 BLAKE2B c215ab62a52a75c827ce8b76c07da06a4b3101cec86651255792b446f0ceef19fe804a56f5b7a30cfa370bac6fa4efcb663eaad4967a07422d2a7cd503f76d79 SHA512 1fc01c0a4c0e8f691035989cbfabdc2b5d7857ae5277f0a2f0341466994afcdee10cdeee303e6e0499989ccc2409fbef665dbd33587136b9c99fef0f14d312cd
 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 082e2269503c..e59ea8fc3e5b 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86"
 IUSE="emacs kde nls xinerama"
 
 RDEPEND="
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index ac4eb33e2104..1a606300ee54 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -2,5 +2,5 @@ AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 BLAKE2B 8cd466ad4d7effdfc6883
 AUX selectwm-0.4.1-glibc-2.10.patch 677 BLAKE2B 4048952ab652e87b1d2520c5e725cfead0a8e6904b75f5bbabcacc49c94eb5e51c10ce74e3a2ca568b902cffff7e9ef3239ebbd96d9f8f436143451948b6c3f4 SHA512 dd477395578142bfa89a36d3f9f8c669f2a40d4867ef8ba366333bb1c107da4d2286d7ed1e357c3b78653213de5938955f52aa6e275ebb9cf5db0acd3bdcfcf9
 AUX selectwm-0.4.1-nostrip.patch 397 BLAKE2B 457e901557d8229a7f36a7334d3b3fa94f58ff3dd73cb30102d3bae54d08939372052022635f1a262e0c0682d258d365d118c8b9e3b0bba3b30b573b75b9e720 SHA512 741872c826c8ba44da29eeb9701792beb13a0c0a45dd59162c718408a5286876686b02abe301d21d4839aaad28dd993a3c5cf66fdb0d722062fbc0df4f5374bc
 DIST selectwm-0.4.1.tar.bz2 151454 BLAKE2B 849775ff0b5f860256fde9fd69b4a309c856089a8fabe0c8e97bbcd2a010db2ed7adfdce26c88922adf668828d5ab8ef41c7e4732b184cc9ac247fde4e2bff24 SHA512 3ddc4c1560d317ecb6e8e041d63415d16d31b67b4651d9e33fbe3e76a63754b78a86d332077ec091317e985dbedd903c9fdca46eb7cb650ad693039b8f4ab1ea
-EBUILD selectwm-0.4.1-r1.ebuild 714 BLAKE2B da34887af196aa0c89d0f7fad634361176a6956ebcee82f55e3cb19ad1c8fbf66a874910c6e110e1db14b9350c7ffcfbea8b14961ee3cd22357833d0b6160120 SHA512 91f64a604b6a5512034d5a4000288a5f4fc8b64eb3b30b3ab64f6030e603be14a6273f061fa625a45d471ba850ec97eead9d1b3ee86e74a4b6a50e465afc3935
+EBUILD selectwm-0.4.1-r1.ebuild 704 BLAKE2B 4c3ba1949cb189b909f19abcb72f86ae3e44afa666186ea145d534361c87cb2009ec1bc49314f16724ecf230a8bd52d3c61bba02cdd1d9beab5905c967294415 SHA512 7d39ed81e69c0593003872b7a47ace9cf263bb615446d5c642ffd3f5c20124df897b9ff3be7f52fb42364f570dde4e9748d458452bdd365187406984da3c9f48
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
index 31eeaf72cdf2..e06d7d38dc00 100644
--- a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://ordiluc.net/selectwm/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
 DOCS=( AUTHORS README sample.xinitrc )
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 886f0c65277b..70625b97001f 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,3 +1,3 @@
 DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
-EBUILD twm-1.0.10.ebuild 464 BLAKE2B a5ea53553329e6a43680112db3c4903dc59e33471b36bea6f21c179cca15422d9898e1104acc1c7df702c14aef90eb619ff6d5d108771dba6a8a11831459381e SHA512 b197267a873b889644671db1fffb8a1f4f58ef821cb329280025ab278eb3ce0b2364cfcefb7f4b31037fdd098e35c9ca97eb8c0d56596ba41cd01ec279180079
+EBUILD twm-1.0.10.ebuild 442 BLAKE2B 4825655a03935796d7b664726049c7f82d88176d27ef94dde0d4bcb97a7187397eb54f7023e44ae7ef8531d3c9b276fdee058ad2fb1b059ffcfe1b43497eabd7 SHA512 6b818d4767456bb1938c0489c96c0ec6b613840276662754dc71c973a0977aa7e6963c14ec5312e88f438bc8f7c926a716ef39152068df3696b7720c9605038e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.10.ebuild b/x11-wm/twm/twm-1.0.10.ebuild
index 6a5c46e19562..141763f68b2f 100644
--- a/x11-wm/twm/twm-1.0.10.ebuild
+++ b/x11-wm/twm/twm-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index fab554f8a9df..8ec90267077b 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,7 +1,5 @@
 AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 BLAKE2B e1b3dca9ee345f6d76c39de7eba9321f36a75236b14133f7bf4e0019a939020b6daca7e22320e25a15779ed6ca97b679d0331946a05ef05e843a6e074dc48a39 SHA512 74ed936d5fd2a6276a7be921551f7e55c5e62e8cff9c8aa0176b27497965295a8ffbc09b83a7002465eb0c59645e29168955a002cf215eb0c0cb7936731b0340
 AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf806905d37f4663aaa262c9ffbb6ed4ef1efe2fc56f2753002d6d154985be2734b7948206723c314ae4eaacd4bc3e SHA512 f10762468cbcdeffbae4d3d2135c094b054e687caaf991caff90dc85e33d27e69664b978e75deda2ba66b18c537c21670005f02ee8a4558ad83c08f401533d86
-DIST vtwm-5.4.6a.tar.gz 992488 BLAKE2B 15a28556c78a9fc81f656eb6d50a2bf9f2d86ef6938cb8926cbb909c2c0edce6cbbe09270e72dfc29f9c665aecc36dcd57bcbf26af96b1f3b24518427b652395 SHA512 2500dfe50fae90cbceeee2b3dcf1dd05c330abd978a51abdf2768b3231fabdd71975f3bbdc341ebe25101773009cbf7cb12f263a013165bbda5c048e8b602686
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
-EBUILD vtwm-5.4.6a.ebuild 961 BLAKE2B 2d61bc4d825ad2437f3cacf56eb9e58d7ec78b73677cb82e44bfb4dd91d99d2c774d9c72d8c2066aff020185d587d053f4e4d1f10bb407acf74127a3ad23d0eb SHA512 c88fc5582e4067e16d4d447bbf4ca1c603014c198c13dc225a68c11743971f694680db6c96ffd06801faca94a0850e427f44339168fc9faffd445ee35374da93
-EBUILD vtwm-5.4.7-r2.ebuild 1499 BLAKE2B d2cf69f4a2a59f7d0fe68ffe486efef3bef63bfe7c1302d8bfcd8b362255b7b9b731ef448b805e334ad00c9188395f7d2bf1705c7e0faf43a36bb2f8ef79d9b4 SHA512 78b32a43199954cc89670a5402ae3348d2fed59df1469dc2111c32b35f493924b1cd723e1bd3c6727550a55ff31854c96b90bc3c1a2e98fd877b7c8bfcbe231c
+EBUILD vtwm-5.4.7-r2.ebuild 1496 BLAKE2B 087062768d2a22620ea5c6d88833c5cc260ddb1e360f9c5c2db79308a6b408e46de1398455d97b7befaf325ea9e17860fc09d487cebceb17641837a562e5f378 SHA512 214b2cdbd0ee51a5319f3abb49f3f58198b22f2a17da600ac7ffc0aa300459d6c4d7c9aca82b98a6362c276007fb71b00580371fafeef81649962f519ceff781
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
deleted file mode 100644
index db49006317ff..000000000000
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop"
-HOMEPAGE="http://www.vtwm.org/"
-SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/imake"
-
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make BINDIR=/usr/bin \
-		LIBDIR=/etc/X11 \
-		MANPATH=/usr/share/man \
-		DESTDIR="${D}" install || die "make install failed"
-
-	echo "#!/bin/sh" > vtwm
-	echo "xsetroot -cursor_name left_ptr &" >> vtwm
-	echo "/usr/bin/vtwm" >> vtwm
-	exeinto /etc/X11/Sessions
-	doexe vtwm || die
-	dodoc doc/{4.6.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die
-}
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 449d88600609..e2c87e29d8c8 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="rplay"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 99d25363a2ca..fbd297285f9f 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -3,7 +3,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922
 DIST WindowMaker-0.95.7.tar.gz 3238325 BLAKE2B 68a26e8b1281a4ff387fa87517efb46995e5339e2e6e7f71303d3e3e0d75316740d2458067dc4159f23bf1e1b4e1e0bfc22b1428ee4933e4d474a79a147baaf7 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.7.ebuild 2928 BLAKE2B 4de4877dde6b7fbb16d8c2cbbf7285a9214f2352a200baf261eb891f1f23ecd5389b079735482448fa6c4e2804bab2139fd3ebcbf293ad88786ff30a7e0c91a0 SHA512 3b79d3e51efd6707995d4a327b3cc720f3ad668bc990e4dad801ab38f9fdc15efeb1f90819c4119e365d2a346378a009001326679e18cb78a26da11b0c08d0b4
-EBUILD windowmaker-0.95.8-r1.ebuild 3073 BLAKE2B 3a3f5e06b09699353e363e3ef4eba698a1340365039701e63985fad796d2dcf17b41ed1b085ee6bde10d6c021c46b9d80fe2ad9de3b3c60d52169ea40cc62d16 SHA512 ec185f8d7650ddaa24453acb256cc845761fc46fed32f855b12b23e27c3b59d4413e588fe5926ca0be71060157808804904c204a71932f4f68f8d7f128cb28fe
+EBUILD windowmaker-0.95.7.ebuild 2906 BLAKE2B 3c3dca2fc0da68c5aae707a4d3f40229cf9c43c31d4024cc554326980ef09d1f51ad3db1234d95499c5d637df31c45bda2ac604677697e468114cf7e99ad8eae SHA512 bf3dbc0929d6b1d9ea277f9d7696e988cb729f1069e7d0306d22e25a5821bc05477f82abfc38fb6905b51eb60585353320c872765626cb6e946e999681a9c61c
+EBUILD windowmaker-0.95.8-r1.ebuild 3051 BLAKE2B 95b286c13bfa641d77ffe4f11580a1c0115566492877867bf530276b652d50e22255bc38adffe4cf24ee0304029bddf2bb5af369c268bb90e8c900b27ff573df SHA512 150bb225f35a683c86da1a57e808d29d7ec00acc6acb7609a7adfce0c7769e75d114166746b918d186440692839aedfd11caa2b64c4c83444cffcfcf585ffd28
 EBUILD windowmaker-9999.ebuild 2842 BLAKE2B 894de4cc8296ff22ba90d5bf89e00edd82aa256adbabde31861d9f6d1a85c50e32d3c47485c39ff5d20ce7c55da80835fb63626850790823a4d550894f354fdc SHA512 298b72229d0a354ac9b174610add21c4624ae23ccbe9ce850519f93478489fdeb6e1cd40b2f368733c4d89fb93af91181107e554e4c2af81447fa324b5e6c65c
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
index 2343a3d65cae..6021bc61c656 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 263ee42c16f2..18e442e79398 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 99fe1382bc65..aab0fd0276e9 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,4 +1,4 @@
 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143
 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
-EBUILD wmii-3.9.2-r5.ebuild 1636 BLAKE2B 0bddbb73a30b7afea3fb46f73844cb63fc2c39063e60891637d3fe5268296f4efafb9db5703be74dd47bd17254795f83450d3cd2e54aafafcb95104f16fb06f2 SHA512 90750df481374f973539e8a705241b4b516a911dae8f92f27668805363598b569d1eea8605a8d9e6a0407c33878d299af301d7881e42953fc8763caa98b99455
+EBUILD wmii-3.9.2-r5.ebuild 1626 BLAKE2B e28350b06c1eb13953319bdb23383b73a15cd9a5ed700748158ec60d52619e127aad23bd12a0465f3686d346b6bb4e731ae7ddb96ca87c7d0c9a4b196cdb64aa SHA512 7a1294f37cf2f037f9fa3f21f68dcbbc5d9779150b62dcb8d99034142463f1a3cc9eb00c92526aa4ad1a293bf4f57b51a30e8e2298de3298af0200d997c0f817
 MISC metadata.xml 594 BLAKE2B d801807fafe5de7450411e473648981388b862e019854ece2f037a92468847ea3c7117d72e1909cd6452b6f28157b10dae36454d162fd987388466558e31e5ba SHA512 edcd06fe65f52b946193e53d348431ff81917c25c6c5fb7f52be1a202a81b7b05a575449f6bc6cf288f6e2c68d4db240c262378e5133c5b1b2b091e7bdb96baa
diff --git a/x11-wm/wmii/wmii-3.9.2-r5.ebuild b/x11-wm/wmii/wmii-3.9.2-r5.ebuild
index 1fa788d6bf35..ce878f3d1ccd 100644
--- a/x11-wm/wmii/wmii-3.9.2-r5.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /x11-wm
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)