gentoo resync : 21.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
commit: 265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree: ab18b5617d138f6684566b619405090989d55a2c /x11-plugins
parent: 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
111 files changed, 123 insertions, 495 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 785e9c86edc2..eb94bd473434 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index a570fbe96834..ef12b5ce73e3 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,5 +1,5 @@
 AUX bfm-0.6.4-makefile.patch 1767 BLAKE2B 684136ca5d6efea77304fe735d8ae740c9d72c4aafed1f9ac9194320c800142902c2641c119a1c99aad753ed2032f63ff479888a3004ff37691b92e3fbb43428 SHA512 f5d1353e2ba61377ab03db53640df497eaa1287500d7eecb3b9b1e25f65a7ff9c73d04e48fd2395e5a0636b8db3750396d05f547be661834ee7d65f5fe7bf2b4
 DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
 EBUILD bfm-0.6.4-r2.ebuild 985 BLAKE2B 757d3a92839c1c33be79889b5e752a1dc24c93c24bf0125f3bdd9b362a806c35fba340ed33899e3610db05637c4f2a389231564ae13027870345c2f4b8c51338 SHA512 c7bdb388203ce8e8129049f50fa7a466a9d29eacf07535474c4a71829708148684b116b4a19a3a6d4fbb94445dc4f3d86a1df7652c525aa1164f1a97e4a6c909
-EBUILD bfm-0.6.4-r3.ebuild 958 BLAKE2B 79c1e8f31ef8706b40a12b80e7657e0ebd99e98ef3871297883ee9716dda24c41209ed64a74d37e2238756b63407629487f418bb60faf258a11ba50e93d77770 SHA512 d790a90e185f476e1ce314fe449f80f017b3e7deede7012a1f1715fdc2e834e216c8088793fd057dc0e5e72570156080de07a58b9f068f731881f039dd5c4257
+EBUILD bfm-0.6.4-r3.ebuild 957 BLAKE2B 519e61ce18d765fa174fed0e091a215c4a15ef22b9be90a196163ab413788c7495a040310ad714280680349029dad2577f3747a71e7cdc3ccfcf9101ce4206c8 SHA512 f6680a263ea76202a74e3fba108befd55db90c01a23d7dc82f65e4bacd8a2780c4b671837d99bbab37d0ac68ac455b1fcfed5e523e39f94e6c693c1f4241cc22
 MISC metadata.xml 348 BLAKE2B 97496aab8db3d8075f89e58745d4f988cc33fe4570ade80f97a5bfcda4ddad4be5f2de4fb695eb0b1a6f66af36986ec609bee10ee34fbef7a244489d6ed2e5c3 SHA512 fe0a9044c9c8d839007a04e0ed0012da1d22df3435f237620d49b0d1efa4bce533b116f15e6fa34d1c494d65729d0667ac29a2e06a4b2009ba24510b97f4f93f
diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
index 825865105964..b0f002a9890c 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gkrellm"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
index d70058722630..13d1e9a967d9 100644
--- a/x11-plugins/bubblemon/Manifest
+++ b/x11-plugins/bubblemon/Manifest
@@ -3,5 +3,5 @@ AUX bubblemon-1.46-gtk.patch 3035 BLAKE2B 409edca6249903ab0e5bf241a9282cc3fedf68
 AUX bubblemon-1.46-no_display.patch 724 BLAKE2B 964793bc692ec4737e563c828c9a50fe9f71390b21d465dbfe63ecee342341b94da9de7d54f1f93cf831ef654c759afd2db7049474713c051cd36393ddf0ff83 SHA512 d00d43b8d7ba870fee5406b495d6577062e4bebd9864dfbf5a29a691dd85d65fab7956c4750e16aa06a4c85ec5f030c9ce22d2f12e77b816d0a80f7e61b06349
 DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
 EBUILD bubblemon-1.46-r2.ebuild 954 BLAKE2B 7e9dc43979c430ea55bbe1cc4cbbbd6c8062c11c973ea45e65b2f90052cb37cbf5110b915769b22595ac4fdcdeb290df026010b7c74fcb4ef5986070b9b985a7 SHA512 b2af344c0fe6957e2e176ad6dcd89887db1ddf4c33484c274280a990b49ea5c5edbf1efb51b37a263b6bbdfa8261c901438af8de2d3ebf5f42754e64c4bfb608
-EBUILD bubblemon-1.46-r3.ebuild 928 BLAKE2B c40857652504c02667de72ca00c4c2ccbac7140ca7952b77141356397881a1f49b9874f30442863241aa6bdbea17e1528f5c6bac0f30930d9b46b35c8ea42fb5 SHA512 82259af3e8c644e9fd4a81856972dabbd32b2b9732cebe579b0651df6afb2171a346cbf59842c7feb6d3decc92b69b840660e9f2b50b2e9a07862e08f9ab8aff
+EBUILD bubblemon-1.46-r3.ebuild 927 BLAKE2B f2a7453eda50af99f61ed74535f93f9d2bf9d93b4de379a6ac354d733ccb556fdf6f16c738518128e78cd6e96569b9205504a97f77fbd74c5cfbdcaf54fa2aea SHA512 44b18d8428e9558db18e61882aa9d0b00b6739a2df5f48306530710cf75f2000cc1b417e91142264c6665e6359cbf3904397578ad18d9e74c22c46cb8e6e437a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
index 7650a4f7fe6c..12997833fde2 100644
--- a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index 96068d73a478..d4c5ef23fb98 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,5 +1,4 @@
 AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
-EBUILD cputnik-0.2.0-r1.ebuild 639 BLAKE2B e14579a06a92c54d14521990de0e5f042057f06c26dbd0e0dc13fe975fa09bc8533abe2de66715a1278e51ae433271c1c8ed88547daa67b10f80a5de599c6b0a SHA512 cbdf01a2abc604c2a27856b7ff07006828733fedfbda5fab8fa71dbb564f2cf4d6438a65db911384f3a412fd7e441ebfc9e0aec916aa253de23dc919dffc7344
-EBUILD cputnik-0.2.0.ebuild 733 BLAKE2B de4d82cd0be22b3bc3c3774e4e5adaaf3a396c49b81459cc1aca84607c04f30caa9b440dea0131a7edfa47df1b0bed96cc09050fc219a7f2d5b203da397c406c SHA512 4c2f93045d322ac64265c244ecc28595fa23373f94ddc6a8fdb014f3ab49afd2a8af5bccba0dd84bcae73798e85d5f72972320e2e3c680558553ac2563a7afb7
+EBUILD cputnik-0.2.0-r1.ebuild 638 BLAKE2B f4c865c26818780722b8a828f8c70f5285e956f047c91ee4898a491fd7d4cc495f422fd1c788d081d1b3f756ddf3c745f462473293b16038eec8b72bf58b91ac SHA512 d82d8f76e99611c82b3a0c48b459c4f768ff51276f117a21ecb155b6752e83386d2c2907bed2ddad089261558269f5e0025f83e476826fc90597e06c4813d00e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
index 5c123773ab90..ec561276c8a1 100644
--- a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/cputnik/cputnik-0.2.0.ebuild b/x11-plugins/cputnik/cputnik-0.2.0.ebuild
deleted file mode 100644
index 439645be1b36..000000000000
--- a/x11-plugins/cputnik/cputnik-0.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="cputnik is a simple cpu monitor dockapp"
-HOMEPAGE="https://www.dockapps.net/cputnik"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	dobin cputnik || die "dobin failed."
-	dodoc ../{AUTHORS,NEWS,README}
-}
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index 4e82681f9100..a03c50880932 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -2,6 +2,6 @@ AUX docker-1.5-makefile.patch 1437 BLAKE2B 2b21739cfed306b73d4e7041eaffbc5456118
 AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d
 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
 EBUILD docker-1.5-r1.ebuild 789 BLAKE2B 6b47f8794d0e65bcc924c9c587285cdb8a882108fc13ad731c42b731e99abd1e9a11b784e61f8fbfa1ee4e2baad234b620a4617e215c45664ca8a038de1ef0e9 SHA512 9a3c449bacb800e4c08c9a8a9f799e913d332aad5a4bb30f68223679590b8f8f8259f79b37957299c3e5e6a728de4cfca47f6eb52ca364c00de1560d84eae7e5
-EBUILD docker-1.5-r2.ebuild 705 BLAKE2B d94ef35cde47f5e5fdd383370d0792dff0d19bd7786ee2a0873f956f6f41dda6e32ab998cfdd1d039930bc50632d51831820033434ae53929a6cb03d5b802ec0 SHA512 50a345bea26672c61a2e7ee48a7a89dcf9fe003b68f8be4d9225a95f7c5eb8f9d9c9d751552c31cb871b15d14146213dba03d8f4d37fd753c0586cf649099ce1
+EBUILD docker-1.5-r2.ebuild 704 BLAKE2B c5d88b153f1f9d74f59c51f5ff6abd18fd4640efc9766a5d7306a949a1873829fe7dbde73a87e41e0a49ee60b4a64c1b485d7857e5a39754ae3ac94a2af3d21f SHA512 b6ff252082dad677a8fcd0dcd639b2c0a40ee0107854e152c67b3d0c7a4679f85b2878ef832b54440f413f81ddb5f16858bd31a22400269f3c2ffcf4e6cf8222
 EBUILD docker-1.5.ebuild 771 BLAKE2B 42795ce2e264a5368340781f97a31e52a0be2c76ef448555fd3e41a9201ddb5d00615adc0001a952210a0f4562c740eb8d07d03a012c9b92f8ea4242876632e2 SHA512 d47992ff6c593309d4962e26df3f58eb8f482a4c33e055e374e19c02e774f9b6d145da650b53eed9cbecc15df8894e0a9f0b78840b7ae89b58fbc77535a2bc4f
 MISC metadata.xml 353 BLAKE2B daba7749ff12a604d50b655d91edc03ea4b2259e871f42275ac69b9ce2587ecb6f98f0bd33d664f5b1029bbef88e4575b3a35b102df0999dd8e6d456382a5b96 SHA512 4a9684de4ffe83fb609b3c36e721cf0033814ab4f5d664725d1af8caa9c77e095c03d61c33dd7a0f9458a37c184bd8606235f74cbbc6f5c25665681a6e5c0fb3
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
index 8999156d944e..88f8a5edccb3 100644
--- a/x11-plugins/docker/docker-1.5-r2.ebuild
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.4
diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index fe48715226d1..033c70f7a76e 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -1,5 +1,5 @@
 AUX wmCalClock-1.25-makefile.patch 1054 BLAKE2B 4928c86294dffbf353d88910db3f6757746934738cd5027f5a12719f85dbd933a2d07f4cee5b1d856a6201ef97aa5591a0683a5554cabe15fe12cedd64861df0 SHA512 fc062a5cd3a18d6ac1485d953052e8519c6ba375fb6cfb61511e6526ba24cb7fb391dd0971422c78743cd8cf4cdcc3abb68910939e7f7b8160191f1c6eaff14c
 DIST wmCalClock-1.25.tar.gz 71574 BLAKE2B b1e308d99ee1b66fa9bb7cfcf0c83ae5e637ff7f17a2d07bb43a57d941c654d53f37ee9941e0fafedd617d64cde8c2880cfcbf664c03e109e80fa523ea9a6e09 SHA512 499f91856e79fee4fb776b3fa8cbcc70cae2e28a1e9ea5d2c1dbf5a7684cff4be4e5e9362d672aa7cf459d0bfe14f68ec51a10376558a9635d77e5e6ce7f149f
 EBUILD wmCalClock-1.25-r2.ebuild 840 BLAKE2B 93955ebc51f859e6a6aafe9d3ebaf99235c848c423afd09d5d83f591e62b46fc50af716243fa95fa77bd97375fbd1bd49df586fd32a98ad48aee402c07f1ad1d SHA512 8bb5cd95aa5b9552e8e368668fbfadfd9bd79097112fee323adfd904120e9535a228ef35df9075fad0c4e4ce935174717c3fed05e8d4f564513d690d8853ac2a
-EBUILD wmCalClock-1.25-r3.ebuild 697 BLAKE2B da294885b35c2ed545f928288fc8b05fcf497673fdd848809e00fb6bfc47d7f6925d4232e7c4c2cbec282ecbd31322c05c169b177454f06cd0aafc7e15f8bc20 SHA512 527420007f477dc57f4c1fa34fdc21aba5f0d72e9016fb6f9d346d173b8993a276e9673ec9b27cc542b9bef16d6b3b7b836415d5691734fee017ad81670b9b56
+EBUILD wmCalClock-1.25-r3.ebuild 696 BLAKE2B 00dcc2a02c726ba5c0c8c4e7a54a59be23d31c15a04e8f5d191791751b662ad008ea68889c1c7ddee6afc2ce2d72aab5e86086e1ffeb7ce3793a49cec1047f20 SHA512 69ecd7d464e71893340b5b686f80ce7e79bb983e5302b82682abdd27bddd29c5950c9316742c7b5af6f9a630b0eaf028d69c723647b80476c38a5482296562c0
 MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
index b211b179bcfa..7e70d0038b20 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
@@ -17,7 +17,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${P}/Src"
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index a356ad5d8a6d..4323d6a49e3d 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,5 +1,5 @@
 AUX wmMatrix-0.2-makefile.patch 866 BLAKE2B 1c57ef78dc72af8f9ec41830e3109b6958e4d834191134e0d04877d98864d605668d89c894ef1d4360ed7e2eaa98a2666d5fb9b720c77dc40c11881c7165a348 SHA512 1e843e3699c634f9f9f42ba850d0552afddaff45e36e89cd15511cc9c1cb57822d354d8d6bd2d3eb56564c4e225025280ebc8686e48e9e0f70c38e294397d43c
 DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
 EBUILD wmMatrix-0.2-r1.ebuild 891 BLAKE2B 385c3da2de6cc29e17404c556b32bbd01069334d7bf1d6983a54b2f603ab26e2c4be5bfe955870aca67d7da7552704d7c82163c9cf444931b24d899e76098637 SHA512 c592bdf2eaca1956095eced7a07f8f8362c8e3394da6b54796fed8259f2dc5a1f7b9c960485c094d2f2200e603eed53e2f980e55737a93749d6c3700521a6a06
-EBUILD wmMatrix-0.2-r2.ebuild 745 BLAKE2B 1a092a2a5adfc0bdebe88ccf339dbc280b795eb50b28027474fa11f73d87bd39201a5324b41bda01f06d7eb8a35653d96effb867908071187285aacda4e4b4b1 SHA512 235f4ec0ffef43752d20936662ebcbafb17af0d92f8dedf50451e8896c758b49df8f0f4803d3f8d338893c02743cbf6674c924bd1896a51610c2bede07e26777
+EBUILD wmMatrix-0.2-r2.ebuild 744 BLAKE2B 86c7c4da27cb6a94638e74bdcd83a4daa4cf133a10162478f292d88217b3311bc93ac73bc9a7907a8d2d7f9cd3750bc52d765f74d3ef02875ed5547cbb535cf5 SHA512 f89e3ca57aa2d8fa87ccf97d81a5f5cef8b84a0f82aaaa317150e17b03335008de03d0037f5aef458f225ce55cbf71a8dff63da7374db51500ac42905ef96165
 MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
index 2b088ebf2f11..6396d85d289c 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
@@ -19,7 +19,7 @@ RDEPEND="${CDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index 02fe504c7c47..eb005713fed8 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,5 +1,5 @@
 AUX wmSMPmon-3.1-makefile.patch 1300 BLAKE2B d017661312fe29484eaeffe05a5f8cbacd54c19c3ebc9f52ca6605704427292b23ec695b9403360aaec0d48c61453cf69d4e269f777cbffd8b194a3d078150bc SHA512 e94f9a66d782aaaab3bd637c2657cd34efe1b5e1f556c932171e30814551236f67a1846b688bda8983a072ba1622d37f8aa14528c657e9542404fa8b96358826
 DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
 EBUILD wmSMPmon-3.1-r1.ebuild 756 BLAKE2B 66ba5e71a613e7eb4e0ff34afa1d36d043a564c00450f2049f64364d50adc1b3cc6b967f84a1166c8c111584de69bfc527bcc5265353b72f10b8d4e8c0385cb0 SHA512 c3ada7218117596b7472613c96d54515ed16b9b54afa3aca675ce951c3ff5ae00e58187d030ffc0d33929d99bdf6400efcedf51a676cc964d69aa540491a0d6a
