gentoo resync : 08.01.2021

12 files changed, 42 insertions, 75 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0dbf405fc8d6..887849bbe23a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 6add9c549b27..f47532033fae 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,6 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
 DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f97fdd00683eb5388b43678df42a76f1710660ee8036b7100d79a54400c13bf9450333d573a78846d2124516e SHA512 9ccb98c4e80635a781b3f889d8c3ae621c0926a79e9607268924b78bd11137caf70ee9a1edf5bc137d362d2acbe2984645f58ba31c586e6b017797758a66f9cf
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
-EBUILD bspwm-0.9.10.ebuild 935 BLAKE2B 6883ea5f42eefbab9d6f4aeb6c4bcdb289233e9fa2c44e3682b7de43173b33f1eb8d13c5e917d47cb27a0512f4a7369aaa83a556fa0a2ad39de164d3f9b40d3c SHA512 c462e370fac1f0e7ef638e6990eba31708a1f8ca0f3087adf32a48fc0ad4a89dc345f6be69e5bfeba2cb680e92895bae7d07d7d38496b502a0d8f2f358552803
+EBUILD bspwm-0.9.10.ebuild 934 BLAKE2B dfdffac8014fd55dd77f5b825e797edfef806ae9fcdd466fedd0ac4dc66fdc764af2b1fb21b45d09454685ba479f4b7acbe62a7e86f85d08bbd64031baedb8d0 SHA512 aba08d0892691f311f8be246afa2fffe2869ff1c8b55a30c7394197a838b4c616eab91adf671b77425f103702b2f32dc02adcadfb9df256d14eb0b2ba116c1ef
 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.10.ebuild b/x11-wm/bspwm/bspwm-0.9.10.ebuild
index 3972de1a5a7f..b56b16b16c08 100644
--- a/x11-wm/bspwm/bspwm-0.9.10.ebuild
+++ b/x11-wm/bspwm/bspwm-0.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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/icewm/Manifest b/x11-wm/icewm/Manifest
index eedd1cdf1cd6..449e9b226d85 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.8.3.tar.lz 1686603 BLAKE2B 214cb3c7816ba8d94fa56fb9d4a6c630f49f23f69f99ff1ba7aff38aba6f6b7fbd623a284d4873616486d266a7ec412ba9cf4b29479c5c29f1f7ff27e15d1f48 SHA512 697395ff995b57e043774bae2cce667935879c4deab17d9a9059c1e152a90704ad3af618a2c945ac5afd561754895d4e9805f4fea77d5f1e06cf99a7dfd4c062
 DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.0.tar.lz 1694653 BLAKE2B 36feb02d653256b4d6755618da89400c3925279757da32695d6b8c2206d69228bcf392852eaba8b9096d06b60b5f021a0b6b474140a7754c4865d575d8a868dc SHA512 58b9a62d15add73c9c535e8602711636058b67b5e89b6189656a2d0668d2e647b9a59c45b5602f634ffd89abe7fb8a03be094524f3ff6d2b136bb8e21bc79fa3
-EBUILD icewm-1.8.3.ebuild 2719 BLAKE2B f420c9d85bef2b93851fa1d59412b2e95f52e19970c1957e6a6ee62b49454f8c42ef9253a6da6748db0be781fd9f7bf847d81f27a6c96b233b5e4012ac5a8ebc SHA512 289fa93b96464189a1c2fb70a2d2b4a980f511e4a698db62ba8c62b22aceb0ed3a3031b6a07a52640ecbd3d922dbd5db25cc1b20acf97593adbac39bbef4a2c8
+DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
 EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
 EBUILD icewm-2.0.0.ebuild 2949 BLAKE2B e8e0ac64383edd04cbe752917c001dade85ba729d440d6711cd9f80f2506dbd6565fbd0fcd70ab4e0d8051df82c4597040882dc79ff4056762d020bbe25e9e6d SHA512 14ea2d985d54b32c8788a0b35f4ddfeccfbe6edbd45f751992340127575bcecdee972543c37d339541fe24daf3b5b8f828c6918af4a79f11fbd0b2ec8792a323
