gentoo resync : 18.12.2020

24 files changed, 19 insertions, 290 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 31131660e99e..3c1be92c5343 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/purple-facebook/Manifest b/x11-plugins/purple-facebook/Manifest
index 63d3ca5b439f..b8b05f4236a5 100644
--- a/x11-plugins/purple-facebook/Manifest
+++ b/x11-plugins/purple-facebook/Manifest
@@ -3,5 +3,5 @@ DIST purple-facebook-20170831.tar.gz 462381 BLAKE2B 06f2f53885b11842f76c6d04d5c8
 DIST purple-facebook-20190113.tar.gz 474005 BLAKE2B 5deb89724ed12280ae29274a03556cc0609f9bcae537786f702d59a35ee2c820bea44bad62a0f6393680da4ea86eb86a2aa8649ab5bdebc43ccc3d6325f8b9a3 SHA512 bf2284169f6765986279421ad9946610de6f58a79d0b70e7dbd43445f59dc518aabdb8a9b41c9f1c8441c12edce79ecfaf7e98bdc56abdc59bb2c46951ee50ce
 EBUILD purple-facebook-20170608.ebuild 618 BLAKE2B 5aed3bd119a07bdb2c9fc92de7a04b8d12c93cd73ca755296cc49ddb29cc788047ee943d31bdcfa729bcab61bc548abb4820e061df1975d1348ee5238d0195fb SHA512 edd3cadb176d8724234f7c25a3828afd1331979108085cb38efe8333f0b2caef51039a050a4078a4bc3bdc59fbd813d1e917ca8919f323f4523c747ba7619476
 EBUILD purple-facebook-20170831.ebuild 618 BLAKE2B 2108638dde9031550f0baf1f14c3cc2cb546a7fae5f7b347fcfe9a67288e4b78026cb8c40267bf6edf379b06de32fd4c952865f1f4a8066b9772d26af092fef1 SHA512 205bd150a07e0164aab1f2f6a1fa13d4382a053fc78a5b380592947993be19997b33e5ddf40a7941ab7a7150d0fa9c6707fc24f1a0b491d982e839cbb550b6ca
-EBUILD purple-facebook-20190113.ebuild 595 BLAKE2B e67dee5a91a306352ef8a0ff5ae9e8223e993515a88d525203e7ecd92879d3eacfb78a56ed574195b4ae56e3d49264fa0086d7e8c7ca52013904304e08bc506d SHA512 3519f55150676a369e6cb705a76643f9e1648888325f5b148f8020d1476d3cc4cfebf07f750609dfdb3c2567419d95607166dbe61d575a84190433af0e2e5915
+EBUILD purple-facebook-20190113.ebuild 594 BLAKE2B ec94f4113e6df69eb91723a0aab85b963fbd2f5d0d1da83439dcd618f5b08415cddf0fb22705a34316dae0328f0c778238248e71f836a570e5827b89fc969f83 SHA512 403670e5eb033a7c7b5eab253fd25d706dcedc6fe8aa955e00985669cf9c88506c50783c9adccbcb86b53def910b77ca04664bc94f1257a4a0ad0ec6db8ea2b1
 MISC metadata.xml 344 BLAKE2B ed5c21f3780905490ec18c6d72c7be649912c1a7711d5c9f563d71c3d8ad2e3d92870b87834a45d17ef73f2b24fcbfec422c238a245c3e88166a7b427d8598c7 SHA512 9a385fff529b91501c676bc1d94fc20206b8270b5cbb7f9e6f23e41cf59d6ad9f18ae763706515e3715b22d62b52199453e52429f99dfbb21aa89277511d091e