-EBUILD wmSMPmon-3.1-r2.ebuild 611 BLAKE2B c17a8c40198d3e5c027ba31cb4f84d6c62548fb780ad4b3f306d7c385658b05fc67c5e287358c8a5ff3b36e384afbe7a5d2cf10bdde9aa3d9d902523d10e41bb SHA512 7be67e698e6d10d6390104e625c14d5149314a5b3af9aaa9cbf67b1394378b3cf0e603a9a4b9feadd56b5d5344b987b8a44123c2252f478cc3dfd457dd17d476
+EBUILD wmSMPmon-3.1-r2.ebuild 610 BLAKE2B 3a9012afdded56e4257dc955b67ccd6ee2fc1d0d1cfb009a15f608cf416c32a7cb140f1545432a50305c520b5bd63c0a08f2aca71dc0f3b6f20ab7be0f98436d SHA512 2e46edf7078a58e07467b155312b083a39c941a6c64ca1536ad44388be6069853b412046210403f05ab67b90af79006aa4867b850736d08a92ee9bc4aa34bb14
 MISC metadata.xml 379 BLAKE2B 8d029b244f6cba1311fc8af0fa96705ad2701ffe2d4aad6a45e3e86d6a7b07c1749f7ffdd171217c5f610681921006400f6641618a6cf93541e7b257f2441198 SHA512 2fc60cceb3fbdbbb8fd85048bc50b6777461a9c7cf37d8b672ac09d1556f284acfa5df747d704c9335bfe91f93142be1cf39cd4eb19c808a50eb8fe5a27f67d5
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 5ec664e00fd4..268d59eb5219 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index dec3f7c77022..6ab90366cef4 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -2,6 +2,6 @@ AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999
 AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1621 BLAKE2B af863409907790a18fc0b807096d8fc2a38f3d5026d77bdc875a95cd7a0bc89333b0ed14e61828f448eb8a1af549ffa121f37b0b6b913e1259bfd8763dcc17aa SHA512 e1e27d138c061d792dda2cd58af43d52261157795046b5b7d2034764361ada3c7e0e862a5f6b7bef9ca9d492376d8f49c12646bcc6fe6090b65aae6728a85f6f
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1620 BLAKE2B 8774ff131c844a149c1030044cf8fef7ec6bf0deb839e3f5b44c81c3577b167474bd622f32a0cf8449ba5168da54a7ede1ae389b98fb1e3b9218374dc16353d9 SHA512 31af955f7908a1d770470c3bca7fd2bc95580281cbcd029d3646974afe8abec8b3e82991a2e7f871ab6f7a4ec29568ee6b0f89ffadcf5106f0b9fc51027a09b5
 EBUILD wmSpaceWeather-1.04_p19.ebuild 1744 BLAKE2B a50f25070cef9f86cde7af708cc5549f064f6d2bf0ca2c5889d9bde24ab847a238b767f819d3e813baeddc9d8315257fef85aa511aa33f06dbc868962c4b28f9 SHA512 a918147033cb30022ab49c7121531fc14c5dad791d79f156cd220f9ef573fd51e30a903a9465d28b1395d9366d2d5fb1c2bc4dd17339db4e53c20f32490442bd
 MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index cb3cc31c6e87..780f058d13d1 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc x86"
 
 DOCS=( ../{BUGS,CHANGES,HINTS,README} )
 
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index 38e63805b86b..4e6c84919f70 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,4 +1,4 @@
 DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da
-EBUILD wmSun-1.05-r1.ebuild 702 BLAKE2B 213978bc7e35eff17aac3d371f727e338269f1439821f0e44243093b1045b78cb97c5b84facf66b50ce9507c94792cb77f7fee48a85aa1793c68b05e791b8f5a SHA512 c560a749a88eb3b74e2dcfdd5deeea7765f8254a03f4c180152368490bc236a256b8d6b7104706698dff8d0feee1643dae7c164293e313e6f994ad5fcefb8f53
+EBUILD wmSun-1.05-r1.ebuild 701 BLAKE2B 361e7281d6df55bc048dcbc7cd6e301b9ef3019d525aab1a9e7b98a1836d00cbdfe52d299fe139a0fcf4a9000ebcfbddceb42d9e07ec0b5fd99404d5065a4b34 SHA512 62ec7d190c1c3e1019ecdac87e63032afb023b6c2e708cbd6bcf07d73d0a4d232626f1f6f3add6b5ac36c640f6ee5bc7e271527e10459d3f285ad23147889d01
 EBUILD wmSun-1.05.ebuild 723 BLAKE2B 60e1ef0c33cb53316b2c3bf0b10862880b73bfdb0a83b6eb1690207515d033270d05b1a276cb1130e87310d0db7f9f8e3e394b64d8287ce848e463c95c251ddb SHA512 b0e878e7d950679e66279deea4e9ae76689a665236056b82e42af16eb09f8b2e4b2f2c88e357aa1b35f61b5b7164f9a54ac7522eec86c6fd4df2a83f044092a9
 MISC metadata.xml 498 BLAKE2B 5b9cf3d5fc309ce34ff85551823b360a8bab9af01b39896d8c305837dfcbe64b4ada8f2bd61245870bffeec9d64bd7f70db1c16b6676af3996df64ab59898de5 SHA512 e94d3712d961ae49fdb73b15a70270915cfcdaacf95acb7176c35d64ba6b186d6144d55f4c6e1eed36d33656ed82ced988ece1a38f08a5b08658db063d1ce3df
diff --git a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
index b0fda871fe6f..eef53142a91a 100644
--- a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
diff --git a/x11-plugins/wmXName/Manifest b/x11-plugins/wmXName/Manifest
index 092ac13ac442..ddd524090619 100644
--- a/x11-plugins/wmXName/Manifest
+++ b/x11-plugins/wmXName/Manifest
@@ -1,4 +1,3 @@
 DIST wmXName-0.01.tgz 10757 BLAKE2B cebe95354227f7a47fca90dd96225f4972edbcecbaf207d4275993cf1d5acff2fa85fb9ef4322130b98d62d2688317d94a6f513d9106d7fe7f1aa92f5e294055 SHA512 1b94e70fd1cb89b0fa47d488d85d981316efc636d4ef743e9445add38b48d33b1baa1ce38192e6d3b476c0f65aa312394b7dd9edc3f43ccef4f7bae807828b0b
-EBUILD wmXName-0.1-r1.ebuild 916 BLAKE2B 69e5e417ba6c9c54d704144a669ebc57343e1352e89945d078aa8ec650328755c0a88559e82146d72c385f3ae79543d9779ca1cb331fdff75332638516351a26 SHA512 696ddd8105c51377b903b96a5f3ec1ea799d8500dc88ddd827eebfa833dbc9fd45d583a88b68611fa771fc84f7b8a8f5d00779db72527dfbf496c696b3a12ba8
-EBUILD wmXName-0.1.ebuild 922 BLAKE2B 17b41d254186016a0c01efc54e7a6b0047ee7334994b94fe8b51b1100287143284df1f0156d57b56206cbbea6c2cd96e522bc14f99a06eff6c06cb8e8c4677ca SHA512 1ea1dc038e2f8bf21e805e0f6ad29a52bdfccf40e0daa11a93b155ba4f2f6f8759c7db11617641e4847a6b6b9310daac1b272042610f8d2b233850f5978007f2
+EBUILD wmXName-0.1-r1.ebuild 915 BLAKE2B 919256e60a5cf8eb64623aa739aeaae168c4a63ed85739dfe730679a7e28472f474dd38cbcf0a6051597732198dbafb7e6549226c4aa684a7f3bc3390d950db8 SHA512 5b76bc3a420c40abfdcd4dfc0d464051d79a0c0bc22836cef80c5278179ac132d1fdfde1b3ecde5d3c57b65d09eac7b5e9e2a96b15bcde6af50f0e1d3cb7a18a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmXName/wmXName-0.1-r1.ebuild b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
index 425b4cb5f46c..f7d95004717d 100644
--- a/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
+++ b/x11-plugins/wmXName/wmXName-0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://source.xname.org/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 COMMON_DEPEND=">=x11-libs/libXpm-3.5.7
diff --git a/x11-plugins/wmXName/wmXName-0.1.ebuild b/x11-plugins/wmXName/wmXName-0.1.ebuild
deleted file mode 100644
index b3fbbf1a6215..000000000000
--- a/x11-plugins/wmXName/wmXName-0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PV="0.01"
-MY_P="${PN}-${MY_PV}"
-
-IUSE=""
-DESCRIPTION="dock-app showing you status of your XName hosted zones"
-SRC_URI="http://source.xname.org/${MY_P}.tgz"
-HOMEPAGE="http://source.xname.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-COMMON_DEPEND=">=x11-libs/libXpm-3.5.7
-	>=x11-libs/libX11-1.1.4
-	>=x11-libs/libXext-1.0.3"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-apps/sed-4.1.5-r1"
-
-RDEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5.8.8-r5
-	>=www-client/lynx-2.8.6-r2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	#some magic sed to fix CFLAGS
-	sed -i "s/-O2 -Wall/$CFLAGS/" "${S}/Makefile"
-
-	#INSTALL file actually contains use instructions
-	mv "${S}/INSTALL" "${S}/README"
-}
-
-src_compile() {
-	emake SYSTEM="${LDFLAGS}" || die
-}
-
-src_install () {
-	dobin wmXName GrabXName
-	dodoc README config.sample
-}
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index cc76e89d12b7..3b31dd1bb1fa 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,5 +1,5 @@
 AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
-EBUILD wmacpi-2.3-r1.ebuild 617 BLAKE2B 5a198f7934a87445ce6dc25cc347f5e42180c208f32689927c13b62caad875fc756939ba93efe24a63ead4d39add44e50df8016bb6a0e5df9d2c0db55eb80219 SHA512 4a4f0e56462171d828563edcc58fb91eed69188dbb3bf932654ecf93012930356a6bca973f3255c3a596d124eba214ff6d108bcfddaf5b6524e37d808164b440
+EBUILD wmacpi-2.3-r1.ebuild 616 BLAKE2B 0411c51ede028b40d97cafcae5553aa524a90e5ae2f2522e824ac60a7f28d2821fb8060d488e2e9386de44461eb8747cc4ae9e3494040a674b1e3ca5ecc25b7d SHA512 06738caa9b90d6ab543e75892a675428e0397cc1ed1bba15ca04d3faed9dd86389ea80f92261e91bfffffc065123b3bf97ce14c4fd43a1024a5d4be85aee76b2
 EBUILD wmacpi-2.3.ebuild 707 BLAKE2B 799d59451c5f676062f078bb52a9942ec874a835d18b0005d61608a9f10a77508b8349b1d33cb58e55b88b81b8888eb0770afc0cc1c535546e6036a58204a74f SHA512 e4448e910be662d38feafc95aaad209282cdb3c7201590cbb440424845af0247803a3186fc5bf542174f675a7a7197a379867f15d5de73ff6a6731a758307024
 MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index fbc57d048942..10283f606758 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -ppc -sparc ~x86"
+KEYWORDS="~amd64 -ppc -sparc x86"
 
 DEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11"
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index 2c6c7c140644..5d80141d3b35 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,4 +1,4 @@
 DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
 EBUILD wmapm-3.1-r1.ebuild 794 BLAKE2B 6c432b8fbd47d75cfaae2c41349713df253b78cfde0db4d2c4f0c7ab9bb8182cd6934b9ee9af490bfefa1a93313f8e1d8b74d38cd1d8f35c8412aa3045b46094 SHA512 848f4d86daa542dc980e9a50939580be852a87ab1eb998712d084af3374e9d5da37b17b41e27ce3513ff3f95abce17cb3f3e8141501324652099ca05078e9161
-EBUILD wmapm-3.1-r2.ebuild 783 BLAKE2B f5238570eda62f85e29158292439ede0f0be2a230d5cbac40fef9be7db756726f8c2f48faf17911cdc37c4f4383f3c03c249c1627fa438cdcee39964780a013a SHA512 a5539c4b2ea3161cc1df458cfaa22215193b969093387bc5bef35cd01d3588652355d984494e02f4a26026399f5a4dfa4fc0193c20e6511a61f8a04836548cd9
+EBUILD wmapm-3.1-r2.ebuild 782 BLAKE2B ceeafa90ab15aaf2121bac9498662b3fa38d64cfac23cb8b709b190a232f2147045808633e425f971dd90edf0000fc8194e53df4d1565b2af9a4de698383c53f SHA512 f2174e6d8f6059cd4486bede7c43efb446c841aeca73c196dc7c113410730d006b85cbbcf4bc486f70308028900e14fb4bc5bf55e6a0b12331b0bbb796bb0b94
 MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad
diff --git a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
index 6e795f7937f3..fad5b0b2ffcf 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmappl/Manifest b/x11-plugins/wmappl/Manifest
index 502ff27896fa..c4be655278ab 100644
--- a/x11-plugins/wmappl/Manifest
+++ b/x11-plugins/wmappl/Manifest
@@ -1,4 +1,4 @@
 DIST wmappl-0.71.tar.gz 139219 BLAKE2B 0c28182608e446f1d65441ba57a86105a745b374b9e54c84d52bee58876097b83520a33a7413358ccf0d687696cee11541cbf6536c42442f85b64aae6e70b451 SHA512 dbcf1441960fd22b5436515c28c6870ff8400cfbe0b2aa4129ff1eaad6faeb5e0a3500b4c6f19b6ce3ea3dc8b52bc38a6fc591b93e6cb12e13d8447c3eb371d2
-EBUILD wmappl-0.71-r1.ebuild 456 BLAKE2B 5ae844220fc67c633696fafcc836d0b138c9c6e04b1a6be58a2fec7c9ea304c0b94c5f1a6f3dd93e595d64d8843700a37dcb15f7177d7632d3a7761d2674e99a SHA512 6266580d4d5809e181adf6a38678d3cd585bbb2a0e22ddfb2b7aae413d184ff9839117d073d7ed02e1de1a4e1689a8bc939b442fdcf1c934b4ddc21188416168
+EBUILD wmappl-0.71-r1.ebuild 455 BLAKE2B 2eb4741c25ec95921d58c08d06e76ba1de475de590fa846841f7aaa720c05fcb8ac143bd7b1894e46bee7a7c27311fd42c1bea42d9ef1cb5a63f1f209d086f3b SHA512 fb5d8942e655800755327fd21c477dbe9021b2e4a18c5134035da4b995ff8d5b3a5f0e8f058869f13c8eefd5bf9526fed580519bf2c312ef623a98474683d1aa
 EBUILD wmappl-0.71.ebuild 630 BLAKE2B 89fbc2aa192b7315cbf35ab1b36d2543c3ec47b7a74f1633d426110372afa3ac27e7067bd5dd1d3eebf53aa0cb64313a31b01f331f6ca26f3a382079fa9c5eb6 SHA512 8683f32b6a8131233b54651a56347db2f466428fadc20b26f119798281c2ac39b7c0abd0a16fe81faf1d09a0836ac23091742f9521c62a62bf074212a1537319
 MISC metadata.xml 328 BLAKE2B 7de8ce1608ae1aac3b67ec0c5a28fe355bc7d0806b8f08256bd13e05ca8546c65a883db1101d7ce378a95258f642485a1b42c91ac5b03cd1e1eedd548656a001 SHA512 8fe600c98e902f450398b33925f201716397f0ace965dff49a6e6edc8c243cab7931b9719b01c6b4e63a44a3467c48ce4310ef87b3667f6d4358f65b31d66783
diff --git a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
index 07b7a30bf589..c2848e8e99cd 100644
--- a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
@@ -16,4 +16,4 @@ DEPEND="${RDEPEND}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
diff --git a/x11-plugins/wmbatteries/Manifest b/x11-plugins/wmbatteries/Manifest
index 95c7c4b2b010..58e1417e743f 100644
--- a/x11-plugins/wmbatteries/Manifest
+++ b/x11-plugins/wmbatteries/Manifest
@@ -1,4 +1,4 @@
 DIST wmbatteries-0.1.3.tar.bz2 113695 BLAKE2B 5da5dcd5a524fe61e7b51d6811fe2c582284cd0e7cc8d075b526e29483c41019de2f306b8a595358cf0729274a6037e15429923e35e21b2e5cc1a764c9b954f9 SHA512 0a553f12bcf9a673d2a956da04b14fd6d80cf75f47e912f01893ec06880d63275bc31bc8bc1655a13f11dc1361e96f9023290006e134956b625401a03f92575c