+EBUILD icewm-2.0.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-1.8.3.ebuild b/x11-wm/icewm/icewm-2.0.1.ebuild
index acff330bc419..ec1d0545c005 100644
--- a/x11-wm/icewm/icewm-1.8.3.ebuild
+++ b/x11-wm/icewm/icewm-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,14 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
 
 REQUIRED_USE="|| ( alsa ao )"
+#?? ( gdk-pixbuf imlib )
 
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
@@ -36,6 +37,7 @@ CORE_DEPEND="
 
 RDEPEND="
 	${CORE_DEPEND}
+	dev-libs/glib:2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXft
@@ -55,15 +57,20 @@ RDEPEND="
 		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	!gdk-pixbuf? (
-		media-libs/libpng:0=
-		virtual/jpeg
+		imlib? (
+			gnome-base/librsvg:2
+			media-libs/imlib2
+		)
+		!imlib? (
+			media-libs/libpng:0=
+			virtual/jpeg
+		)
 	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
-	dev-libs/glib:2
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -71,13 +78,18 @@ DEPEND="
 BDEPEND="
 	app-text/asciidoc
 	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.6 )
+	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
-src_prepare() {
-	# Fix bug #486710 - TODO: Still needed?
-	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+pkg_pretend() {
+	if use gdk-pixbuf && use imlib ; then
+		einfo 'Confilcting USE flags have been enabled:'
+		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
+		einfo 'Using "gdk-pixbuf".'
+	fi
+}
 
+src_prepare() {
 	default
 	eautoreconf
 }
@@ -101,7 +113,9 @@ src_configure() {
 		--with-libdir="${EPREFIX}"/usr/share/icewm
 		$(use_enable bidi fribidi)
 		$(use_enable debug)
+		$(use_enable debug logevents)
 		$(use_enable gdk-pixbuf)
+		$(use_enable imlib imlib2)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
@@ -119,8 +133,10 @@ src_configure() {
 
 	econf "${myconf[@]}"
 
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+	sed \
+		-e "s:/icewm-\$(VERSION)::" \
+		-e "s:ungif:gif:" \
+		-i src/Makefile || die
 }
 
 src_install() {
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 667cbdc9a341..feaaa2291ca9 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,3 +1,3 @@
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
-EBUILD muffin-4.6.3.ebuild 2228 BLAKE2B 52fe08aab371bee6718c09a155b11b5e28e8bf1ea30f257b869aac12e78622039f5fac45dde5b60c947d99ff03eb6a58a1561471ef7be31ce7aa7a591afaeaef SHA512 132480d8432ea77c23c2b97dc8f7febe4ce93f4b90e166642999700b65265e92f7c926752cfd0e708823f5e1221c50335707d79aa273eca4ca4fd5c1a9d6c847
+EBUILD muffin-4.6.3.ebuild 2227 BLAKE2B 701c1acb5e51e8cea8f8091a9d4de96a0891f49a55d5c79924632670104cc9844c1530e4a3a45f30a40d0d89666e951be442ab0386e8bc9275edd8ab45a1f16a SHA512 0370da5f4e7ce8b90b994550562666a89061e36c88ed6d0aba4779636fc444406231cb726e0c11120c705a4d888997a52d28844589d805441b4a4bb6779b295f
 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
index f6297dbb2262..150cbd51a513 100644
--- a/x11-wm/muffin/muffin-4.6.3.ebuild
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 8988f4158366..d68f5a06d844 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -4,7 +4,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.8-r1.ebuild 3129 BLAKE2B d13ae66f5e57a63da8634571057afe5f0a56aa15904a20571219101767cca8e6d1a9ba376d08157d42ae497380df6d48b81f5018f1ded3b9a59404f58eb90627 SHA512 c478f446122ce9e798675be0c11f6897444fa6337759d92903429e3cf9c700ae474f5cfc85e7154acc6c9f7993cb857d79f098a842f5d8721f08bc75c63da977
-EBUILD windowmaker-0.95.9-r1.ebuild 3090 BLAKE2B 370be7bc17a2577ad8ee1e30b2d9883bfdb3ef5da51b7255a1e53af9db9a0ddf91434dca33f0f656ea132ea4d6b8c9627c629cbcfac03ed3e3be4779d96d1bd3 SHA512 4ef74f85931d2d2ea4b217bb05ee2d4d4a8967806d0a5724d07edfbcb1ed1df1cfe10788bbf517fe2e9e9fc3796febc405276a33676d0b5e4b221f19f7ac8bb5
+EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 426b31a868c8d9dc807eddc211ede8c54928077aef7eeb72e2f264a5d8da95f76f606829237701e383e3a14ec323586301ddd72539525bb9078d7101e32e5186 SHA512 37c1f9604e7811cb025e43054d1848cfa1103fc24921419ed66e17cd4e816c45ecaeffef2ea2a2c11373de35b4ca23124ec400bd60944479307d4dcb13644aa0
+EBUILD windowmaker-0.95.9-r1.ebuild 3079 BLAKE2B 333833e1b61ffe17dc37e19d768a8e29f254c038cfa8dc46c2bec04a8de420769d6b3ec40c669a78c231a72f0a26b270a982b2c3447bfcc43031ce403fd37133 SHA512 0bd1371818c59d3dd4861ad740aabc76e19cbb160acc9a2c56dbd0b1bede9170c29f5d6453e3141fc3c4381ddd4c3c7bb09a173bae58a9c87943b72f9d8bbce3
 EBUILD windowmaker-9999.ebuild 2906 BLAKE2B 2c34ae03201ba0ffce81ec94b337536aee7ffc6a165ca0c49068d2389fd12a20c54c46d28810798ab523c3b2843e90fadd0212e5f7a7592f51d0c910eb56ca60 SHA512 f7db50510fb3b9f6fc34f1bb84cc00a2928cf9af9fd7aad88aa4dab211f5586395f84c9c75ddde80def0ac0d4ad521c29850f81e948e2442f169ea683d5ae771
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 8e1a62e09497..c3e50292c33d 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://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-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 ~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.9-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
index 79a742c81a18..f7096cff3be4 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://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-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 3cab5b98d8e8..ebfb069d2d29 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -4,9 +4,7 @@ AUX wmfs-99999999-Debian.patch 310 BLAKE2B 92f207cad5e54b6a83c08e4248c81a2dd0d61
 AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81d486b79e870466fc4ac94ec07e72cb1bd0e5d45752543b104386d852f619d749f42e6561ea6767cd797a46e0c434 SHA512 5463fe8bbf312a003e48276fd15e6ad04075d28835f18e61260038278e31f4de4a2a7e38ad7358a12d669af973e2297d121adc0f5a2f07077874327e20362711
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
-DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
 DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
-EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
 EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
 EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 336 BLAKE2B 5d66f337a18e7d54f2d7abbc8672612dab7be31e8c1a8d6a2a032a64b249f0f65545ee682b7e1e19df79e7281fdfde0f17ed413be4b87ca3fa50b6870355e600 SHA512 0e2222aeca29e5dd47fda57312c5cbd2f6f21da457a9ba41332455f4be59de94dc2f23df4795131d76a2b524997f2c127427c508321ac465990599e2342e4b08
diff --git a/x11-wm/wmfs/wmfs-201003.ebuild b/x11-wm/wmfs/wmfs-201003.ebuild
deleted file mode 100644
index 27bdfa3ef564..000000000000
--- a/x11-wm/wmfs/wmfs-201003.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
-HOMEPAGE="https://github.com/xorg62/wmfs"
-SRC_URI="https://github.com/xorg62/wmfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	media-libs/freetype
-	media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-201003-desktop.patch
-	"${FILESDIR}"/${PN}-201003-pthread.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i \
-		-e '/set(CFLAGS/d' \
-		-e '/set(LDFLAGS/s#)# ${LDFLAGS}&#' \
-		CMakeLists.txt || die
-}
-
-src_install() {
-	cmake_src_install
-	rm -r "${D}"/usr/share/${PN}
-	find "${D}"/usr/share/man -name '*.gz' -exec gunzip {} \; || die
-	dodoc README TODO rc/status.sh
-}