diff --git a/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild
index 5954a74a3264..d9c29b05113a 100644
--- a/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild
+++ b/x11-plugins/purple-facebook/purple-facebook-20190113.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dequis/${PN}/releases/download/v${MY_PV}/${PN}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="dev-libs/json-glib
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index f265bc949049..9506689f6056 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,7 +1,3 @@
-DIST wmbattery-2.50.tar.gz 40938 BLAKE2B 1193e164af78d1839ed3f6ac251cb01fe36f8630d418aefa3c2f485e03ac37b027274d4146c139afacbb4f59ffbbb4c7471620bf8cb9806a4ddcd95613ce2b50 SHA512 f96b98d2819a9ecf189b9ebc60c107abc6715cf76bb73c98f1d3649dd2ef6112e052559f13fc5620ec7d71466f2e4d6a5e7e86b0f5f0675e02d6e038a9411794
-DIST wmbattery-2.51.tar.gz 164657 BLAKE2B f2432c9d31f4440a88ed67a0aa1b3bc494df2584175df9269c12e08430783777e46ec882bd2d71a1bc5530d2dbb1e277ccc8d1bd8dce2136df8584aaa2013a8b SHA512 2ad508e796a4f5c826bd7c785c3cf1c2ee77923db92c99e75031cd305b351d82fbce158c69cc5393b904afe639574aea38186438fbedfa20243ff03c7824186b
 DIST wmbattery-2.54.tar.gz 87925 BLAKE2B 692549909d52096ecf7997de5122f07d9fd59b3e2d99c1421b871671a9e43f2bbdb9742e89f835a58114238509b8f8b03fd0619da4a66d8e43b6b787d4e5f6a9 SHA512 58c901ed85d3ea7e0c750bb968c3250706ed693162fe4684d75683a3897df7ff02ee4afbe12a5d26b1f1b632d4c6f9902713a632e6784173ea49bad312fd30aa
-EBUILD wmbattery-2.50.ebuild 780 BLAKE2B 17bbe9f6a0608703269710535f78c4a52a3cd99f3df2ffeb91499368ce501b047b8c3acc601db0cbd8f55fbe4a2f4d4fdb6978ac7a445f4e76e94a3535242c78 SHA512 a185eb5952a9653267fb6fdc9d12bd34da6a5ec9b7e473f16a1245e267d8bed82e5a05379b325196b814d7e17c8de8cfc1b5f3d173bee24cb137a869b3563a1a
-EBUILD wmbattery-2.51.ebuild 783 BLAKE2B c4ecb1e35b94f19d51be7b272596e17d296fb5f58dd493e34c701e9c27790ebaad78fae6cd2b871c35b6777b2b1b00adfb38331da5afe5b5cd8f3ce1725a9690 SHA512 b6e04bc74a30f25d7c1448ee73bba9f098b2a1c88fb2bf343e4ad0f9614ae1e095b3a1e82251845aba6acae7097d50fb31999f876a37034af18c0993179be77e
-EBUILD wmbattery-2.54.ebuild 635 BLAKE2B e472f00d99bcc715d520c7f7964e7489ad24e66e5d70cbf99e50c64ebb90d0ffdd3a89083544addff1560b2912e427c92d016869b2420589c591cec098ea359a SHA512 45306a491f89c66500b652d531e145edf57a97c003db0048dbbaeb9968210b91cfd143b08f57b8fb191a47b99fcc5444c54a9906efe1e8bce1f23472bd72f680
+EBUILD wmbattery-2.54.ebuild 634 BLAKE2B 167e52a49959cc72dfd725db537f0a386fba1a7bd167c24c1345b0dbb2e4ae49f6473baebde8a9fc5dfaafd60cce9422199d0dd34b8f3586e25acd021fba41a2 SHA512 aaae4667babd19495167ed343e15b4fb66cf540b8a2c20b869fac6133be184c79cdca656640a5d989e3ae68f0ef7b73556f5e4ce3d7f2a4eeebacb31dfdc16df
 MISC metadata.xml 677 BLAKE2B 4711a784d2e1c2fc8f8daf171e64f9f8233c1f9f34734794481a906e7d97f67eb6c9e729ee76b430276dcc4d55f9bab999414c4b4c4d589f699f3ae6a367268b SHA512 d6101277d76e2e36dec42d8ffe6d99077d09ce288d8ac08b32c93cc9f4f50d6855028126edbacd1bdbfbf695150a35006f3ba3e4ea491b7b8926015d721c5fb2