-EBUILD wmbatteries-0.1.3-r1.ebuild 522 BLAKE2B 8cf4da0feeab3fa1dbcd2aa98c1a34d95e6ad2d263439131d231dc3d8cfc1f652447ab8070f0b7055de124cf60049187ee1c11d7434a7c3143b0ea697d022c0b SHA512 167ffab3ca52ad9003fbb955b83f0ba784cfbe447e2ae6414cb2f1c8d3405d33108c28fe5549c620edfcfdfb2f5db608e1cc37939fce28ef5266682d312fd003
+EBUILD wmbatteries-0.1.3-r1.ebuild 521 BLAKE2B 8a9d4e15b566ff4ca19e0a9343ef5180f5e8c89ab6f4b0ea3e507a6bd8e8f10b48939608eab2ea40ad763f297c58ea4c9f9e3371dbb330a7053e8640799766ac SHA512 a6cc37abe829793d8a074d3a4bc621dca6eb58c5fc1f267ce491ac2448566ea80112a93c3169f84521197126ecf338609ccfd5597095bb617adbb456ec4418c9
 EBUILD wmbatteries-0.1.3.ebuild 619 BLAKE2B 2fb86b5ab9391088caba6235975c4cc793ecabe60f022b929f8d317a18f4a169835472a601cd773d22d6a37c021b445f01b097785bb93a028b43d13228a7607b SHA512 5c95ca0214c614a8f583ed6eda6f1a7db8ec6b95b799b6cbe06ee6e9a6c416248132c41d088d325cd7373df19ea2478b99c76e175794dd527f517a851c7ca39e
 MISC metadata.xml 333 BLAKE2B da5de2543e03f4e93842f1c8fbefdaf6da0514baed589b415b5a32d05f213e748ed40521dcaaa9bfd0f5fe8587fdf6c1d08c6c14bf8f275002ee99b5d66fff53 SHA512 7652956bf1e9eca65901163e2eb91786619a42d33c012c187701fe1d200243c6233295207401dfd14d13c270e6b3830f8e0d9299afc636c1b5105a01a3de8617
diff --git a/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild b/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
index 89995ab6a54e..49e00fb7d980 100644
--- a/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
+++ b/x11-plugins/wmbatteries/wmbatteries-0.1.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
index a549b216a114..5bb5c65cbbde 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,4 +1,4 @@
 DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
-EBUILD wmbinclock-0.5-r1.ebuild 681 BLAKE2B 88dd34c3510c17d2e24b6e6eee4ffd1f5ab3a4ac1a08e7f64eb28e680830ba7f42d1ae888348e43341ee5546fd5a80e5b2a6bb0ec1bfd20ee346aa541bbcf5aa SHA512 a42cd1b9dad854834339eb6719d14736bb0dc8be4604499ca85fdf914f62980b8542cdb9722db69ddf30171928f31616c0849005612d4113f5c53115c1c082d7
+EBUILD wmbinclock-0.5-r1.ebuild 680 BLAKE2B a5ce6c0896c878d4310ed922b8f754603ece0b0e3aa458b5c5dbb09b45cf37e493592c01d7c1ad0b7e7ce54bddb2256ca035e45cf4690109e572d6ed9c19cd0c SHA512 9361231435b29b8efebba62e24397c8ead5f59a306f1d36baa8d3fccf33f68d13d17c611fedf2cdda08f9a572e847073f0936a9983fae1e509db1339fdfb8841
 EBUILD wmbinclock-0.5.ebuild 707 BLAKE2B fec849654b00638dd0b442286b38e4421da361b8f5fc166947adba56377697ebc4eaabb981ed9d5ebbe4c83c9113c311c9fc89a525b53b5a331e11cef19fc451 SHA512 034feae221a815d7131dffd23ad753a2d4f20cf474b181bd8285c079de2f5148465bbcc32d79ee85608343d642a37648af676ff9ac2bfef62a41c66f79e6304f
 MISC metadata.xml 531 BLAKE2B 03abe401a3acf82a4a19b432b2f82f8cd8b8aa411618b7f54181cb32e999426c53f141a1c754cbc942abafc8d161aed8565e7e3b34036f489dda2f4b782707bd SHA512 b2a68bb29e867c54506f6b2594d3567353c86ba050127c07fa44f8abd4414aee251c297dfa569ec413e86699c088c61965104f5cafe326da0a376a6d0252098b
diff --git a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
index 42c26fb2a8c2..bc4dedb7ddd7 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index e37a7af47270..30f830260ef1 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,4 +1,6 @@
 DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
-EBUILD wmcalc-0.6-r1.ebuild 652 BLAKE2B e1d22f7afa0d7fe0ecaea49c730df3ef3c71db3801c8d08a6bf86ac7b6c58931aa1ac1094dc6d8a9e5c9e962a077873266ee72dd22edb6c6b003aea8895c20a7 SHA512 b3d5d743fc611a690fe5cab1c0ae03d28904a305be600413a743b4aa3e8533fef1e208981b017e75b7efcfc6c216a5574736d9f79f78a127bd6f5ee23d213b6a
+DIST wmcalc-0.7.tar.gz 119785 BLAKE2B fbb6dff279282e3a383eb3a5c2eca31aee453968040838bbc418d64e27f573555218f6ca3f549c92aa09900389e1a3087e1856d24ed757145ad19410caf87811 SHA512 8cffc55b58900090eecd528daec85238d14294dc294bb042c8a6ed0beb3f4cec0ce9f072e5b124e2eb787afb80f24011576130075c8f9b2ddb2f670550c9328c
+EBUILD wmcalc-0.6-r1.ebuild 651 BLAKE2B 4afa411fed7d98cc77a0048c026196b65cdd352ea13b51005407fac0d64483117c14697f9ba76af7fee0fd65451fb789bf458983b1db843657b989274c0cd21d SHA512 055fd5f8eab338086d46bcc7355c047412612a7161f43dc71fa32f69f838b1bbdbbb8ed1834fb778f9697dd6618d2e8b9978a1ca6e05511d6895f7db9721a75d
 EBUILD wmcalc-0.6.ebuild 657 BLAKE2B a5a6f5e3ee783eee75dab43d9739f5520d40ba67520cbe68cccd064ed5dc3d576ddd89218d917543b040ce5915611cc4f4234da7eeffd60f49100f2a2bb0c322 SHA512 dead24ce7dbe4f839df85b14eda9b9a6b1e2cee282e05fd48f2de208a19cf6cbf0ed44215842e7ef06cefc00c0f1bbbeb8ee428ffd8f675b136964252dec309b
+EBUILD wmcalc-0.7.ebuild 433 BLAKE2B 29d9949b208ccef6911c0dc0057892713e2b2b627eb247812f4de7b72a9c243e4178052e16b5fbb5b8069ce373a30ed5551a5b3b27244fd55f3bb4e03b74d144 SHA512 002e1c503a1501bc1d9aba81b3ef602cfd55a9445c7b077186a5f4f09d2a02f050b2087ed8a47aad2754e75dc020e501812294dcb753397000b86df9a0fb190a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild b/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
index fb13528822a2..75e975102876 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmcalc/wmcalc-0.7.ebuild b/x11-plugins/wmcalc/wmcalc-0.7.ebuild
new file mode 100644
index 000000000000..ec6e2182ba7d
--- /dev/null
+++ b/x11-plugins/wmcalc/wmcalc-0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A WindowMaker DockApp calculator"
+HOMEPAGE="https://www.dockapps.net/wmcalc"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index 6be6b1ab5a90..753ef4f4ac64 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -3,6 +3,6 @@ AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad
 AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
 EBUILD wmcalendar-0.5.2-r1.ebuild 733 BLAKE2B ebfdb2ce8b167a7d9ae1cdb37402b6e9657d6733dacb230f6704d330409387a1c2784d262b7290d0292504379ef7fe7417a07c0ef56c7db566f25bf7f486c8cb SHA512 7f9eeaedc3f35fd6b01c8929c8a5e005dfaa03c7133e9c5648a118a92a829122f2a5c3ce0ab4408b6ab55f837d1f89cac6194bc2deadd1872b0a54bcebd75360
-EBUILD wmcalendar-0.5.2-r2.ebuild 717 BLAKE2B 948ba4010c6bd246f17d6f897208a2ccd6e50b78fda22817834f7fa7da15eb25da5e830b2a13b9777818e4536e275a64efcf9ed191a6be1a0a5f85ab4fa3b880 SHA512 bc90ee7dcc9595eda4ecb4e420e9b2d88d2e94dd4f8b45292fdd50fe4b2b3c6d5b049460f86d91717c9c41822b4d4856684fbd37c98d5a03c68f7cf2f990fcd2
+EBUILD wmcalendar-0.5.2-r2.ebuild 716 BLAKE2B 055dcbe85d92284c1f43cd937b12e32b0250fecb1db533e81ae00919fd2b80a17581ecb8070ead39de1a5596a17d1f55f21c7efd4d15f2e114f4a89e0e059ed5 SHA512 23dda5ff27a1656c835ec2fe7a2ceeb0c3d3896d1eea914d07ae4e6ed2943029941928f38c1ba1d06db59f10d9dbad613c761d16b988b6ec8856f2ffde392ee6
 EBUILD wmcalendar-0.5.2.ebuild 750 BLAKE2B 116270ab1503eb382486e598f3a0c6ba8900f1cd7a2e9114893480dc6d4de4fbb73e77f7629f8e03c6b8cd444ff854cb0df12870de1b61c8d28d97b4da4d7908 SHA512 a81d576790b62991834e66780f224070c5b273a57b6adccbe7cf1fef3bf3def7c9ccdb0f42aff31ea165b641bf8a616af350d756c0d81f028622113132b7665f
 MISC metadata.xml 332 BLAKE2B 77b1bf5bab2fd180f0e7c7483abf79dcf5c7f12a8e8946f7b726e4509bef4b48d7dc9b9bb3977353cbce4c27a38009c12fec3c7ef3b1c0ab958dba59d9798ac1 SHA512 277dcef3109b86fdade36714655afc36c515fc0274f155bd598cca2ccb2c133870c966619aedf078c7eaf172d6850912c28793c349d30a1cdcaeb4a5698b2a9f
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
index eb43d2edcbe4..3cacc733a2a0 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	dev-libs/libical
diff --git a/x11-plugins/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest
index de19f971fdd5..b65d6d70a7f3 100644
--- a/x11-plugins/wmcliphist/Manifest
+++ b/x11-plugins/wmcliphist/Manifest
@@ -1,5 +1,5 @@
 DIST wmcliphist-2.1.tar.gz 61459 BLAKE2B 5fc8bd635b83c0ab6ea937d5c8cd26e459c7a7caa25196e45b29b42b22243d7bad246741269b8def9fdfbf574c187a2595a9676b17c9ebb236e296c3297a3460 SHA512 92ffe45fce7da09cffb769e4c97a36309fe2d373f514708e5bffc7877324080d3116e30f84de7a9addc648c38d43c678e4e2fccae451d93a02a57e7f9e319e03
 EBUILD wmcliphist-2.1-r1.ebuild 652 BLAKE2B 9f73e1e8077fd4fa3f95d3ec347953d6f7abf38da10770f2759df790b6534c61fa038f0a13fd4e46255006fc526648430558925b13d6da004e061526bc8ea8b8 SHA512 0975b51e367199ce310a427b2fe4be7dce8010fe8c0368e7eae2bea2e8702d0f8ae6e5a58dab1efef25e8733f1afbe09ffb2e685dcef51b45adc2e709efa10d2
-EBUILD wmcliphist-2.1-r2.ebuild 641 BLAKE2B bc261fc3a916941d00ad26aee46b3cb9a6030c0810ad34076514e1458d278e48cec457cbddc85626889be615a9cd2769d87a0b0223ac20200c63d4b01c5302a2 SHA512 07f4980f7e83e3efa0ea54606ead886a835919d8660383e36c373bcee6e2b0917d273bcae1c9a3f44e15c9cff6a50b7df4c87463a85204e0568a8d1b92ce3a6b
+EBUILD wmcliphist-2.1-r2.ebuild 640 BLAKE2B 3b3918e9007db31c8094a605c29116c166535b4a48fde761856053ab9bc1c30fd41e88bb4da2a11cd8fc1eee76bfd679ab14cf614c8c555a2a99358ec1533be1 SHA512 1cb6804e3856e0dc3aa086b64f58ec90170deb098c686c2cf3ab2111884adbdbfe701e4b521a10f9ced304fc843a25c0eac0503ebb56d5e3f5e00741c01688d5
 EBUILD wmcliphist-2.1.ebuild 633 BLAKE2B cdb1276b05723f075dcff14dac70a7ecf3b689d1dd053030c78ee826d2b24bc5e59c21be874ac3ef5dda9099a6b63e422ba3121038ef44b0944b86cbcff13307 SHA512 b4c2020ceed389f731229ca4e0a95c444931d3a5b927a4e3b8c01df75fecc52bab0d8102f4eba3f3a0b090ac35096cd0d45757469b950dd35b90c14d34bbb936
 MISC metadata.xml 544 BLAKE2B 4d1c55aee7600a0a8e618effc61ce8c4222100b47dd8596a1d1c70cd3c82d3134e1443c57426cb18ee1afeaf08bd2c6b62b3ec1500cfdf5651240c97230f1bcb SHA512 77a0626561fb32cd02337837023a65a42a16477e67ab00476e58fe9442bef15b2ab36414589ec34a6f04bf65cf6066fb2f4c0bba77f5f348649d57a60aa9dc5a
diff --git a/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild b/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
index 81b1a09ccbdd..996e118fa7da 100644
--- a/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
+++ b/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3[X]"
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index ee5ea5377b82..1eb3a938dfa7 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,4 +1,4 @@
 DIST wmclock-1.0.16.tar.gz 35448 BLAKE2B 2a6ee148664b10850a31bb7f20f68b8f2d0c7e1e9d353f6823e9280b40ab7e43ebf1e824428e233d03608217a2cdb7f7463480530ca89d5bd7278ffeabf2de80 SHA512 1325a3a25d03a04e5321bf99bbd6ffac0e08f9f2a635425689458cf74219a9338d60d832143031639f75575dfc63fd307a15e651f90345887cf95de90cc8fbe0
-EBUILD wmclock-1.0.16-r1.ebuild 589 BLAKE2B f99ed9110e42b257fe5ad5b67ace2a307862491ace1bc204468758ab2011260f5439448db47935fd558014513f3c24487957a2957597b65cbb976cf10de4cc2a SHA512 f65ec5efb4a3570cd2c71a9b77c10620bf79fe75d59ed71f1ffb18c4e14514d13679248b0e6a2db1f6c79ea088f5fffbb0c22250786817b3890b7d72b2271a45
+EBUILD wmclock-1.0.16-r1.ebuild 588 BLAKE2B 1ecf812957538a74dbc50a17f9f94d258095ba7d460ebcf94e29953a825a9f109c7bc24b484652c586007a9ee75d6f98137fe7b63b22c73a7932729224c66b76 SHA512 4c8ae05579da590a1cf62d248b0e57b5bfdf1aa4034a95653a21cad64035d670de0f8ce9d5b098ce0c80d39141d24edeebf46968fa50db7ef29ccb094070583e
 EBUILD wmclock-1.0.16.ebuild 583 BLAKE2B 70d42cfb3e21b9380c242d093436d12fb7bc5460ef1b398f5f44be81641a4a36235c211ae1ea16543132ebcefa50eeddc857836666434bd8907865808fd531b6 SHA512 5f77c47ddfdb3b084fd365165509a532d3360d7f314145343a2a9f4c97a48b12e03b1803c35b926acad62d841b58371d012b0fa268d96f8956f75ed4f744ccea
 MISC metadata.xml 688 BLAKE2B 227ee0b283753824b8e06e77fe0905eb26142adf58a7b376519281dc67e19ff15956baaab9af4b375a550782b281525187332b38ab128d4192a76926ed240e8d SHA512 a11af53f6a28b0791ab43350e677a07b587b6bbe65bc1e5495277ae12d4cbc89417e6757b5561dd55e123fe7f83e7202adec0fc3dfa2a2887ee0c5f817d5b112
diff --git a/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild b/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
index abf2cecab1bf..55ed8e795c27 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmclockmon/Manifest b/x11-plugins/wmclockmon/Manifest
index 66530b78ed33..07f3c7986e57 100644
--- a/x11-plugins/wmclockmon/Manifest
+++ b/x11-plugins/wmclockmon/Manifest
@@ -1,5 +1,5 @@
 AUX wmclockmon-0.8.1-gtk.patch 11386 BLAKE2B f624a1720dc51db5af1298bdf334065e1e707f83a4561f94ad35ed32a057270db1a3a3234132d3d526c8cda50847b976c3ce9393f35c8460c6791b0b7fcec6aa SHA512 60e9cccabe142dae7cc24a3f6a261ed60f1b9c85dabb439fda8fc8657bc082997bd4558cc9e360b5911a6a8e1a46ada42eaccad6729b1e859fa9b81b60f2146c
 DIST wmclockmon_0.8.1-1.tar.gz 139233 BLAKE2B fef6cc69afe54fc966008097c15ebf08db5dc585e3789f610b5f0d5d550312a6e0a00e5ee07d6e86d5efd78358e00a4d0fa44cd3b7ac69ecd9c7374037be61f4 SHA512 6216737b9df3ba2ec453570c477764b89b386bbaf954abcb5a5dc2e8841b08d4a8b0b9a4b7eaea73af59544a004cd685f15ce5a0cf098e4db29208151e5309a4
-EBUILD wmclockmon-0.8.1-r1.ebuild 785 BLAKE2B 8b47edc467cbd45b0109310236d6466b31032836409f0902c582156aa5076489044e133785e138ce7c95634539d40073d19ffa3c523feb94d92b223d79dae02b SHA512 982c2f513cf4646818ce978de0f86dbe44df321a958913de962caeb0d74190cf4a758579513959cec0f9adc9039991217e0c826a96f8144b7a9eb2c312f7607a
+EBUILD wmclockmon-0.8.1-r1.ebuild 784 BLAKE2B 434864647799fb9305a9f7786ecad0bdd6d4775d3158a351ae2c92d273b607149a416cf3ae4e221cdc546b543d75dc8de699f6ea2bb868292fbce8f5f408bcac SHA512 33e771870b93d8f092a9b26d81071d8b554eabe3965ddc396125e9bd58ea44f2325a4d34c0839b2e1db7f5904adedbc448bd95fa2d2d1a4380e902f31f30d4a9
 EBUILD wmclockmon-0.8.1.ebuild 794 BLAKE2B 912a1bb5aef273e7fdbc0408eeeb6a3e88ee3382c21e67ddc515910644f2277fed52eff3d429676333554c5fedb1b7cc60c87eee6832a0d80868d5d3b18dd448 SHA512 ed659a3329914a29cc69aedd844b711d0d88a0c34962f7da6ee73fabc8e3b8f3a0139eb814b26af3f734b8b0b7e0fa9e3f5d49d27a242cfbb7412e98bb2a083a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
index 27a55ba45c25..59f9739544b0 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}-1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libXext
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index 98188f157ed0..5f9d41fa2c21 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,6 +1,6 @@
 AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe472f709cc39ffc4085aa13f3bbebe0046e8ded77bc7e17102c891e64a81bb737e451154dd613d3e30b9ba737 SHA512 92155c2213425ebab4938c00f9b9164b247c7e3437d332d7bd479dc5eec6394d63cfb3383f98f9508ae8c12d18dec862875a5b2da69bf7b8f97f30b72a29c716
 AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
 DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
-EBUILD wmcp-1.2.8-r1.ebuild 916 BLAKE2B 779dc2bc7ee9d30f5daeec4f56130b0714f2c906e3b756a4e0a5bf2108c5a0c84fe1ecd0345d3c6cf88cea48d53924d8b45fc654806298d8fedff6056b54e11e SHA512 38199e7aebc0d00c2f4eba97ac96ef95c964f7c576259329ae0b24cf0fd7b1613a0b7b6df4307d0f9835fbc15a24f592add9c9f8b06a2962a4577d8906fe5953
+EBUILD wmcp-1.2.8-r1.ebuild 914 BLAKE2B 3c7c0dca4368c36346139902f86beaad7bb81ec6d52f63ceabc3e827e1814ee54fb0318d5434432abde5ba765f79bb2903c10fabd22a4dd942ff8da0afdc9012 SHA512 7e3b67b7ca4c01dca48bae953be6cf7cda9c494d74da8ffb6f846eccca8890bb0fcc5639cd0f23db8e539b12535d3fd651ef9c48b2462d4b2217b1f755777968
 EBUILD wmcp-1.2.8.ebuild 981 BLAKE2B 910a7c56ee2ff6af5dfbf441d10da264c9042853c56eb2ff1eeda25a2e490e5dfe43498a2b28d03ce03dbc35bc136f66ebaa38a75e8f96d187b0a387ef2eecc1 SHA512 3424ffb1b0f34e6e855f2d6ef07fb4817d33f64a08c14a6eacd58a315b9f95d34dca8f95d60b2c479f8a6a4881aa432824859eeaa882665609dbb6ee4a14c18a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
index 14b781073ff4..7a127b407e4a 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index d2398facc3f0..7b9d82fe1e40 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,5 +1,5 @@
 AUX wmdots-0.2_beta-stringh.patch 325 BLAKE2B fdd3cc86c6eab458926bdb1a33f6050c36716e9840e2d20b60e4835a4895cd3083760c0f01953ab9470691b23fda40e7001f135dfa994d16aee3253205d6e741 SHA512 b2da0950f0b74f6a25bb57d5fd27e315e5e4a1cca41c5cf413bbcf5a7d50ff5312a8d2903a646b2ba7c79007b8804e6518fb9a14b25fdd1028104d7800726f60
 DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
-EBUILD wmdots-0.2_beta-r1.ebuild 868 BLAKE2B dd6423109f787f22bc82df88889d53bf4450522cd6d129987d6646fba1d9083c6a84351e4badfc1b1fca6c6fc5e42eeffba05fc88d5c699c161e32f521778b34 SHA512 d52c61417b6ebe6985bf050d3a26ca80ae708a36f1b85121092b38328ba9e475d8aec006abcb7bacbe09bc2fece1a8f0ada5ff0ac6f906f10427ad97ed75e28d
+EBUILD wmdots-0.2_beta-r1.ebuild 867 BLAKE2B 8daaf77c265bc72e6087980fc5e6ea821ad236b48e3a058e42df947e00971b40fc257ef8c42051dbc046802db0c0d7510cd29e2148c475e67b01d127199d5472 SHA512 fd39e44775eef5edf67978d601472fe269bd86db177a12e9a1c7ea4785a7ade1b03df231d265a6e10f404fe7725a2de7773a8036608932ba13e5ac0ab105d7f3
 EBUILD wmdots-0.2_beta.ebuild 933 BLAKE2B fc9b12cd3d4fedfae8418b7e11c3e73d3b55cd9739de1814d5894e8572cebdee24e55b30f84aabf25c533796262ea2e2d5e97465e4b36f9958d319b6b8d6bbfc SHA512 ec5c90f87ffecafc15efa1863a6800a6f0e831b98ed9c767aff4ca18f36ca8f98087b062b3466bf8cb21e301c17ff36bdb917d8a6873da4b8c5c28e4f5cebe75
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
index 4f65793c9002..239c3539f11e 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index b026372093af..003262f55285 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,5 +1,5 @@
 AUX wmdrawer-0.10.5-gtk+-2.patch 370 BLAKE2B f308ef901a7d609bd257253ed092b2bf8a53e8b87afc973024b4249f56c4ae0a9b757a203ce5df180a31feb512bf6dff559a93081c0ae5314d6b3afe3785fa84 SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6
 DIST wmdrawer-0.10.5.tar.gz 49413 BLAKE2B df77a7e7fedc1a648fccb6efc4315f1f7c4d316a475b3d0044578df0cc0ef5f5d481eec11a23a33682fd8f8bb5faeedb66e82916becb668546cbc5b9e5a61dd7 SHA512 f1e7cb7dc16841a7176e628f42ba5834200707dc162838e62fc7233e383d0aab6ce7fe22017286d26ce6ddc2e3cb6f1d0d21acd176fd36a0cdcd7ab04a2dbae1
 EBUILD wmdrawer-0.10.5-r2.ebuild 1106 BLAKE2B fc3d43c92554cbf5a89c9ad781e969a53deb5907ea6a2aac7f90e8a7624c860a7413c7c50fba290397453f721cb4b0239b028afced205ab0176d31d36ad82907 SHA512 be30573f16e71c66f54bfe35190df9133f6b3c4e8497a2692f69d8ac3450e03977f1bcd9e362f7cf1c90473aed3dc64efd5fba6ca43604db98bfcb528355e453
-EBUILD wmdrawer-0.10.5-r3.ebuild 1171 BLAKE2B c8aefd23e82e597f4bf199f5c28108ad65a0e34c0293fc8ea3c607f2b5ab3dea2aad82c2ee65fb599a28ce88677bbf492e1a9c9755c143d620ee90cef21924b2 SHA512 e17dc9a9adfd09e067fa48f8e6918b612f0f1b0fdb33c5652eccc6827c6aec1e131cd527656aa57987124cf8c7d07c151f21002f0e18a0e676c6639a32f36c41
+EBUILD wmdrawer-0.10.5-r3.ebuild 1170 BLAKE2B 51d8907e2477497809988839424a238444cc9258afccebd67f79efb59104e0f7259a76ba5fc3625872e06acc9ae07a385540f1724709440f27a4611a165eefc2 SHA512 ba337b61a4645ddf9f158c9c4ae71728053cccba8b6ab76100bf42b64bc615f8ed286dba77c7a1febc90ab09262dc78d127dad55c5a8ffc900f0ff72a81f3f97
 MISC metadata.xml 386 BLAKE2B c880c70034059ce7e0c93132413243a49e869bdc2b8f9448e6ad537812509276645e85bb9bba664ddb1e0a7b260933603ed2e1558c24c25f85894863b66c1d33 SHA512 7d950dea28887653d783e742c946186617791c535a131aaf0b78d51fd413fdf1868428a71afe5e1c0a673083ce1630e4a5d1524d166590c14f84d94fc5adffeb
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 0f665d5bde3a..0f85d612e2e2 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gdk-pixbuf:2[X]
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index b19b4052543f..4a833a13d7af 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -3,5 +3,5 @@ AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 BLAKE2B 5b53fd87f6dfce827e5d2403c3
 AUX wmfire-1.2.4-no_display.patch 560 BLAKE2B 505f4ba45ecaa5a7d7cf1f8c17f4eedf80c96afd028302243d47ccbef047dc17a12b008e6b10730f16aa037d3047b06c11ba6074e446dbaf3d3660afe67b1447 SHA512 8329fd7912b765f19fb5f72e8bb42f71e0a99a2c350e71e84f604efcec61d43f78557fec5338ffcb86d6cd1ed57e886e9b8eb474bdf47f4e6639795c194500ce
 DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
 EBUILD wmfire-1.2.4-r2.ebuild 918 BLAKE2B f625b4be7ceaea1932bd4248c710f25d44994331900170f576c69d5f44255f197b7f81b4d43e0d86c9c324459871b65299ee2b7d3ec9753783b865dba8e2f488 SHA512 93ba885ddb78741601311d0be8863c0afd4607a8ef56f4a9ee1ae9763aea1663302e54f3cab83eade6c20f07ff052932aa052740c0e55ccb988c13e8625e489c
-EBUILD wmfire-1.2.4-r3.ebuild 887 BLAKE2B 3154e2101c08b6f7886d30e92b671f5c08e463f76105d19ec6d64fd50721f253ed57fdcecd46225e906a6224e7db14e9fa8430500894f6c9713ff94ea0c794d4 SHA512 978388e5d5ca0239479db801220be1e0fb593f50371a9784666a0178cb3cdb431ff8e88967b7b38b9be1de566c3d241edc20c792ef68bf0b201c452ff6451864
+EBUILD wmfire-1.2.4-r3.ebuild 886 BLAKE2B 60c5eaad494abbbc9c112315bf41b0df204175d993ee8d2870ac8729ba2efd1c9f60dc6ccf11b70fe5fba1527f58d8d1d228a59e6865fee62fd145eaa12abff3 SHA512 b50d207d00f9beb3b85653d2a7dd8d399f90e9e2671001aada6231b4a86742d7b09cce89f502c7e7a957dd809a0d0a3f8ac2e45431dc62fd122a99c97d99faf8
 MISC metadata.xml 573 BLAKE2B c75563b4bec05cc6903b69585a1d456d81ba429a99109e841ec3c0ab51327ad91c323c1ef4321b47e56cf5e9ccbff257f7efc6f042afd8715d5224143fe2ac9d SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
index 64ca328dbf7f..151e5ed3fd06 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="session"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 7f7bfbbcc7f2..27866215b32b 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -3,5 +3,5 @@ AUX wmfishtime-1.24-no_display.patch 516 BLAKE2B d81cd82250f74a3fda686cc49eb01ac
 DIST wmfishtime-1.24.tar.gz 21895 BLAKE2B d24d5400635223ffe4dbf7e63e5576083c6b5ab99563a24b9c36fe3e50821615998258f59bf6ec5cc630312c356b40210b0ab9091cb4350eb8fe6a1ca59d9b2c SHA512 7df3c6648b46c6f67cf094f634dc7699c1dd1ee4f4a18dbf63d74ebda74f322524b83d99f10a1c8c8c8a5040d78b071754a40ff162fdb13a5a00d01f1eb5c4e6
 EBUILD wmfishtime-1.24-r1.ebuild 700 BLAKE2B f00af39e642dfd4c4f462041169e75d5498de32354bf65eb34c600b285de56eefcfa006284bc7cfd8c99257c3c86b986b01076ab49e3f958e90a776e4e65262e SHA512 3493f4abf5e008adbb96078ccf37c59c1edbd7be4f5edad49597d62b3be7d6b122e5f62d1dbdb327c0c2cf1945c666fafa6f757721d5078280abc2f0ff573773
 EBUILD wmfishtime-1.24-r2.ebuild 809 BLAKE2B 4eff129c47ae21b32659679461bbdf176a2f49e0b02b85f741cfd83170f8b01b7391681e5a459e5c795a88e85fb72cce700471ca5b71c3e045ed61a7a785d9d5 SHA512 abfffaa008b8544315d6e3d440c245fa9e1b6f281aca64c6fde67006e57906b92103c71a4685097f09392f00d871d00b7477c4db6901752df8adb000b9f37e65
-EBUILD wmfishtime-1.24-r3.ebuild 828 BLAKE2B ed57c03206ac43e35eff4c2862554e3c329c6166afa31a31707e91d0eeeafaaf51e88abd5715048bd5dd4890393cdc6ac2a9f3c813f93e93c8106be035521852 SHA512 39756f654a0b46a0d2b85dddccbfb67f6461f7c0e5b5fcb7a1fb0c49f0acc3f8d2da8d97a421268c70c27160a319e5bad6432458acdb8ae80a481a59a6e8832a
+EBUILD wmfishtime-1.24-r3.ebuild 827 BLAKE2B e892a53def59baf8d74b5a7823d9b1084a81a937010344518354eb8b47b9357099ba649a9ce3606d37c930a29cde41c853d558a7f85d6509e74e52d78c64cc08 SHA512 e4945048ea3ef2b9ee44946e61de12e18eada6fb9cdf59ffc02cdd657eaa1182be3ea9131b14737984d41e00e97fb609d307fb8c8a8a12ad253c1968228bec23
 MISC metadata.xml 480 BLAKE2B c72218dce63a37d81c62b21d779a16de91591b4849d8ea7f8292cf4d73f88e3c6e98a64854133cfe6892ef3db464e4461f26b665f63f24e1efa3dd77128abd65 SHA512 3aebfb320d3d4cf32587efdeb26ba4bbf531c94fcf7c6c5a5c68a78939d8cabf40582d88661e490cba8e48f72f0885b426c69b8f55fba91f0ffa788dbc507220
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
index 05564bfd1885..95b1ab850726 100644
--- a/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11"
diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index 7952c1c8c6c9..1065eab23016 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,5 +1,5 @@
 AUX wmfortune-0.241-stringh.patch 316 BLAKE2B 3c045766680c8581a4d8e4d312863e7b158d3e840000e9c767d8fa40c2c898be763ecd7b8ddf76e35a14fe99fed3734f0a84fe69d6102a38c993279e6f53c122 SHA512 8b4982a59604110800506d10ad10ef95964d8281a439506437c8311836aff4daa250aac9208e4f7e105cafee167acbec4d3e8631fed4d6c3a94277b338604025
 DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