diff --git a/x11-plugins/wmbattery/wmbattery-2.50.ebuild b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
deleted file mode 100644
index 82511c3347c3..000000000000
--- a/x11-plugins/wmbattery/wmbattery-2.50.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
-HOMEPAGE="https://www.dockapps.net/wmbattery"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc -sparc x86"
-IUSE="apm +upower"
-
-RDEPEND="apm? ( sys-apps/apmd )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README TODO )
-
-src_prepare() {
-	sed -i \
-		-e '/^icondir/s:icons:pixmaps:' \
-		autoconf/makeinfo.in || die
-
-	use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; }
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmbattery/wmbattery-2.51.ebuild b/x11-plugins/wmbattery/wmbattery-2.51.ebuild
deleted file mode 100644
index 686ef8df70ea..000000000000
--- a/x11-plugins/wmbattery/wmbattery-2.51.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
-HOMEPAGE="https://www.dockapps.net/wmbattery"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="apm +upower"
-
-RDEPEND="apm? ( sys-apps/apmd )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README TODO )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^icondir/s:icons:pixmaps:' \
-		autoconf/makeinfo.in || die
-
-	use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in || die; }
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmbattery/wmbattery-2.54.ebuild b/x11-plugins/wmbattery/wmbattery-2.54.ebuild
index 1163ee081469..f8aa6f8bd2fa 100644
--- a/x11-plugins/wmbattery/wmbattery-2.54.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.54.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="apm +upower"
 
 RDEPEND="apm? ( sys-apps/apmd )
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 029c94478269..bc35ce2cac00 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,5 +1,3 @@
-DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
 DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