-EBUILD wmfortune-0.241-r1.ebuild 805 BLAKE2B 79e14e6c8b39f058f2d81e3e77be80027d60253045d51f7ff8a60f7164f33c85c5b73425a6ab18ced3aae8dd62d9473edc4c1042a352106a81a777b53dc64346 SHA512 e73842227c562f33d17de186a8aadb4d4b1d79e900e7d1e44aff7ddc00123230f7b9a7e1be61d42f18dab6a7b5e8eca196cd62ff9fd602b9e41b9838e680da38
+EBUILD wmfortune-0.241-r1.ebuild 804 BLAKE2B 1350230e1cd9003aaf341c617f73aefd821e6f72da01e4939dd887709961c5c2ec15ca29e0699963191800970c30b159e23742a88b35bfdaa1a01a13af35e1f9 SHA512 95f0e54e1308186eb2ddda47eebe28bc639578ac6617bee17c8972cf8a39589110fcd4235dbd4b19b042fc0c492dede1ef9a8f711e359300be3a696df808464d
 EBUILD wmfortune-0.241.ebuild 858 BLAKE2B d3d381158f20297d56a5c8aa2b0ba803de51bff7befcf34a8747da87a4edc0833bdb93fa175865d0bc4ab341f8ad90fbe76bf2edc921113bd55e93bb7aa04887 SHA512 a4aa8c41f1e0314095f49bb1f544e605aa762c70676757e745bab0f6deb5b1a447d492b8394c6897f9c2425b7c8f43bab70663d51f1d675fa1024b58d9bcba3f
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
index f67de2f9282a..c70c20c480c6 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod
diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest
index 82b8334ec915..98339250624f 100644
--- a/x11-plugins/wmfrog/Manifest
+++ b/x11-plugins/wmfrog/Manifest
@@ -4,5 +4,4 @@ DIST wmfrog-0.2.0.tgz 59113 BLAKE2B 39241240ee0477e8d587e634be74184c50b34078be32
 DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee
 EBUILD wmfrog-0.2.0-r1.ebuild 796 BLAKE2B 1027094fc338b7f24d3473547aff2a37f20ed20428d81633d709c5ef75972f55c18fa3a861b10ffd00ce2523ceff0f335cff999d7dcda1ee9361203ac2357b6b SHA512 487f0052e17ada996a75915ddd09f80b67c499c768f876d182a6a3c16c05c3a452158da77d9447f43f643c38189620f3c63ad2247da362a429362447b7fef625
 EBUILD wmfrog-0.3.1-r1.ebuild 672 BLAKE2B 651f38e92292e180e448a2e7ef63749a610f9d3584a88bdaab0a649311036ac52b5b086229199e78a36708aa15022519497fa61cbcf5ddde937dbfcaab81280e SHA512 6df5409bf45fcb890155e874d9f04816b4e6f6211b9930d0a5a06b7fac4330a30a06589d090464c54745d24342d6e5e85392bd597d994f5335c48be3fdbb5787
-EBUILD wmfrog-0.3.1.ebuild 742 BLAKE2B d8bd2107de67c9a7731763bf0323c5e5753dc1126580aa259907762138da541b594c15608042cf14ac0259be9e7a3bd6591fe4bce8ac5155f1163952674dcf66 SHA512 b8539aa697520faccb3308bd7379a89584d5f53379ffac5cea0205c6067997bf33685ddf16c75336dcb8305d7957b514ceb2377b2e1b4f7d619a3f81e747397d
 MISC metadata.xml 328 BLAKE2B 4d9379b73162de003a92fc6b9aa8bdce8969c815e2181b62a1be2331e422deb78ae7283a29f28a85a20ff7664378ee88e41f3db4cc302a2351f08e8a349e0fab SHA512 279b5bfe4731afe774f94c0588cb4939e33a8680d07fd1c0504f18f23e47dd4b11bea2237c5422896a5b204926dd6fc39237a62dc70d751891f2cd1bacfa48e7
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
deleted file mode 100644
index 74ad1e179680..000000000000
--- a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="a weather application, it shows the weather in a graphical way"
-HOMEPAGE="http://wiki.colar.net/wmfrog_dockapp"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/Src
-
-src_prepare() {
-	emake clean || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" INCDIR="" \
-		LIBDIR="" SYSTEM="${LDFLAGS}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ../{CHANGES,HINTS} || die
-}
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 7e38fb3e5339..27875c2aa2e3 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -2,5 +2,5 @@ AUX wmgrabimage-noman.patch 295 BLAKE2B cb10ee8ea0e98a2c77fe51fb333ce722efa8d0ce
 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
 DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
 EBUILD wmgrabimage-0.72-r1.ebuild 1144 BLAKE2B 6227ced650853a2f35796a92079e33637cf8dd3c6dd6df38052681c5cd630eccec96fdf7fd583277e916588118f730f3a7fd0217189e59a80d96fe29cf923305 SHA512 79a6a60a3b44c7bd5e252d0e998dfaf3a3e60a19b436efca305d672723f531f2e19e9524123b9766629fa5cc5ced9b4ae2d2a9016805cc890f533a184baa9872
-EBUILD wmgrabimage-0.72-r2.ebuild 1058 BLAKE2B f04fab98ad8e5078e996612dabe12b06141d49a1ca26f607309f491884c64dfac8c9ae2ed51dff1275abed858ce259f562e642b2c3d1a9a0585b137b61cc6405 SHA512 47855c59948300450714f52b822f9bfcc2c5b84e4865304bf111fd8f13af92a4011495dcfbaa0451c4be347a0a13b8dbfd440202b4a73db1bc6f569da4480253
+EBUILD wmgrabimage-0.72-r2.ebuild 1057 BLAKE2B e3cd8e041d026355aedc0c19bcd2dbe8253b230b1fb86fd5f42f255b0f7082c99e1151679db870c8d830e7755aabcd1cdf11c0e1110835adca5784e375f8673c SHA512 65ad5bd0aa922212412279dc3faa9b1dc468a6baa6e2df1ef1b60d078d0e8686eac0d7b464923165d1fb19c603d9573e672c215fddd560d1c0879c1413e1125c
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
index 1c59b3de60d7..9e59593276aa 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.dockapps.net/download/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=net-misc/wget-1.9-r2
diff --git a/x11-plugins/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest
index 38df08d11586..28cbb778351a 100644
--- a/x11-plugins/wmifinfo/Manifest
+++ b/x11-plugins/wmifinfo/Manifest
@@ -1,4 +1,4 @@
 DIST wmifinfo-0.10.tar.gz 17418 BLAKE2B 74debc88268e45779131ad6587733343e8be51cfa871ea368ca305a755008fb0a7e3faa332157e79ecea7553d3e523cce4bb9b4a650c2ee73dc1b6acb3db4ff9 SHA512 57731f482b950e968e760315b99ceb715c3aa101f77e5363ee08db231369c5addc4d9cf4da4a24f624313073bc67cd8742030956c5f866fb02c1b24b3cc4e965
-EBUILD wmifinfo-0.10-r1.ebuild 677 BLAKE2B 72ee8742880ef496ca3208e8b322c5b476e1c3e60b2579f08abef88956a5ee9efa4bf1dc6de1ff05f536d934c8538ae91bc98c4caf478b2f2e25fc9cb0321180 SHA512 7520380d6f7fbb581b2fdbf7818f73602a30a0dde972dd37538d0fe96b71a1f1c50ab272ec7bd524bcf7f7c29290566aa9242ad86e328af3f328989c1ef4dfc1
+EBUILD wmifinfo-0.10-r1.ebuild 676 BLAKE2B 870bb206a1017fa24866f50a9e8a12a6b0b5466c485a2ba5987cf807a9cb2e0331d1640cef933624d04c880cc73cd19f24d55c13b28ef712c84756d11473bf7e SHA512 0db6ec798aba8fbbf8ad5efeb4fa871fbe462a4a49e6aba82d4495db3e2ecebd75d25d114bc804e52597a1ce2dcc321d5a2bbda24585f9f819a4898cdca3ca2a
 EBUILD wmifinfo-0.10.ebuild 682 BLAKE2B baaf5f148969058f54c93b8afbd8a17b612ab1e8848bcaa87e6a9381d6e2dedcdaea613adce68e3d1408fb2cb9bf2f91b25d7966801865cf54a098efc633fa63 SHA512 41ff48470c20943ef23bcf006eb9ddc89d574d6cc6ef68bc48ab0c017af1b807d1c3d6b0789c8aa31771c0a39239ace53c7cf0445d907574360ced4c36d5ed31
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
index 98816a1f8788..c5340118496a 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 2210ff0c8ec8..7241c98d8aa1 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1,5 +1,5 @@
 AUX wminet-3.0.0-list.patch 7026 BLAKE2B 4a4011cbb4e74caee67a6974967a69189702510a7319679c3f2b039c1039f9a62338d0abf960aae598fc06c49c5bc349e3d86b3b445ca45a7592b14926f7c8c2 SHA512 9c51ab9ed8f00648f7f24d070657c9126b26e19a4dbda8dac8d127030858f2a9eb385443fcd452560974bad6ccb986962087bd60fe78c5c1cc6ba43c91313b96
 DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
 EBUILD wminet-3.0.0-r1.ebuild 720 BLAKE2B 9fd7759f4a20008da705d4256e1db9acaa5e7928ac39ffccc396dbc497a15cf9a0d462d32bd89bebc68c853f3ced999189f00e7f05fc9d23c19f36e516bfffae SHA512 c78df063dd73673e31ba823cf45938c1f4a4ab258f61b51b8a4a76412877862a7851b14f0eca77db57a142c932f985d3cdebbfbbd8e5725ea308a14fccd7daa9
-EBUILD wminet-3.0.0-r2.ebuild 649 BLAKE2B ff82738e7d9ca85b9660d9559344ec9962396f361e79fc5c28b83ba1269f90302e86eb1cdc92bed8c406e79f11f775946007221bc6973a7532dbe96d76eb5256 SHA512 fb58ad260d889c426ebd5ec9f5427f32a8239e2650d12098a758ed56068b2ba4848ff6a250d150c73a285d71d200de532398624366c7d17edc0ee0cb7f98d1a5
+EBUILD wminet-3.0.0-r2.ebuild 648 BLAKE2B e0e3b274c609798846ee152c73d6072eb258f7af4c4cff4aaa61246e007385d7443c0c014e57a2238571279f76850e834edbaa00fafc7dc5c1258a340dda5e8a SHA512 b728a6920b21ec1ca0ec6a25345a7796fff2e751ed7e18c1559c3a8afe690e60d10251cb22047cda52df45443519b93607b0b91d8dcd9c29307560e92559c1e2
 MISC metadata.xml 455 BLAKE2B b17f992bf7af49680eff6c95cde64caa3dce145e40c385fa03bce4a4075793eb946e79fd80f56d88c006149915ccc68499f538eff59b2888b617f47d638e332f SHA512 c27ab04917d6dc1e914f77ae4c215fb9c9f8f0062357ba8f4c197a5ee879335ba196f4249eca2b036717d4eb896c7802ba274fbf39288559012e4992140f70d7
diff --git a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
index b3516e92cd9f..d5650b9529d2 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.improbability.net/wmdock//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmitime/Manifest b/x11-plugins/wmitime/Manifest
index 3502b1dee095..4a4622ac3da1 100644
--- a/x11-plugins/wmitime/Manifest
+++ b/x11-plugins/wmitime/Manifest
@@ -1,4 +1,4 @@
 DIST wmitime-0.5.tar.gz 15099 BLAKE2B 5e5197054d8dd716550235709b86bc4a6de707d04c61a9492e7dd7405dc0940cc2f3b637ce542059f549a512e19fd1b72047fbd4ad29de46c936d6c07af91daa SHA512 ae7d36eaf92e1a5f7481fc92685b87c2ee1092e73ed85450686b0c22e3502cd2ff82787a24bf396bf346d6e3bdb3950306fd237ea750c4ada87f0b56d3b23cab
-EBUILD wmitime-0.5-r1.ebuild 664 BLAKE2B cf8f9b2ab8c9903e12759b2d12256186ad1727d44ad37829dcad488565dd7b556c19c88fd5aa06032afa16c8aec3e622eebb907045369d4b3df68ed951ea49f9 SHA512 80e117d1bce89f2ac72a48aafe97db5ba11a203e35263531fbcd4af828ebd57e1255ec09649d7dcfce663968a1913f3d57d796d860ad696c8ba7454e5227e3a0
+EBUILD wmitime-0.5-r1.ebuild 663 BLAKE2B 9ea848563eaf1e00a8146b6694e25920a8b7359deee8c2e325854e24ff3d49cb0bee9df83ef4d07a7b8a1fff0ab26056d27df3dc0a862b72042788034bcfb07b SHA512 d65a3d1629aaa2375e4f9e1f4c218db4f9c6ec9a870fedeb008c454d502900537462cecfd313fc8d4d17ded1145ebc7032f43b918a4c8786c3fffd7c13de36f3
 EBUILD wmitime-0.5.ebuild 682 BLAKE2B 2f2d754aaaf7b45449178712c625a6aa3849de424cfb38469bf91f753db3bfd7bdfc27151c809ecfb5db998460df19a0a65df4e67fcedfc2c1707147c110c671 SHA512 94491547456cda8bd4e64171b8998b5f7f99ba439ed8f4659bc622cdb12c4ff79c88186326c2178a82c66d5b0d196f22d388c59d0feb2555f1654f2ab6f18df0
 MISC metadata.xml 446 BLAKE2B 684a273490a9b6209c7e5a493484e863f75a4b6ac755a84352d4dca44da373b92737032fdc094a01fa47e21882af6798f97d3dd0a27722f5800aaedc5b27521e SHA512 9a760943540f8eeae5e9c86ef8c0bd38441e44de95ade057ffa5997da71167e808745fcfb3f8f74d4f5a68f37737b8f4635f4667e649db450e2f73aa799344fe
diff --git a/x11-plugins/wmitime/wmitime-0.5-r1.ebuild b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
index 99ccad440497..1f7e6c549411 100644
--- a/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
+++ b/x11-plugins/wmitime/wmitime-0.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 9c6525b484e0..32523579889d 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,6 +1,6 @@
 AUX wmload-0.9.6-solaris.patch 3040 BLAKE2B 95f8c6368a7f1f3d476da2d089e6a72854f7cf7411b212bed54e26f0c6b4917c340722788a41bfb63c80cbb49b18a1539c0002fe9eb7bd785aa10e2ab0be62b8 SHA512 083d4d3e3bbbf8646db8286cb8350c3c2cd766cea6cca9cee36cc2a4fa04993b73d629b652879a685e4b8440f3545c36bbeeb5e9017339425de5eb4164bacdc2
 AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b
 DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
-EBUILD wmload-0.9.7-r1.ebuild 777 BLAKE2B d18e669ca1d2452b18cf45ebcb7f4d10e05a7779f654630ce0dc4bada4533b725f912513140bcd3372d83b135ffee8ab5c269d53f482950d4054645768497507 SHA512 d16cbdb23c4298cd7d8dfef5f6f3a27b7525f7ecc1a2bee2debd83b07c9375f6665ef52f3dcc0bba1e77cfa2ad3de2b099664e75b64eb51a64f0e1a16db506b9
+EBUILD wmload-0.9.7-r1.ebuild 776 BLAKE2B acf649cbe267771838eb48c2a3b8d28681a8a794fcced440f073f6cfffd13e387604b0ccd2b922bfe3055d758060fc9cade968480309ab43affb13ecf9806c0f SHA512 8bae5ce29d4d17ba7c7e0ea6af53c65908398b3a0e608fed25e59ceb76ca9205cc74ce696c2e6444a7dc7d1a91b87f0e8ca702d72639f45fdeaa7d934808a3db
 EBUILD wmload-0.9.7.ebuild 793 BLAKE2B b2125693aa6672aca3f6fd238ef39f45b3f179c72223feb89a075119a0ebd64d456381ef767e726791daa07f892cbb74a7ba3fff5aab97fe1e72dfad113eec0f SHA512 87c1d718acff0dedc4574409c772fd9578e0205ec54fcf702ad6ad320bf396908c24a7ac23aa9a768b5a0064e02d1e765278e1d3d0ae9c7bf47bbcac750d51d2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
index 167a3e4ade6a..d912e5cbffa5 100644
--- a/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~ppc ~sparc ~sparc-solaris ~x86 ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index 2848c0ab0d93..bb71b552cf0e 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -1,4 +1,4 @@
 DIST wmmemload-0.1.8.tar.gz 23114 BLAKE2B 3d0a56a6908dc1e0617ea43aa73fc07a294575fce8e3f54b7769d8eda49b134cf292caf8d92930bf8a22e7a4f33080da531403bbea6443333859def6937cfbfe SHA512 7139e92e15371ff493784c0677d6697074d85c5f4457d0c5caa146bf1aef481a4afc31a4b70bf8ec0edcc90390c18e16daa8efff7d418f96c137c72f7c7819f9
-EBUILD wmmemload-0.1.8-r1.ebuild 586 BLAKE2B 6b0c55e489762466e626cb8a05af4b3ee71335bd382cf6ac537e1cac1072dc72a5274e1359e9a1aa82e039e2b092688a02f661b3ed6f2a7324d81b6d2eb8252b SHA512 f95d960caefdb512c8217ddf852c792eccd643a5e078599e7700bbeecc9acdaacbe31d917826a34415b54577a255e3ba3e793f0e4ed961d6db52493409c87800
+EBUILD wmmemload-0.1.8-r1.ebuild 585 BLAKE2B 2ae5c9dd45f6911f88ba1fa42df259197ec84a47e56d887598f32c11f2420bfe61725cbc6b70a0c1ed2a3bc74b5f8a3b31c2fae2d55985ab90c40321e2dd4975 SHA512 b36954d8a737144277346a0692681e353c4a2fd1f9b56987bcf64a182f942303881a5cd19de1af9e50e3bb93868093356594b30325c18b6fad3691270ecad03d
 EBUILD wmmemload-0.1.8.ebuild 666 BLAKE2B 18a9cac6e02679ae8b9e9a2fe4e85af4fe78dab7e1d3e6edd139ac47ed37a62fc9d581475f5b81ca017c2cb58ead71df62e6f63f5cd62bf2b973dce377c5741e SHA512 5c84bb721f88bf9138c686e0f72d3c083275e999f7d90373417092c1dfca291b8f8d2eb2e8014a60b8a5dc8573646ac60ec6509f122ca54100ffa5af204f5479
 MISC metadata.xml 428 BLAKE2B 42e4fa840c3d15800b5a4fbbadfdb824b0885f50dc83a01b06c9bb0b5db3e2b8b81557abda856ff2e6a46993c7dfb8f712afcfef1595d6debe45993a51ea2386 SHA512 ddd7223a4e535dc0f919347778fb1ad9edc1a183ff9cc85b5dcc5820454021d38ba57d230c6825055252d007c0b63e20b2b374100748ecc6e18cbceaf51adb37
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
index 08ed138356ba..a844916f4eae 100644
--- a/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
+++ b/x11-plugins/wmmemload/wmmemload-0.1.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index 8cb77a12e724..323736a5708c 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,5 +1,5 @@
 AUX wmmenu-1.3-Makefile.patch 577 BLAKE2B 67ce17eb16ee1d53fb2485a9bbc38e6ac37ce89099defd3840182e052bb1b5a47ba02e94e3a1c1296205085d6de3ea099b61dbd9fff3756020570874ee5854ee SHA512 485a6f902418076fadf157ebd07f5014bda958dcfaeff3500daac13ae3a08650e783a03b95c2726ed8bc98c3db96e7f2971e3a0bf874fed64e1e3bc4f6c5de8a
 DIST wmmenu-1.3.tar.gz 33766 BLAKE2B aaed2a54781a1daa475d0757a4dd97d50e3d200dc72bcc9a7d2c833c6207a73f8f632aa66dc6746f5992edc94cfcb24a722e4dcae06496b9a811577329aeeb98 SHA512 4c8738c9a81d56e084754f4db28da6d3171475b5967ceddaa5646b3d87679112e4f272e1bee2c2a81dd072cc948b3652d843a3ddff9bc31cfac4f787b337e767
 EBUILD wmmenu-1.3-r1.ebuild 776 BLAKE2B 4c2093155c1e79f31454298cf4e3d6cb3c9ce18f68b72573901686697c6fad9e9a987a6efe1cbb1cdec143f97aecbcbbfc184e63ffbc849afeff2b046e57800a SHA512 91f014348e9dc22595614cac606bc2ba5a7e16c35ce376fd8eaf73930b98d109a3a4e421cac51bd94c3bb6c5ac2bf059803205b3c64f901814c11b1ded19a31f
-EBUILD wmmenu-1.3-r2.ebuild 781 BLAKE2B 3e488f0b22281f2c42319351377794a1d910fa63cb593ad997987fbb90cfe473328485f9ce404af1b0b9223f2902d0949647e452c6a031e01ac68b968dec8174 SHA512 3731b7dd7bce4600b28115e655abf427760161098c62670091010cd45524b4401bc6faef5475c9ed6f2f916eb7046b97bc67b944516277e6e6c92b57cd4bd861
+EBUILD wmmenu-1.3-r2.ebuild 780 BLAKE2B bae398e8811b9657a9212da60dd3b123abefc6642a4e91a80ef122fff577a4ec7b199d8096d3775466cbf96997f8307a82598195a8bb3c4ad9b9c17e1428e567 SHA512 086432156208ed0b0984ab7eeb357d58379580f782ec9394c394561f3230629c4dec078fd8e1ca48e79da80ffff729ffe5521c758a1e4c52a2dd1aca39736b63
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index ab02ed5b392d..b04b9741952e 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="x11-libs/gdk-pixbuf[X]
 	>=x11-libs/libdockapp-0.7:="
diff --git a/x11-plugins/wmmisc/Manifest b/x11-plugins/wmmisc/Manifest
index f343ed4a46a0..96a1d6dac985 100644
--- a/x11-plugins/wmmisc/Manifest
+++ b/x11-plugins/wmmisc/Manifest
@@ -1,7 +1,3 @@
-AUX wmmisc-1.1-build.patch 1304 BLAKE2B a9e24d80d86d9e80b62dab8a517ae4be857736e70f9b9a68a7b8d6a90ff91c4797e869cdf9497094a8fc53e30f25efb65fc13cb33ae4398174de2c77c61780e7 SHA512 526ede38debd5cc64d846f98154d3484c40e12839197f4bb4694e95f43420be79f4225720973f44a2012401105f0f213296709808d79c952a5725e8b7d3c0e3f
 DIST wmmisc-1.2.tar.gz 96087 BLAKE2B f48c9dc9afee04de7d437143deb870083e90d01768510b68df2c0e213cfb7ab956696f88d0a76c23a1ff5e5dd5c1d8e5c4640b6766dd7a948d1ad292f2b144fc SHA512 d8ed7c06665c28fb98e2a555c8abfcb7da9e0ae517031d24dce171f8a93775565471176d9dc8905043ae408b23c2f101eaccc364ecd8fa4816d2b529f7922d68
-DIST wmmisc_1.1.orig.tar.gz 18032 BLAKE2B 2e1957bc9e6efd0e646dc1403eac125d06fb7176ed92617f9d3e767c85b3d347dbe60e61da90e2c11ba160ddca29db28049f39dc89ab9bc45cc0068c27192a82 SHA512 9f9e93df309902e97a5b42a674bb06767a1cfa524553d140e370060c01a398bfdafcebfc806daa4b4f42b1422932512d48e33ebce444011ad410a5b460592582
-EBUILD wmmisc-1.1-r1.ebuild 683 BLAKE2B e41bbcf9a15710c431ac0ac1a0a808899733a08b2c3d8074231e93e63268284b5274c530e485ad58315d309569fa20ca7be88271b56713c5c660240a3c2cbbf7 SHA512 c6f37ddf56c332105fe38a08ec48948506346adfbb3348dbe3306be48e134cbc841c3bdaddc012b5b93655459e25383d5b867586898ee897b617e68c1860da81
-EBUILD wmmisc-1.1.ebuild 755 BLAKE2B 4a368078298a8b67059350373a960ba463ea09d1feced4a20f8fa98b0a8314f0030c99feaccb2a2e8626aad4206fc74354620089f356a868e4e757308d658519 SHA512 311ac1f687a75557fdfd172dfde6ffff67f37619dc45df38907d62244e664a39faac23c62c5c2831cad36595d99c1293d16cdd61afb1d9f88193a3b2c0dcb93c
-EBUILD wmmisc-1.2.ebuild 444 BLAKE2B d24c5c1231226296fb0819f8f5843bdc7481700898813a71154721a035f883c16e0119e27e1d99b2169637dcdd86e72b9b7086d5adc0f1f4e9f3987086654fd7 SHA512 2e42e523b01c1b017bfea366d2ca53997770e167ccd096ac1c071cfdf5ebdc8283664adf26a19606a18266b762647e0c810b328d7a161d2fbfd88d3e9f5acc0c
+EBUILD wmmisc-1.2.ebuild 443 BLAKE2B 457c8a4b9565293b35ca3e18eaf8973d6fcbc719ae6b12d18da84c6ea9478ac79952978e1395ca4bf457892496afbbf481ef004d7600e0ff4a1c573dbb3f9ec9 SHA512 182354f805cec1b33b90f1b36c7d43a0ac37c66e9e58578f2fc44ec772976f47054731823cb4fe5b09a6679bee523538a16eb3cc60d74f16d4a7209b111beb1f
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch b/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
deleted file mode 100644
index 28979642dcbb..000000000000
--- a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur wmmisc-1.1.orig/src/general.mk wmmisc-1.1/src/general.mk
---- a/general.mk	2006-01-07 19:50:31.000000000 +0200
-+++ b/general.mk	2008-01-16 20:44:59.000000000 +0200
-@@ -16,7 +16,7 @@
- MANDIR      = $(PREFIX)/share/man
- # Set some destination locations.
- 
--CC          = gcc
-+CC         ?= gcc
- CXX         = g++
- # Set the compilers.
- 
-@@ -45,13 +45,7 @@
- # Set the assembler and flags.
- 
- LD          = ld
--LDFLAGS     = -lm
--ifeq ($(MODULAR_X),1)
--LDFLAGS    += $(shell pkg-config --libs x11 xpm xext)
--else
--LDFLAGS    += -L/usr/X11R6/lib -lX11 -lXpm -lXext
--endif
--LDFLAGS    += -Wl,-O1
-+LIBS        = -lm -lX11 -lXpm -lXext
- # Set the linker and flags.
- 
- AR          = ar
-@@ -64,7 +58,7 @@
- ifeq ($(MODULAR_X),1)
- INCLUDES    = $(shell pkg-config --cflags x11 xpm xext)
- else
--INCLUDES    = -I/usr/X11R6/include
-+INCLUDES    = -I/usr/include
- endif
- INCLUDES   += -I.
- # Set the include locations.
-diff -ur wmmisc-1.1.orig/src/Makefile wmmisc-1.1/src/Makefile
---- a/Makefile	2006-01-07 20:45:59.000000000 +0200
-+++ b/Makefile	2008-01-16 20:43:31.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- $(package): $(objects)
- 	rm -f $(package)
--	$(CC) $(CFLAGS) -o $(package) $(objects) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o $(package) $(objects) $(LIBS)
- 
- wmgeneral.o: wmgeneral.c wmgeneral.h
- 	rm -f wmgeneral.o
diff --git a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
deleted file mode 100644
index dfcf13a8c09e..000000000000
--- a/x11-plugins/wmmisc/wmmisc-1.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
-HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/${P}/src"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{ChangeLog,README}
-}
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
deleted file mode 100644
index 5b4d2a91fae1..000000000000
--- a/x11-plugins/wmmisc/wmmisc-1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes"
-HOMEPAGE="https://packages.qa.debian.org/w/wmmisc.html"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${P}/src
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{ChangeLog,README}
-}
diff --git a/x11-plugins/wmmisc/wmmisc-1.2.ebuild b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
index 7cedad2b173b..56b299d40804 100644
--- a/x11-plugins/wmmisc/wmmisc-1.2.ebuild
+++ b/x11-plugins/wmmisc/wmmisc-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index 93ae6810de48..e066c219bbc1 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1,5 +1,5 @@
 AUX wmmon+smp-1.0-list.patch 2916 BLAKE2B 112b15af9d697dff61fd9273526f88330b14a4882d2ed0346df318ffcf0eb53d2778a924fbcae9bb392375545dd4a2103283f129068a499e5bfc44c7186104af SHA512 6b0032f8c518f77cf7d221bf06900209018dca35a75998cb80bac636a8cd8a19f6aee3628acf75780bdfcd09aec454dd1a7e4670627524812040d829a6b0d7fd
 DIST wmmon+smp.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
 EBUILD wmmon+smp-1.0-r2.ebuild 846 BLAKE2B 80dd4f0534ff34e484807e4cf55dba234d5a209593a14899643ab88e77833cf14ee116a7c5e247f37e6300d83c9fcf7fe7e2662c3946e76c8bf30fa4df2a41d4 SHA512 27f649a6d4fd987eb4a042649e3fda50194836ad3740ec78a02bfb6267f3c25b051543ecac7e4a713f5f6eec537025315b0c76b0d520228298b891488047666d
-EBUILD wmmon+smp-1.0-r3.ebuild 846 BLAKE2B ee1b313d6879a99e8540c6f46d48a9dbbb85d366cd430387d06eb73540a3d1dd779b8e3d78eb414471155638e568b9c053d1b2f0c1a3e2cbc1ed280fb7a2fc24 SHA512 e83203b3b7f086696fbd9fa3b173314828a60d2e254de3fea4d9b24a896bf9250b59e3692bde0f17385914c4aea2a1f0771ce479030417b77d391448aae3e7eb
+EBUILD wmmon+smp-1.0-r3.ebuild 845 BLAKE2B 47939f8a340e24eb41e2e47aaeb4b1ce0c21a690abed3c971195628a3cf820f8138326cfa0397f0be06af9e299c66d6038b0728993160789d0a5b469f66681c4 SHA512 00d9842ed7f91110657cdcc36eff79e2a71fa9d929d09cf9670e74204b51a53ecd57c5315ba9dd81471364bce25d6d8875250b8abb73baf794d43af720c1face
 MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 34299e08f1d1..33b0bf2c7399 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index 8f8bf45f1e2e..4c52ce6bab78 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,5 +1,5 @@
 AUX wmmp3-0.12-x_includes_n_libraries.patch 581 BLAKE2B 63f7bd5c835a9c63de4c8bd5edbbcf5ee76cb1a7e4e60fa48ee5b0cd86cb966e051966db40022e5656f7a7cea6bf9f2dd972cbdb53d1db0fa2cda587c0ff4b17 SHA512 f3f49b0c2469283401b26c1b5a5436f442d48e9aebf918a5357aaa979378d54d10f634167b6340769a700973a6bda01de1439c55290b33120fd43cb9728b6e5f
 DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
-EBUILD wmmp3-0.12-r1.ebuild 745 BLAKE2B 5a04c04147482f88cbeafaf75079d5744b01bcfa5cd17abe8fb0a492da21b01782416c034251c43bddb28b1c37209e29605ddf677a22e963639587bbe4f3fb42 SHA512 af7e6efde5004626a3422926d4d5fb2303c5fd00421a3423cb05c82d222bad0b7f56331a9c7b4fe3d4fffb75c4ebe94fd71f10f9f53154ff66c05eba041173cf
+EBUILD wmmp3-0.12-r1.ebuild 744 BLAKE2B 7ba003b6e510fd182b13115c4ff71cc035b74a191a491468d939bfec8d091ae00514dc0cdc003e2126fe7db8eda99e611f3048ee8fb7d2bc61f9ec169a20bdab SHA512 d1d326e6cec00569b1a1f69f3d3b32f9f95421e884e700c481d401220574139e473f124c0b24f1483a9920f1f6a6e8370857a1c619ea7064fea8a7dbe52766b7
 EBUILD wmmp3-0.12.ebuild 919 BLAKE2B 7cc184dd3055b2aa0e1a180157885c66cd9cf5712d70155ab172f32cd7791a297ab07bb1733603acc45377e153ed32b2bb1d2dfa6d7fd6e4f94e1efe412cc579 SHA512 3181718be5082164a298874fece90670d0f8ddc9236c542d60f014976997f8077345bc1d1c18ba925d50be5194f2eb4cca0b102b944d32476ecb49815102d7ea
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
index a9ee24e58de2..f9b4ad00aa97 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 0437013d04dd..6b2a189745bd 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,5 +1,5 @@
 DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
 DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
 EBUILD wmnet-1.06-r1.ebuild 804 BLAKE2B dd43869d6648d8a7bf33e6f4b9b4a42e2eabea73713e557a9900c34f7441f78458a6b90244153dbc50ca698b473e5b9c622ea25071e590f8344c734c0f75647c SHA512 dababf35f29f1b6ce7ee5167a4c7f808676f1c28f4bedbdd2a4c8e89aaadea885eb619277b039ebf53b8538b8e81d24eec04e99ae75f9d65f1bbea0500921329
-EBUILD wmnet-1.06-r2.ebuild 721 BLAKE2B 99871ba9d144951601ac0f7947a026dcd52692dacdcd5151e73a3956cbc39759175fa8c640bdff0e900e355182185427193fec3373bf5c7dda3b7c8a4e5f13a5 SHA512 a356cf222080fc1a8649f32999b560dc58fc5f4e2e39523f3355b6823b247ef012594969b6b0a46565e078385c8fb1ad43b6b51a4964727e467be5be33a611bb
+EBUILD wmnet-1.06-r2.ebuild 720 BLAKE2B ba0c18b65f3ca5bc584c4758913e50196b1ac3bce9148c3fb7a683da321b35981926dc95a7f65d3238f13b365aaa0f892bb68bb2719ea83e17b01dc7137a0f60 SHA512 c8810a11bcb048b46773398a429d744c3d0ef1aa22eea16219758c12ba9fa9f42dd9badf4578ce3c27d65e70fb7a1588379b699564bb0f56a57392fb3b6f3413
 MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index f55209896cb8..a7fb021e102d 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~amd64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpager/Manifest b/x11-plugins/wmpager/Manifest
index c20e4ba419c9..1ca93c4d24d5 100644
--- a/x11-plugins/wmpager/Manifest
+++ b/x11-plugins/wmpager/Manifest
@@ -1,4 +1,3 @@
 DIST wmpager-1.2.tar.gz 24255 BLAKE2B 7ca18094ad1cb51793249072e530366cd4b4c02d8d5a2a8f49bae4e4742fbfdb6dad9a20d79142cd6776a17dfa078c6e6a7dbf84e98611f6024166f1bdf0a977 SHA512 6abd4ea28bba9bb809a8e0ce96df2b4491f32eaa39a16fa57727581c63ad6f96515e761392564af1515b92a6c463f7efee5fd84b96ae730fa0ff19094f5fec3e