-EBUILD wmblob-1.0.3.ebuild 742 BLAKE2B b9f20004b0180beb5b3dd5261740cf517bfb0bfe65d37d84457cacef08799ca550cb9b4febddecebfd8e51939ddfe142f14de9d1e2caa253d318f1bc3162a0fc SHA512 d94b21672f157ba2da3808d4e03028a9cefaa952a83ec28a536205ec5e565cbdf1d94e6985ee5f99d112f669f7ea6cb2566477d082c31f1220fc05a220c9e832
-EBUILD wmblob-1.0.4.ebuild 732 BLAKE2B 30ff8efe3b1cb23fb76fd5ec1bf69a5827efe314e6af82c1d3e4d4dd262c805b75beaad6bed4acf1eb034b5d522f342cedef0bbf628d8649bfb22b093a529c15 SHA512 4940a898be7cf6c450aaf0d023f54326883f21797c8d1ed2f0fc7b67e590b895fd6de18af158085f502336fe034515e6edb358556d363bb25bc4f59159ab7c73
+EBUILD wmblob-1.0.4.ebuild 731 BLAKE2B 49c635a6beb8cc353e79f93a2bfd53d4409df9641456ff3365bb10c4eea241d2750108b590120ab48d704eee7262294700e90e8117d4a0a206c5a23a0de251c8 SHA512 b0818713ca81d57ddd67f440f5ed9c9546fc21b13a5e36ded78caa78ce0024ea30145df217e7bdaebc981709baa892c8f04f11981f3515f192bc8b74632c3212
 MISC metadata.xml 326 BLAKE2B 1da63467b87683bcbb2e3e8a74094449c20b94c5a891a59fa154cb9f0ad21ee89c4bacec8b19bbc74d3ce687f18740eb972a0051e7fbb6794e3b1ef30a83ecb2 SHA512 73f3d392f88613008cd221ee98c5836f324127237cd3e64681b90f7067c3d60ed1b52855e79aada62cd70157fe78cb2c7f7d93c6cc81c58498b8b6734f2dc420
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
deleted file mode 100644
index 4d31557be81d..000000000000
--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools multilib
-
-DESCRIPTION="a fancy but useless dockapp with moving blobs"
-HOMEPAGE="https://github.com/bbidulock/wmblob"
-SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
-
-src_prepare() {
-	sed -i \
-		-e "s|-O2|${CFLAGS}|g" \
-		-e "s|\$x_libraries|/usr/$(get_libdir)|" \
-		configure.ac || die
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
index 60206498e9ec..215c1fd29f0e 100644
--- a/x11-plugins/wmblob/wmblob-1.0.4.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmbutton/Manifest b/x11-plugins/wmbutton/Manifest
index abb94d277ec4..fe6e217bede2 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -1,8 +1,5 @@
 AUX sample.wmbutton 659 BLAKE2B 35aa7b2ed88b7a04d869ad1b6eb7ba807d25460aa7addb7e323567e09dca592878295488daee59cbf8d0e89c04ec3d440627ddf10774dbba51b3afcecc10219e SHA512 fc828740001b2280f49b916cd1fc803cb1d606d36a7fdeca0aafa9d892d377ed68eebb996efe7bb96eff6f5ea281e4431182e2831605f6167a39cb2be878063f
 AUX wmbutton-0.7.0-Makefile.patch 753 BLAKE2B 5dcf27655194b834f63f5c9dcc25ed3a3ccbe6d61b2f4db88444c168c54f206039b2c2065e45462d054fa376eaa062a6634f267b7629ea226b27681e80ac1b26 SHA512 f62306dfbba48a960a1e198f7c50a4e828405642d852dd543b4cf6ffd2e297266bac71c386d176a35c060dcc6f6c126a4af52a0f83772a4ebed1b55dbe880b8c
-DIST wmbutton-0.7.0.tar.gz 48381 BLAKE2B 051a6da83e575425aca44c88e3011e1c9413d2321ecf3d2387520270d4f5f23eb23df0526332d8913d9a5aaa5f813e5d179f8deca39b705d64687506d9e3da8b SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2
 DIST wmbutton-0.7.1.tar.gz 140293 BLAKE2B 55ab4926b833ae4e57e73cbd4e0fdb6177510099a140bd17d1378c31fe4f42a5fa35c1dbe58398412d465ceb99065a3c7a45a496dc3cb71d045edd879bd70f18 SHA512 61e846c2c7edf6375fdf7e86490ef80feab986b24ce83110283b7e336562a670142e326bfda24ddad832c563da0cb4bc2c3d7379e88e647954c6d93a4dcf6068
-DIST wmbutton-buttons.xpm 25003 BLAKE2B 84830b939cf22605977796ab756d03c110bae8e565eec2b75f479a5b19d9027851ef0178e170da34537b0725073f24544dc0f9c1c701f0f0089701bdfaffd87b SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c
-EBUILD wmbutton-0.7.0.ebuild 887 BLAKE2B e3eb678104beadca07744851347b5ca5566c007fc8e6fbf209669d122cf527d68556cd5e8a0cf3311d0b1ea0082d26afe75be449d7152d6b0a839e5da0a51f22 SHA512 80e0788d374244587175b8dff5268d58e27e1cc08c0a0b79a0a6af2ce24dc537c91737b4d24f62a9cb99ddc7a1971eabec27ebe3e43ba8ac669fc55f18b7cbc1
-EBUILD wmbutton-0.7.1.ebuild 468 BLAKE2B 22dad644f40abbae6bd0966b085560cf1438924121f902751c16f2842f479754443e6d622bb36543f00d077115b5e87b3f4a760b08b208c4ab0e356e55ab9619 SHA512 f50eb462507b287e1caabf836bc4c7f028081a2f44a5660907fca5e5f4bb45a0da8a7bec1e80ee601892373d8bcf05585c660835863fdff1ca3ddc1af83d1d12
+EBUILD wmbutton-0.7.1.ebuild 467 BLAKE2B ad97f18003b167381cf3a356830a2eed663022915ef9f72a89e52d0b4f174ac99ded48f13f00d3f4827b0b7422d302494e15f70b26904b25ffb1ac164f31ae32 SHA512 8fb65e5cc1e3efb5b431fbc40f56a3210a15a415d5cd0fbaa5fded87f4f9201fbc27d09528f4c16cfb2e8528df8ad247bb5abade05fdd38e1a90271db9fb08f2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
deleted file mode 100644
index 4a5bc61a5db6..000000000000
--- a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a dockapp application that displays nine configurable buttons"
-HOMEPAGE="https://www.dockapps.net/wmbutton"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz
-	branding? ( mirror://gentoo/${PN}-buttons.xpm )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="branding"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	use branding && cp "${DISTDIR}"/${PN}-buttons.xpm buttons.xpm
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-	use branding && dodoc "${FILESDIR}"/sample.wmbutton
-	use branding || dodoc sample.wmbutton
-}
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
index 9beb0fa72849..4a90d6d6e8a4 100644
--- a/x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
+++ b/x11-plugins/wmbutton/wmbutton-0.7.1.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="branding"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index 75117df95745..105b7a59bab1 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,4 +1,4 @@
 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-r3.ebuild 1265 BLAKE2B a0eac5c13fa6bb1526a8b0809c31039fa47586b7290eabd296c1e7aa116c8a34df7311b38667c749b66f9217f1159c1761779c0e8e68aceb3903d885a13dd3b2 SHA512 04f7f5226b460ef85380afc3b745d1551c69334e4471826b73352e4640e867b869ae2d067e81eed22c74cdb7ee3c1b1af9e9e2fa525b1bf7797bb4dfae320b46
+EBUILD wmdrawer-0.10.5-r3.ebuild 1197 BLAKE2B 24acc1b28d6b226790a3b9f4b5881e4de9b3201e5ad124e55249f65f664994e1b332433dd123b12c64e407e750d35c0dfacbf5434beff4edd75ea9016ddbc923 SHA512 f2018590a9a0d91e3da576daba013d6ee54e22fd19a0f42ee7221fbf71ef0800908923a3afc09b77befa591f282a57ed37b58be3a28b4328d4d5a0a10c9ad28f
 MISC metadata.xml 248 BLAKE2B 3bcf0ee104a13db738bdf65e81d29625755b774b02b80f25f9d3dc69527dcc7b866ebcc3816066aefe754b833106ac31a789ced1559af40f9f3fe674798eec75 SHA512 7c4fcd1eada270e859ab889e58c5c2cbe8359bc9cb90351c7245e2d211f8f62b5e27f355d2e311bf763062ad2ac9e885ac7f0c093bda0d20964bf67f6b712ed4
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
index 214c076d82cf..def55cb05f8c 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r3.ebuild
@@ -13,13 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="|| (
-				(
-					x11-libs/gdk-pixbuf:2[X]
-					>=x11-libs/gdk-pixbuf-2.42.0:2
-				)
-				<x11-libs/gdk-pixbuf-2.42.0:2[X]
-			)
+RDEPEND="x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index ae22999b1da1..6123ce3075c3 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,9 +1,5 @@
 AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8a3afc5d6142bf127cd17216a9843a6e5ce1913e5698bd6488ce1d009abfee20e25a9818c770dacbd55031ce SHA512 b79b3bfc92682e49ad2d45d97c21bb1d97d40db42de242049a6567507b9766e37a7f5f438ebe16b09b29ddca18391dfee8bba67888b817f71e1b9ce1da57f2f6
 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
-DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
-DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
-EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
-EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9
-EBUILD wmix-3.5.ebuild 465 BLAKE2B 02456642bd0df0a9a600774a4e1f70dbe42297406be6bac10a412d28dc6e12d2aaf1063c4ee494f57095820d8ba949e28c090ffdd2e427f50beb48aa708469e1 SHA512 d396802d7ffc74cc7ecbc0d40f205fb9bceb9406e2035ca256e33a69a89528b1df20862975f3e3446b9d8a7ef30624a8c375e138dda480f6baef5a57e91d3a47
+EBUILD wmix-3.5.ebuild 464 BLAKE2B 9b62dfdefe3e991b5f1a22a3a917efea9a4bbd62ce2b70b7f5f892ec3b71367f4ee0da61e78553746f12a861641a8175369b59aec668f23ec50a8227df1281d5 SHA512 b0db10b4390d024a7a4fb222bd0bd3e14c3b13281950b43230279a4e4b06e9d334a4cd95c58ee4ec72b7f9c67199cc00465b04109a089f9588e83cdbdd9f408b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
deleted file mode 100644
index 6164f74253cb..000000000000
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Dockapp mixer for OSS or ALSA"
-HOMEPAGE="https://www.dockapps.net/wmix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/dockapps
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman "${FILESDIR}"/${PN}.1
-	dodoc AUTHORS BUGS NEWS README sample.wmixrc
-}
diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild
deleted file mode 100644
index 5f69dde7b3ac..000000000000
--- a/x11-plugins/wmix/wmix-3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Dockapp mixer for OSS or ALSA"
-HOMEPAGE="https://www.dockapps.net/wmix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index 1853696d8c69..c0b6a38e180f 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.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="media-libs/alsa-lib
diff --git a/x11-plugins/wmmaiload/Manifest b/x11-plugins/wmmaiload/Manifest
index b17d42baf081..faa64dfedeef 100644
--- a/x11-plugins/wmmaiload/Manifest
+++ b/x11-plugins/wmmaiload/Manifest
@@ -1,7 +1,5 @@
 AUX wmmaiload-2.2.1-checkthread.patch 387 BLAKE2B 2c79203a230b8caa9cb3ff85443380843144318146c61750d4c7b7113df9ae51960541adc3d76cbfed412cf1dc7c91687a224f549cb898bcd0a7cb70926fc2cc SHA512 a2edea4c4c0beecd5fe764bf8a591a8367d76997bd747f0c2b11ed6f268f88d57aae0d0c0a085ab9b48c7eca42fe1d2fe3f5ea3246981d42868fedf2336da7d1
 AUX wmmaiload-2.2.1-gtk.patch 6148 BLAKE2B 082a2f93bde9fe08c227770789e1e1b54286f69506fb8208550c46f92a985f5a73854ffd96fb96d1026bf70a13180e0109fb5a4572e3d07fd8c9280412730efe SHA512 f0766111c10af4a3d658804f8fbf4a628df49947fad3f350e2399ae10ffeaf5083291759172155647e54b101dccc2dd66520483302d20f59557e57933564bcb6