-EBUILD wmpager-1.2-r1.ebuild 830 BLAKE2B ca383676958892dc85c1b613450c4c58b96ab8deda0954244177d8975f38bad6ba69918128634426a9245be5f1986651b7c7165d418aecbd00aef3aee29e09c0 SHA512 6eca25cd92fac3046b7ac33d69d3d16d3013bc360f2b248f4f636e93cf81df42584c3cbd9eae97174f48c8d4c9854e1a51583a93a70d281e7f235f601bbdf00d
-EBUILD wmpager-1.2-r2.ebuild 815 BLAKE2B 9284160691f21c72ebbd238f3b7c24ac1e01dca7e903952be4a37013275d93daa8e1fe700f24bd5d80a8f5eefd98cbcb107f26fb9cb8362abff3c86d79e5d2b9 SHA512 f1d1743753b00f117da8058c34bfb9d82ef7638581a4feceea54fefc0c85b9de02a528cb9eba939a4626ec48c92f80b5b56b50767c3b2df3459a5c605a7213e7
+EBUILD wmpager-1.2-r2.ebuild 813 BLAKE2B 8a239d3ac459b2a89f3e5c9fcc725b47643f28f9b44260350f9cdee5f47f44776044c80017f2aa1438340d8721d7da7e783f0a445c984f7592de47eb03a0207f SHA512 67ddca8fc38f75f4b47c814af45fefbf8e039089b16a9e69e480a06b7e55b24f672747808fc517d595384cfe51f9278f5c9830dfbc6f90c87287a58e9964d231
 MISC metadata.xml 334 BLAKE2B 9fca93d4a22a7e98cfcf055c6278d35df23ecdb58ce25d2996c583af6ad03cee3db5ed54c726896bb3a270ea0d48bdf07b67ce7c78b54c54d5b4da6e7b2b98c5 SHA512 d20e124603782aa8fb7d5412d31bb88ceacb0e41fba77884e304d1c4e3c388514287e6d145d80e0d832fa45a5ec2fe1afeeb216e588f31ed59ec94c8fd07501f
diff --git a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild b/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
deleted file mode 100644
index e130cbf0b4d2..000000000000
--- a/x11-plugins/wmpager/wmpager-1.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="A simple pager docklet for the WindowMaker window manager"
-HOMEPAGE="http://wmpager.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" src/wmpager.c
-
-	#Honour Gentoo CFLAGS
-	sed -i "s/-g/${CFLAGS}/" src/Makefile
-
-	#Honour Gentoo LDFLAGS, see bug #337604
-	sed -i "s/\${LIBS}/\${LIBS} \${LDFLAGS}/" src/Makefile
-}
-
-src_install() {
-	emake INSTALLDIR="${D}/usr" install || die
-	rm -rf "${D}"/usr/man
-	doman man/man1/*.1x
-	dodoc README
-}
diff --git a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
index 245faed9c269..920a6e876ac9 100644
--- a/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
+++ b/x11-plugins/wmpager/wmpager-1.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
diff --git a/x11-plugins/wmpeople/Manifest b/x11-plugins/wmpeople/Manifest
index 9943ec1ac1a1..2110623c258b 100644
--- a/x11-plugins/wmpeople/Manifest
+++ b/x11-plugins/wmpeople/Manifest
@@ -1,4 +1,4 @@
 DIST wmpeople-1.3.tar.gz 111148 BLAKE2B 6a3fbfa8d4d47d6a80da7eaaaf07dbc269c529bba20bde9e229b415a54c8dd016f9fbbd021dcf9e9788d5d22f62f58bd8a2e745cd5e1014cb52cad7e06d54104 SHA512 af01e2d43d158eab3d520ebb0b9ebd50e1b5955920e3b86d5238d9bc0313cc055001bfa44d76e1ccfe721f668b9494373f18175f2ef7d248a0e237bbefe9e129
-EBUILD wmpeople-1.3-r1.ebuild 759 BLAKE2B c80d0eb517952fd81582953b68714ffc5d722bf14f768ec7d10ac5f9a7c6e908ac58f92fcb8af12ac6bde1de402bbdd63cb88a79593e163b85d6bedf1b9c9ce7 SHA512 662fbe731012b0abf020c12f077eeb28fd2340b9288e43dc8ea3f5a812a3ab91fc6e4ddf654304b149bdd8dfbfe3a1618838a2d28319927e436d4b8d4254c116
+EBUILD wmpeople-1.3-r1.ebuild 758 BLAKE2B 97d7ef5537e8052f382e140fcf7b6e1cef110d0813e82600b20ef0b70e019d5a2847318c5ee792a83a084621fea988dbadcf39e0432d3ac9a23d3c738e7ff2cf SHA512 2ce131973db03dc435f8fa11ebb2278d5c4703c5a037832f6f0d69a0505472eadec547fbb286f24b474da78cd42c2b71e2b68d8e0ece1aec152af467f199d587
 EBUILD wmpeople-1.3.ebuild 891 BLAKE2B 29282bfca6b0b615a4974813cc86587ee93e4ccefa2092291c261f58bf867ae305b5435376b20439b6220248d340d9888efc1930c8b2cef18057545054083ba0 SHA512 f8695d99c5eb32778905977e6e3c6f085717471100fb2da575e0820c09bb16273b442909f4c2065e2ec31280d54e08e57959e443377a807ca9028912b0d29e25
 MISC metadata.xml 330 BLAKE2B b6738c078f6ef15476ae01b2ce8f8a792a26e5c5bc2d79cd26ce3d76678bf9a8a3b5638592a8c95360c9a438bc2eeace80b149ee9d10fb86501dfb6ee01aed94 SHA512 2f1848b2c96ef0957292045ad958b252910c8f3a29428e72f8131659575f095bbd18e8a594ac9bff21c2634d86556894b0fadd9b7f9d7990f637da2f30f0320a
diff --git a/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild b/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild
index aa653df0a5d2..1d26b58f0cb1 100644
--- a/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild
+++ b/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index e7e53536d05d..e920043680e2 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -2,5 +2,5 @@ AUX wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch 5642 BLAKE2B 50
 AUX wmpop3lb-2.4.2-list.patch 2941 BLAKE2B 387a8b4cb87d0ca0ba865539e3c17ca54ac5056f9229832308d5dd89b62b2bf5b9912c394aba1951fb999bc3a7ad257987228c0f3a69e50092735e640fec0c66 SHA512 0a8f5cb7da8ed6143276eb081585621b108a92865de7d6780aaf3c98144a22af6eae89e2ed661926552196fa351fa805d4e6f51e243693f1c537ee96f91b958f
 DIST wmpop3lb2.4.2.tar.gz 37391 BLAKE2B a9e1acaa35b965db90d5e272382629d02b127b19e9501a6e26094f204463a1f33023cdcf4b7910a045abd2e412c0a41cd3d67fb98378b164f2a3c3f0f457f8af SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f
 EBUILD wmpop3lb-2.4.2-r2.ebuild 1007 BLAKE2B 538816729c0378e654d8e54a0ddf4f88fc1790ac6ba69cd8d0710e2a3b1863854e2197b5d5f101ffc5e0f65798844135edd207d80d4d0525c8c8012132a8cd04 SHA512 c7ccc12d81c13a3e53211daf426d7a2575f954d244cd1127fedb91eeb78e2f98ae0eb5666072fd5c589aaebb8c155ae1f3f18bfe3621554da9097513362ebe76
-EBUILD wmpop3lb-2.4.2-r3.ebuild 972 BLAKE2B 5ecc4bec8d548e7bc40a7f5ff3287251431ea25fa0035dac794e46b5ecfc92ad3357d9a399433dd8f297f97c0ef14892aaf39588bfbe39ab1090320e9f5b9ff0 SHA512 32975f181c801332c0ee96438e4ce1985cf5b61200b35a73350f974e4edcb1079ec8588ded98fa04cb6657cf3e2de65e82d4adec6cff3520688bb59b676ad1d6
+EBUILD wmpop3lb-2.4.2-r3.ebuild 971 BLAKE2B 93116c6b91f500e9dd76fbf3cb3106abc2a7631504306b6d1d7bb8019b7a7b24f6be573ce248e2abff0f8ff02ddb86c51a202e4b2a68337dba0ef112e9d1a3d3 SHA512 9f81056511c89e6cadc96bd52a6f17a4c011714386f16a14734e6d301ccff95915e34ef2cec52838cf9b7f86cb2a27c2faa1407f5309a6dd6005607c7c0c9291
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
index b9cf7b50e8e1..d32a540ca69a 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P/-}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index 34db1982a5cf..a3b8479fd99f 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,4 +1,4 @@
 DIST wmpower-0.4.3.tar.bz2 99178 BLAKE2B 191c562d0b3a2d738d826030323b17db049868bef988ac49250af3e0c32b0c531bb1d819526de609fae3da8bd74b2bc78d724c58999f5fae5e6655e0c1aaa5a1 SHA512 90d96949472497e39760f76b33f4363751863d3f824b1cb22ab9ff333f496b1f329db5fda1a2353c871f87b9f9f09781c410b51907cf13c617cdd3af2c2c84e9
-EBUILD wmpower-0.4.3-r1.ebuild 655 BLAKE2B 973e7bd8efe5b318f069935457c7485b1fa16b73c56fce0485c120c1b0926b13cdf849a25b112d987ff821611a53a847535ed71a2f02a2ec151a4e57a401cc7c SHA512 1e88e5bd29f6c43d1c4739ac47cea21f9c8b3dac61d5e92e9902710743ac46c5f970f78ad1a7951789207e3ed8d119f6bb8eb8e60800f3dbdfecb0a5a1464d07
+EBUILD wmpower-0.4.3-r1.ebuild 675 BLAKE2B 11007e713e3ffffa76fdfa9b0803d8b7ff751d66f24ad993d638e3630e1187a708caa6c809cc42e3b9107b9c2279a9bf8f9b96483ad9cc46fa2cb350358efeaf SHA512 afc8734d0b206672517c7bff0ea79ef2e1a23e35f2a9d0c70cd79a65d8bce013bed94bdecb0589ec7990caaa3acd95c49c9410147f0d99104347e354b9c6fcbd
 EBUILD wmpower-0.4.3.ebuild 794 BLAKE2B 2202e428661db4cf9a36e1577a8753d982648c007e49ff3946b25277432ae0e9773afc6e4ba6e24ac6c0ed608485955041308576247917f8f813deb2f2fc716c SHA512 d9e451190d5d54f647f18a986255378999a68b5bc84666e31d8d149f371edd503a18e5073ffe9dfe250a41871607fd50f147d370c56098eb782d7b7df0f8510b
 MISC metadata.xml 684 BLAKE2B 3d50ae0a0c2d8c358b709fd5a2c0b86906aa1cddeeeed3f9f62a31d3aa56d533331d0254d1b74df833f0ab80a745b59c67ddad74875ba9677cdfc40a43945275 SHA512 56eff68c510d855dcfb617977cf9d837741441d1a8ec40e9c984c306b104c573f880d126dc61a8016b80351e6a77f9564e50288a3392e26dd32bf0fe2525403e
diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
index 6a4a750ff072..81d0e102ca8f 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wmpower/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -20,8 +20,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO )
 
-src_compile() {
+src_configure() {
 	# override wmpower self-calculated cflags
 	econf MY_CFLAGS="${CFLAGS}"
+}
+
+src_compile() {
 	emake prefix="/usr/"
 }
diff --git a/x11-plugins/wmrecord/Manifest b/x11-plugins/wmrecord/Manifest
index c867d0a65cf6..cd41c70fcd50 100644
--- a/x11-plugins/wmrecord/Manifest
+++ b/x11-plugins/wmrecord/Manifest
@@ -1,5 +1,5 @@
 AUX wmrecord.desktop 201 BLAKE2B ac13a893dc87c2fe0c26f8ffb3b9f1a19cf1d80a1a0894d6a69f63aa703e80ae31346fe2e9e3e147675546b7656d5a797250b55eb02305e17f024e47e0b009c3 SHA512 47b075d64bdf027bef79e4737845aca32677676f5dcf81826064c16a2516bd6089c839fc3292a34b5005eac2bb5ed7ce66916c6646474819a384e36604df7c7b
 DIST wmrecord-1.0.5_20040218_0029.tgz 38594 BLAKE2B d1cc41a7de5c45a19ea364c9c007382c9220bdf0b4a6d69e09f2169cfc879e51d53afd33fd434f28ad6ea4e20b05760b06afbbf8a5560abc63b6edea9114bab7 SHA512 4a0c9f58d22a72a83f9e7922b5806528cc412576d55b9c24f45b7d93a5594f380f51581addbb41b65c18c9b5f0ac1cbc8e3881268a75386545f5024f55836154
 EBUILD wmrecord-1.0.5.3-r1.ebuild 1211 BLAKE2B 168c954e664df2da1d2469ca5b0e0fe5616f3716126b73223b296bfbdaa47cacf121688e71bb620ed41d7ef4cffa1c99481e44e4659bd2e379bfd3d1764fdc6c SHA512 6a061571f646cd915e8846d4998973d4dcdbb68b7db2fe85d12153b35d49380353fa56770f8447c6d7b5dd88c2372c3608dc2b5da4e0e3ca30c72d5eb66e139c
-EBUILD wmrecord-1.0.5.3-r2.ebuild 1112 BLAKE2B 6f7fdf04e264e71665730639c675ff426b3dfe4363e48f4cc1c66f1a7870e818426c61846b88b16a4d7786137d01739346029058aaa63165be975d17ff1a23ec SHA512 43f2e52cb4d9489ed60c5cb3a1a98fc357f1f0c04fafe8201f187a9b9027fa36909a8b78d05e8c638fb6bcce5287e8d9f8f39e185fbba423799113ea8b0d30aa
+EBUILD wmrecord-1.0.5.3-r2.ebuild 1111 BLAKE2B d7e2bc8b5b992677a234dcf24daa270d308145d7d8fc671ec53d86fe155a33e5de07464ae72ba086d68489acd44436a0cc418da0242ae860578e7c7a98d2698a SHA512 6066a2d8bac7b577bd3dfdb62b29d54aa124d055c71abe9a648d7f70b76c50f3ad118f103e101a015856c6ea5c393efb805b7ea4087a0778a257330e47c0c9a2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
index f82663c26082..4be4f50aa084 100644
--- a/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
+++ b/x11-plugins/wmrecord/wmrecord-1.0.5.3-r2.ebuild
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 
 S="${WORKDIR}/${PN}-1.0.5"
 
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 67487f10142b..9112d7ade474 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,4 +1,4 @@
 DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
-EBUILD wmsmixer-0.5.1-r1.ebuild 805 BLAKE2B cbb9269a66a666a567bab957f0d3e22d60fa547df293db4cdee3a0c07578f40b2b4ab7f14749ff8a1988f4c4149481cf5f13fd3d432f8ca0ec13e61398a2890a SHA512 3d8381dd227956843e72ae421497f2c9de37dc645829c46f62c9188257e7864857f78908f946172ae54c2f28f7466eaf7a5089c64ab27e9374fcb76db603b8e3
+EBUILD wmsmixer-0.5.1-r1.ebuild 804 BLAKE2B c4abb5cbeccca6a31007a84e05e0c043f45990aaddf07d744e8c3ce0fb54bec2b33a7e3fc218187acd3c17d4cd21421d8868db6cb3b83fa43bad191f901a70c2 SHA512 cfeb07d4c9f1fbb0c5334df6863e33b42c6d0bd8c07fe58883e4433e1a6663aa43f6a64037646099c34279f47b43b08b69451feac2673474d3169ada21b361c9
 EBUILD wmsmixer-0.5.1.ebuild 766 BLAKE2B fad312494ceb4f84ad9623e7fa5978c1399fac9db8970a61b4c40deaedca4d074c3975bce7224397d7190ce9e6141d6f1c4365b451108e7b68894c40902cd341 SHA512 bddab4b86259fab433b87374707bf8193c8f0b4febaf4edd5f1f4af6177a957c62b8fe599416ed6f4a81ca7e5a54a41d2bd3ffaa34fe5eb6b36bcd3e442b1235
 MISC metadata.xml 464 BLAKE2B cda6cb18a92e65299fcbd76d3cb5c22755d17c16d4d634db82dbee0a7421c0023159ac479369e9bd7c448b1e72b53d3b28ec393190c92d09856ff86c7f2fc3cd SHA512 ff0c18c9f0dd4c316c9e82b22a18d15a08d68b58e63420d96da5ae0e70872e2946e0c767f8b5c80951aedce5057a5e8bacafacdcff84416e7eb529c8746c186d
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
index fa2071e9f970..d0f314c8e661 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 223444bbc816..9ccb32b0bb26 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -2,6 +2,6 @@ AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1182 BLAKE2B f6f0e49caccf7e1d618299e86351b853560550ad909d81d5db60acdbb7d68885ecc8b74ec2bf32637236fb99535e3aaf131b1c2c9d2b0ae0582a65cec715a73a SHA512 cac40c5fb9240fc3a70a41285c37b812b13ef331c628a3930b87251485b16a6f524d48c542920c833bfb4fe5972f45835d4e5e5b81fea8150409f6c47b4e660b
+EBUILD wmsystray-0.1.1-r1.ebuild 1181 BLAKE2B 875127a44dca585a5da7e3d7672c66f8543de519290c3c4cb2f289d57d10c0617bd0a759dc4a6a20109476ccdbb5e1714dd8566ce6e5e3561da409b3a7cd3882 SHA512 d279356ccb5c898d77c8a168723129da635fd086eb0c5a445c6e1d4d11065f6aaa80101a3882dd0d635b1e45c26f376a41374b7888a3d44dd78392ad6e6829f3
 EBUILD wmsystray-0.1.1.ebuild 1204 BLAKE2B 8e9235f29442507f9f54ed5ec6e7680b9153d1a5a0a5d8d0dcbe0475faa62e831d8b2333d2e5141696bd17bfd1351210acaee59e6935f049c1a4ca44cf8788ce SHA512 dc8ba563e2c1da0e05f79541d701d89d3ad11d335eda486f00bd557aa141c27711ba92e7ee1cf5328733d6e7907e18bfb2fb42f959bfe1d9710825d9036ec522
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index d48af6dcae9a..baccd0d6ab3b 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -15,7 +15,7 @@ DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 # Let's honour Gentoo CFLAGS and use correct install program
 # Fix for #61704, cannot compile with gcc 3.4.1:
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index ba9ca52daaf7..a5bd408402cf 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,5 +1,5 @@
 AUX wmudmount-2.2-perl_brace_regex.patch 417 BLAKE2B cada3b139df63f9cc78c2d6bdb3f243c3fac5d4517c166de6cfc166439beedf7398510ab9ff76596316db6b3ad6dd8fb234e42d55614e89bfaed671614e0ed18 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73
 DIST wmudmount-2.2.tar.gz 181700 BLAKE2B f375aca9da44b5cba1483b70c36bbed81d897a691ce91ca5d3e11f8bbbbe1cc46685480d41144d6cca0bd10f625e46b5eec2ffc573ec7dd90b9b241dde7605a2 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe
-EBUILD wmudmount-2.2-r2.ebuild 918 BLAKE2B 39e7c0ac6b63d7c7a8ea628aac9bf3d9e522217f986733ca2b4f89153765f53f436e293d0e646c4854818f9d615b41bb702a6a3c0fb1cc4d0ba64ccc59caa16d SHA512 9bca785f6798b180832e762f03dfc78e8d0ebb343ba2270d1c594368fd394a4c9333e61ccbe8f7e8fb89e5f58a7a4036e191a641c34cd6fcdc70147ebf03137c
+EBUILD wmudmount-2.2-r2.ebuild 917 BLAKE2B 570314970cb5985b6bf77577d91a324ca8c85a4afb4cb40a16b4df316857b56cc9adb52651f6c52fa6dac84bb484ee99e5e270a604ec3d89676069080f33fdd9 SHA512 89d5d3934ef2163db37324bf49c5457bdfa2d51bfe632472d5c139caedce738b259bdb921554b9388ec55f4e5f3288eb8cc9cf061c25628f613f87971b9f39a7
 EBUILD wmudmount-2.2.ebuild 902 BLAKE2B 56afc5aada175b7623c238146fc74c68ba12779e5c9df60b1f3e043a6b9753e83e6bff4dce4f2e9f1831490f312e41f6b900d4249731f352f5a33599849b3e0a SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689
 MISC metadata.xml 331 BLAKE2B 17327d6a39e4d1bc33e46b0e3e958713aac557a46aa2d478d455abdd9911531d6292c044604ebbdece25adb283fd80ed90538ebe18e910b4bb24ccd39a290cef SHA512 c930e5cae4d2478d607c0e1c21c4979cb49ec11140cddd5789844cce0bab5c48922f69306f26e98ca4c6d95939c93d2d5dcd99326a74886228839d9e30edc3c9
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index c919f691e419..231361dfca59 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
diff --git a/x11-plugins/wmwifi/Manifest b/x11-plugins/wmwifi/Manifest
index 103dfbf13428..a691bb7a1b65 100644
--- a/x11-plugins/wmwifi/Manifest
+++ b/x11-plugins/wmwifi/Manifest
@@ -1,4 +1,4 @@
 DIST wmwifi-0.6.tar.gz 150482 BLAKE2B 213f56897527b57ea2fd6123d9147c8d4547323104e940b632c2290fc6941478a9ee5d0aefbe5a06e2b20bd524b84eebd9d75bedc83054066975459b770fbc56 SHA512 ae0a66b68f991907b7e8434a872cc8b1fd9219d633260183a6917e1d34dd4ddc7be91dd71b6cb0ed20781ca4eaa6a0cfc2adcb7a838b734050264a5fae4cadd0
-EBUILD wmwifi-0.6-r1.ebuild 638 BLAKE2B 74e8b3a47bf4305928288aad39e46ef7bf8aa63c539faeedb59d6db53f4fda195143397db408712d21711e0538262a674ccfed3e8c16c3657d40e546a1cdd815 SHA512 2fd5f30fd30072eab681453f308055a2a962e2121d37b1be098555d31bd8043614c00a544ffc047845b2e854c9331c24cb829756025f888810015c21e7c61107
+EBUILD wmwifi-0.6-r1.ebuild 637 BLAKE2B 2914aa5d462d39bb6867940f43b56a7cd0c4e3fa0e7668fc0670553a4b08488af34c2d44ccc1aafadb043cf45e7014347b6744ba7d98aafa8f9ae01719d4a728 SHA512 5e68f3bac1d2c48d4719d7ffccec2e13dc7dd6d5df8425686a38516de38a673ae3233032789cc40e44e02d07367abac154858385f2125edf5b303b5fb8038439
 EBUILD wmwifi-0.6.ebuild 722 BLAKE2B 8d00a8eec6d7687dc026451628a1a2041cb44e7b80cdaebfabea46ac47a7efb52c0396b191e8e1ae4a040dcf032789fdd768f1ac78cbc809943de465df8b0db1 SHA512 4754da83b4b61bfdc03ad24872b451a75b2bc28769440dbff0388963bbeab79b674f57cd9cfaa02c29ba7cefa45db9a6cb39d8c5253925d6c94aa0123a21e3b4
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
index 4241cfc987b1..04506688e44e 100644
--- a/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
+++ b/x11-plugins/wmwifi/wmwifi-0.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmwork/Manifest b/x11-plugins/wmwork/Manifest
index 34ea9fbd27c1..32e70ea5e56d 100644
--- a/x11-plugins/wmwork/Manifest
+++ b/x11-plugins/wmwork/Manifest
@@ -1,4 +1,3 @@
 DIST wmwork-0.2.5.tar.gz 62044 BLAKE2B e2990e84aa4be3c025f681e52948a9a729a6e06cb2032cd2502c7eb484c2a99aa0cfeede0bd727d22a70d9ca372cf0ee4afaabf2af8d0c659fb7c29977dcc08a SHA512 ffbc1b7e3a1bdd0e76c2c3b01088ee8cf1a9c615b4925ea8af514b6a4096f5192900a6c6633b2d60fd941d3515a6cb80396ca17d81104b7cdcacb5e46050e864
-EBUILD wmwork-0.2.5-r1.ebuild 533 BLAKE2B 3f3529adfa1d996d49f4248f63ad75d5219945eef3a0b308c1ee238917616797c7a85268e8d2bbabcc53d53c0b186630de16543e829ac520224cb4ecbabe5e31 SHA512 5f0f62e33fbbeb403b8b4a4b09bacb7e49c14e9049fde540f98a1b0d8b6c805f66b6a39f907a857f1f2c5b266ceac596551205fec0073dd0adeb985c908bd660
-EBUILD wmwork-0.2.5.ebuild 615 BLAKE2B f10f6c2c98915af2b3b3958d84a7fc43341f1198cb552fc4bb42c45b12bdd8796c8b69075835eebed8441d7b58bee0b423ede0b6cb5326bfd106dcd91cc3e2af SHA512 929d81e2e091cc4b50008d461993edef02f12377f65a11ce491c632df8eb800ff6171c5448506a95ebedc05e516139c43beb1c02e90064c713912a878d39502e
+EBUILD wmwork-0.2.5-r1.ebuild 532 BLAKE2B 458c28055644808a7a77545f95ca897a1c3638295053cbfc61d160849ce5d2030ce6bc10bb50a8779398100ee9157f5fe636bde25e1ea244711033a613dcb407 SHA512 e3b82822cd7c7ea337c6862a98adabd5afa9344dc434e1632f9cf23cd358a559fddaea870db7820eab2d09cc7bdc457f32ec3ce1ed013dabd16de377787bedb2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
index 685729961fd2..a7d81d4d1ae4 100644
--- a/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
+++ b/x11-plugins/wmwork/wmwork-0.2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=x11-libs/libXext-1.0.3
 	>=x11-libs/libX11-1.1.1-r1
diff --git a/x11-plugins/wmwork/wmwork-0.2.5.ebuild b/x11-plugins/wmwork/wmwork-0.2.5.ebuild
deleted file mode 100644
index 8be4f2add95b..000000000000
--- a/x11-plugins/wmwork/wmwork-0.2.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="a dockapp that lets you easily track time spent on different projects"
-HOMEPAGE="https://www.dockapps.net/wmwork"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXext-1.0.3
-	>=x11-libs/libX11-1.1.1-r1
-	>=x11-libs/libXpm-3.5.6"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}/src
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ../{CHANGES,README}
-}
diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest
index 5d88024cf9de..7d643ab2bedb 100644
--- a/x11-plugins/wmxkb/Manifest
+++ b/x11-plugins/wmxkb/Manifest
@@ -1,4 +1,3 @@
 DIST wmxkb-1.2.2.tar.gz 196726 BLAKE2B df0ae8275c82c4fb8965ef6761c82831edfccaf074fdc907ca4bf6b37fb853f6ccb31a05a76c0c392c8b9604a2f03af3bb1e7ed6918c2da09c2757ff93f8965d SHA512 4439c532cc2e0dbcbfd04664420fbdfdf65db47961d2b3374049bb78e20589478c2d3e07d01f1936ce7ace24f5da553546597fa7805c27bba45ac1dfc26d8f54
-EBUILD wmxkb-1.2.2-r1.ebuild 790 BLAKE2B 6c068f07a1de6c7fbd9c641f524e1648b41b8c71732a7010907e4ef18b60260efb6601c324543d2562afd76b30c710f5a8a9935ec38623f85c13e000844ab95b SHA512 1770e88607ac2b12433939515257dc0536bed52ed2d9cbf9096e6da4aed374483a78ec46fb282974c0ba4421c7e5b8fdf8c9a617787bb19d7a31dcfa242ee6e0
-EBUILD wmxkb-1.2.2.ebuild 797 BLAKE2B 97d008bd4d7e0966355b410d0d8e9d34511d6fe0c6228bd37bf51598f7e464b4d1f40cdb10888af6228c04fd82300f230e9cc860e640d7d6c8c96a297fa98da9 SHA512 52cdb40ed0da03faf7fc581a5c6aeb4775b6868548733087d1e0cf5b992f5c3a991eeffadc68b27f884066ff8e687bd9782985b0dedba3bcd199c9aef3859450
+EBUILD wmxkb-1.2.2-r1.ebuild 789 BLAKE2B a331563b0f2000315bca1bd56a09712b1616621a44cd02696cf0dd0e21c3b4595c223ea7b85f407db106151f0c93423e14ae9676776f85e6c740f66e9466f744 SHA512 39215825a8d6bd15a8c2c94a3f5a9b5b9d19bf7a909cec1bb749c4d612b6c1fe877478135aad6b0436951d32dc3e8b474b65e18236fb7b5531dc35d2ba83ae4f
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
index c1686dffe7d5..c22114f48ac8 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://wmalms.tripod.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
deleted file mode 100644
index 37bfd003969e..000000000000
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="Dockable keyboard layout switcher for Window Maker"
-HOMEPAGE="http://wmalms.tripod.com/#WMXKB"
-SRC_URI="http://wmalms.tripod.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin wmxkb || die #242188
-
-	insinto /usr/share/pixmaps/wmxkb
-	doins pixmaps/*.xpm || die
-
-	dodoc CHANGES README || die #350496
-	dohtml doc/*.html || die
-}
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index ac53fb3f694f..b08b2059451a 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -1,6 +1,5 @@
 AUX wmxres-1.2-r1-fix-build-system.patch 584 BLAKE2B 2ea4860274791edb2dcd1c03ee0753c413f919ab1648c7a2c684e8f45698355d0a7132052705b71210b9ba3eeddb35815bd1219dc151484a919d5b67b0caecc6 SHA512 c505490234aa5ec366ae37b5bc95c04cefed93599dfd37d14a015c03daacf0b71fc611bc6962c31be12a60c61c82e7b1f29db80e7826e058433abf9f9f2279eb
 AUX wmxres-debian-1.1-1.2.patch 1699 BLAKE2B a07ed3bc2c26d9bc73d4340d658ff9754eb9109fbd5bd0ffe973d90af32bf0b5e8e9edc6a03ee822c41d89a934e5270ad81774f35c0d62867f6b788071ea0fca SHA512 d2043b9ff22415f03ec7a3c46770562b7d6ee0180d1048dbd447f27c49149b405faca3c2e863a91abc71c766ce461464f6c4fdea54d2b5916c88a85e8f2d8051
 DIST wmxres-1.1-0.tar.gz 9948 BLAKE2B e9d0952a0cba30733f0b28ab0b1f37e7b0215ba71abda255646321ee673a09f8510384466919dd27679a6b91c68f7a31fe3ff646c7eb453193c9de29b46c5710 SHA512 e7b5bfb061822fb827da50b24287ab9c6b14d3ddf9a89ff6cd5e1bb61939905c901b4a0ff7a6492e0ccce3b39b8bb4d8ffb13cbf7978075a73a30080e25c18ad
-EBUILD wmxres-1.2-r1.ebuild 728 BLAKE2B 9040ad1768ace4402ca95f8677ce69e91266e94afc06cdbe48983f68407aaa3dba7234454162e60fc98bb68ef6fac244c950e3648cfc16b517c305949565a300 SHA512 e23565d6a9fc59f73e7735dd0c1b9f158b28f803d1cd908adcb5282ab0fe169b1c4cbca8e3c1463930fe77d6b9e49ab17f9969632a2e123c1b2b3fb9ec336773
-EBUILD wmxres-1.2.ebuild 875 BLAKE2B 275175f1dc0385cf99249e8ebec69121b1d5da4933075e930104ab509adb112695a58d40d35505f0de7d645cf4b3da4e78d5db56c6d419af7908606f5cd41853 SHA512 caacacc4f8b394913af287b6d559f51986b46a4c66bc43f5ae90f5d8e0235d950bb62fd80756a7b2b8d871054ab970f3a9a746565cf63c322640209a1867e9b0
+EBUILD wmxres-1.2-r1.ebuild 727 BLAKE2B 7da58ff45b7c0fb5b9f3f05e5b22cd72271097baf51cab5786024c534a5f6af3d2c41167b6bdf8325df67f2a274b10151a51213175391ac291f82c67758ee411 SHA512 8e24591c5f34553a205ea69c9ec3d19d91347ecfb6b5477077c0ba7d8b2fd1dd3e75b92bfd4c1f57b4083fa59a5d7c0abf3130cbc495f0b429b0469d497df24c
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
index cd415d8686c2..993a4f040d46 100644
--- a/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
deleted file mode 100644
index 793229458363..000000000000
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Dock application to select your display mode among those possible"
-HOMEPAGE="http://yalla.free.fr/wn"
-SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXxf86dga"
-
-S=${WORKDIR}/${PN}.app
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-debian-1.1-1.2.patch
-	sed -e "s:-g -c -O2:${CFLAGS} -c:" \
-		-e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \
-		-i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake INCDIR="-I/usr/include" LIBDIR="-L/usr/$(get_libdir)"
-}
-
-src_install() {
-	dobin ${PN}/${PN}
-	doman ${PN}.1
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
commit	265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree	ab18b5617d138f6684566b619405090989d55a2c /x11-plugins
parent	586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)