-DIST wmmaiload-2.2.1.tar.gz 183538 BLAKE2B 5859051ca2040399d1cc3db863e89a1d779a22f9c47a171c11e5bfee6a835b03eaaaa7f47ef95ddc9cb29a24b914e84a4b448600a001959ab5471afa409ec646 SHA512 2f4cd4980feefb1022384880a57aea628d3e976dad7d1c838a23dbeb8bf86df6c061c14661bb562e36c51e2ca40d5f9ed3d465d9d26b9c7b9193fe448dbb9394
 DIST wmmaiload-2.3.0.tar.bz2 42852 BLAKE2B abee44716ff74e48a480881c3327bc4a4f02600044a587b3322429567a3454f01c733542fbaa42cb074a2da48ecd1c453d19ed42c30efc04e634c44330d729d3 SHA512 c4e63eb2868474e3b76f5f4f401bdd23172f23dfdb0e90712e3eca607494057e067805b83a53490d38b6f7b2c876e2ec8fdb1d95b871d3febeeda35369550de9
-EBUILD wmmaiload-2.2.1-r1.ebuild 1067 BLAKE2B 80def6a5e04b70b103f33ea42eddf7baf86237a8933ee6ba65d0f66670021ef48b91a5c74580f1b730e36d4774540f5d86176e97e7636b08503ba99376c359f1 SHA512 7e39a7833f6114e9d4b8da0995bd61c2f1defdeea5649728d9d81e2035d1f8d00ec41f1566853a7416b62eef6c0b6d3bd41a94e8e2d4ae1a962548944be76b63
-EBUILD wmmaiload-2.3.0-r1.ebuild 1114 BLAKE2B 30e0376578d019b240a9b5d3e1db64d0a1a37b13fd01ad86ca3914deb3a42dd6f1675266991aca78f335933f4800865f21a4d220b8684c3ba42bd1a1c56cf5a4 SHA512 d192ded9a4797a81ea1671e50b8598da7c99eadf6eec1e53e8d1ff8de7baa145043baa55a8b4d55f6cb48a5362e79f0e47f39114c70344c804ba9e97a81fca99
+EBUILD wmmaiload-2.3.0-r1.ebuild 1113 BLAKE2B a3cd913239de19f6a5ff5e14fb29eef7604b8b1905aa64032b8b327a73dad27a0c6d08eaac75c01cbd64f3b4f576d1e5694e5318bb9f825a182c1ee3e17ad9b9 SHA512 a72ed432d9bb9a1a74ef9d8871d41a6ce92a5afd44394a9b0c51f51b7ce0f85fcd450bac3858ef93c946b9852577d7dfc831eaf1e0b2e39b4f2305655995570d
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
deleted file mode 100644
index 322a9b74c0be..000000000000
--- a/x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="dockapp that monitors one or more mailboxes"
-HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
-SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gtk.patch \
-		"${FILESDIR}"/${P}-checkthread.patch
-	sed -i -e "s/-lssl/\0 -lcrypto/" wmmaiload/Init.make || die "sed failed"
-}
-
-src_configure() {
-	# The ./configure script is not autoconf based, therefore don't use econf:
-	./configure -p /usr || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		DEBUG_LDFLAGS="" \
-		LDFLAGS="${LDFLAGS}" \
-		DEBUG_CFLAGS=""
-}
-
-src_install() {
-	dobin ${PN}/${PN} ${PN}-config/${PN}-config
-	doman doc/*.1
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
-}
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
index 40f3b8d428ab..c0e09e894497 100644
--- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index 0251435cc968..85d86f9fda0f 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,4 +1,4 @@
 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-r2.ebuild 878 BLAKE2B 4e521ae507faec57b7ac767976be15839394e57c0ea3325d06935296f5482cc980e0801c66e5d62f491a7ebbc59ae6095f36d9590c1cc438ec0e4bdd9256ca4f SHA512 fe43232150cac2bf984563e398663afa4f1de3d4c1876fcd400650db76a9bde2c5f06d105dda2076cd693dd4b3ac246fcd1cb67bee4f177224622d810ea0529b
+EBUILD wmmenu-1.3-r2.ebuild 810 BLAKE2B f19a123b2a65e4c5a3e8a68c479130b97a20ddac7439855d3311c73354975438d33dabd37cc24f1a18522902e7d13d1d4a8d403209927d46a98ebe6f394e05fe SHA512 b9ee5bd8abf1d909e296843bed9d971a9ad448ab37addf8b1128bdc1ddc4153a43f1f3455ea7d88f005670b459b927ca699659469b091b4f43cb98cde835a2bf
 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 3cce437b9804..541f47f08c3e 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -12,13 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="|| (
-				(
-					x11-libs/gdk-pixbuf:2[X]
-					>=x11-libs/gdk-pixbuf-2.42.0:2
-				)
-				<x11-libs/gdk-pixbuf-2.42.0:2[X]
-			)
+RDEPEND="x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"