gentoo resync : 28.04.2019

20 files changed, 23 insertions, 142 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 937c3d96be39..d1e49ac5b590 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index d154af2935c1..5592d363beb1 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -2,7 +2,7 @@ AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de751303
 DIST enigmail-2.0.10.tar.gz 2608628 BLAKE2B da35fb3b79b8d4a8895ccc431d6990beab328db3dae9da17dab681f11cdd80af43f30ee52ea0d387820dde82256afa394525cd5d20471b6db4493060ff34fa96 SHA512 cca49c768b330767e23ede2258bcaf7693f37a81e651a7c8a7fbb9c0dad0d4d6383582a45b608cbfc234fe33e053c291ad9df01589214c58678da621235c7e33
 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
 DIST enigmail-2.0.9.tar.gz 2541100 BLAKE2B 0eb76f0da919135b0ea9bcb189251abb6eb9c288d26cabf3296427b10ca5b547a2e0c04468769e39f8306ac6831213a2d346915116e410c96a57a038d7c30055 SHA512 2053148b0e5e763dfc1f8decff0fea2a40ebd306e4844440bd9a3ced4e1f7ff2f16bccf72f85e73b7c51b40629489ad125b9bc166558e3b4144038ba45fcb197
-EBUILD enigmail-2.0.10.ebuild 2145 BLAKE2B 5a7640b571f4a9be40218ae67e6794efbdd751feac67fa9215038f33856c0e3446eccfd6e8163f89f200f5a02d3682c307f8a9ca4d6d30072b3e4fe7dbf00f6a SHA512 9d3c338a0c879a1243fc5676e0f6795dc6b83e3bbca5b954321686e0599a6a2f61ee0b153c986a0c156538907dc563443bc76425d4401d4911f4adb9a4ccb3ce
+EBUILD enigmail-2.0.10-r1.ebuild 2208 BLAKE2B b7b1e267f5d1e6df1ac62fe9970808fbbb31c5ee5f51e4ab120bf3db2f39e068cdc880b8cb2a6f6cbeb609977074704bff98ac399b6c2f037e5434078af6f207 SHA512 59c0d88dbcd18e911d96ff77408ce06bf461553d59acda252f1790cdc9675cd42233f1e74656b8ec7db7dcadd1ce75676cfc5ebb9594b87a9c2b2b7deadc1288
 EBUILD enigmail-2.0.8-r1.ebuild 2202 BLAKE2B 28a7d37cc47f3a13ce1e2fab227819fc63cb693d1e7d267e4dc41d1c56c8bbc7beb76c87fa48af2a747f965eb018a908cae8a1461814afaae7bb00566efde6c4 SHA512 c7d44cfff7042739a47c16629cdc657425d7f978dbd01f7254a4260e85d05e231a0e5c150bc96b6f5f1f328990020b5b0e5715f0b3e422b42a8dc586c58204a8
 EBUILD enigmail-2.0.9.ebuild 2206 BLAKE2B 286242ee5ba5a0cb00fd371da69dad0bbb3b71b18f2235a1989b2788a3a35dd5d0ff2b174178bae3e9b8e3703ecec23a24709d1b74da41868fe9f61298c8a780 SHA512 242bc8ba275030446053378e8e099278936f59757de4a2ff8b130c2464fd918402b4156e2720efae6a428169a67354f7c307dec3c4e112bc29bdd30759a08058
 EBUILD enigmail-9999.ebuild 2148 BLAKE2B 532d31b61db1afe4e693270121290ed89ba0c7b9147b5629ede083959708cde75e2f7cf12a2abca025d684d2065f83da3ebcc755f655aba558d741ffd5f60024 SHA512 47d7bf2c26ea8e27aba644cf893d72018e307800ab19029631f06e847768f2ef22061e98e0b43ae11fe2221f945cbf8f1b9896df6ad181493368d313081bda27
diff --git a/x11-plugins/enigmail/enigmail-2.0.10.ebuild b/x11-plugins/enigmail/enigmail-2.0.10-r1.ebuild
index cce103eab08b..3441befecb08 100644
--- a/x11-plugins/enigmail/enigmail-2.0.10.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.10-r1.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
+PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+
 src_compile() {
 	emake ipc public ui package lang stdlib
 	emake xpi
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index ce5bd7da47ee..27ee692e3ba0 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,5 +1,3 @@
-AUX pidgin-telegram-1.3.1-libressl.patch 769 BLAKE2B 0954d78f0fbe84db39e32da959988104182895b3393c8fa6630b12e1beb87b7ea588a6945aecde4e89117e9c4651a0ec4e8c89250c8e9a86cdcd45126eed18c0 SHA512 d493243498e536c5b4b5cf99613f8bbbe1195e6a5d15dd1b0ac5bbc914a13d02f33162207d2a5faa2de6816674b6b101047a54398d1cfebadb9587f61c7be30f
-DIST telegram-purple_1.3.1.orig.tar.gz 509083 BLAKE2B 5842fac81fa1cd9d2681fe5ac790f0be227dadc49d2031a1682da74f62ae163c7ee9d7bb8f421a974bb0d3ea135b1d44983c976b1afbb81758a3953e89f9c68a SHA512 3d088ea8b77aeba1d7f26dcd3223420bcd50372d610368b8786eca0cbdb0a11bcc2d93f7948348c5e0305479703f74e5b5ad8e06e782e2df119cfd73a4e4a63e
-EBUILD pidgin-telegram-1.3.1-r1.ebuild 1058 BLAKE2B e926b7b87df1ac3d907d7a468d38ee2cfb35451e8e7adcda3c7b8a111ffcc08dbd6e5105e865648a6a800a2b28dca96e64a69589c6f81810acc94c3d22eafa05 SHA512 d8a9d59c89582473643fc472e2794fe896438f59a33be38f2c7678310c077817ededfc3b0538f9ec492adddf78e1bf41be7016a73080734c3488e3d58abbafe9
-EBUILD pidgin-telegram-1.3.1-r2.ebuild 1172 BLAKE2B d91891b60ee464c9f0c9b65daa71b62568e053e6be64661431b4f0d2ee2bab00e50453ece6d68f2aae0524977ed59104818adb4fcaf7a83efaf0c8bc23ddad30 SHA512 a5cfd095ec93ebcc3c34c058ff2e4935c6dc679e13daa683aa29b9e6a304d67a6834a35d09f21d3681395b666d2b8c5de032efb58786602ab38ec6d2b75a3d81
+DIST telegram-purple_1.4.1.orig.tar.gz 482389 BLAKE2B 84c753c5dcdb8e66d1ec56d5307d3489780e932032f382e2d026ad4b6529d4c161e677483a794e56e6388cd76164d9b93955828f5cfc7b199ff8fa8314ad8951 SHA512 335da688021d2401122065f9089b86b6ccba6e812b06d8d8bc96e0defbbe693b35c1f981f5bf772ebc2577ab60ac7e97ce08d72361bcd17b27fc11740084ff1a
+EBUILD pidgin-telegram-1.4.1.ebuild 1127 BLAKE2B 73b5006fe0635ec92ca1ed433cc9711cd00e5c12d25d664b1bcaea2bdc14dec8ab79d05f57978c8ca5d2d76bae22a7204efdb4f4b6b07dde0862f309db0c3a36 SHA512 be3ac80389f72c0751018d31cea0f570fd20876f2fa177c79da30d16d325710f47df4b34edf7789e0b915a95ee7c12b2a1fe627b3b4c48a4c12fcd791b557f2d
 MISC metadata.xml 841 BLAKE2B 418d8799e7ed539b31cbe2a4db6ac744f9f6b72a23b1b4056e56efd91cbec160ee7af899eed2d9655a4a08aafea54b0065559b7286012fe5d57b45a80ab34a8e SHA512 7465ee52ba4461a1051acd37a2ebfcff479d92b1acdba5495a244d29126baed68d101355fc4b2a04bcb30be30bd9a581a8955a601a4d5644639750ea086350a6
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
deleted file mode 100644
index ca1ffee7cc4b..000000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ab594162a228bb5d79ba274859d4d2ab0eb7041 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Sat, 10 Nov 2018 10:15:19 +0200
-Subject: [PATCH] Fix LibreSSL <2.7.0 support
-
----
- tgl/crypto/rsa_pem_openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c
-index fe5cd9c..be657b3 100644
---- a/tgl/crypto/rsa_pem_openssl.c
-+++ b/tgl/crypto/rsa_pem_openssl.c
-@@ -31,7 +31,7 @@
- #include "meta.h"
- #include "rsa_pem.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.19.1
-
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
deleted file mode 100644
index ca6954389b7a..000000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="gcrypt +nls +webp"
-
-RDEPEND="
-	net-im/pidgin
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? ( dev-libs/openssl:0= )
-	nls? ( sys-devel/gettext )
-	webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/telegram-purple"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' to make it compile
-	find -name 'Makefile*' -exec sed -i -e 's/-Werror //'  {} + || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gcrypt)
-		$(use_enable nls translation)
-		$(use_enable webp libwebp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.1.ebuild
index 07eb0e85f55f..dd5f1391d74e 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
 HOMEPAGE="https://github.com/majn/telegram-purple"
@@ -19,13 +19,14 @@ RDEPEND="net-im/pidgin
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )
 	)
-	nls? ( sys-devel/gettext )
 	webp? ( media-libs/libwebp:= )"
 
-BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/telegram-purple"
 
diff --git a/x11-plugins/wmcpuload/Manifest b/x11-plugins/wmcpuload/Manifest
index 7c03322fcca0..a0e560088b19 100644
--- a/x11-plugins/wmcpuload/Manifest
+++ b/x11-plugins/wmcpuload/Manifest
@@ -1,5 +1,5 @@
 DIST wmcpuload-1.1.0pre5.tar.gz 121921 BLAKE2B 3a2c226782e432cf71fc8ae2897219e5a808f4fa02566cbbf48dcce703e105831e21bd3794b153e823ba1a8964e21bffe410681de97433216776ca45a2e8c183 SHA512 9f55609d2d2fde1ee1d02e06840c7769317d6bb5a49de30928d307b514ceb4d05875485a8708420f4a322cdbf1c4aa9d19ec081175a8aabc2f6b15e1a4bb5054
 DIST wmcpuload-1.1.1.tar.gz 167751 BLAKE2B e3e80edbf969a849798ee665e6d8f28a3869f4a6125e99f2e3793d9397574549c8462c53d835d2c18b6817e797bb89d1614a66d7fb84e3241b36ee947b38f0eb SHA512 7271a9216d52a8bc904be9ea401f52b35f0086da4bfc16c76a8348b58818199ecfcf8fb7768fe4d5a1e5cbb986e8d89a92f81f2f1aeea59f84d564607be73b6e
 EBUILD wmcpuload-1.1.0_pre5.ebuild 625 BLAKE2B c2c30507e7bd4756f2fdf1e68e69d2aa031923347e8a1a3cc28bc9a578487471b8eee8490826ce55db5745f909932f09c41aba4eb3d1eeefd67dc89fdd5f5295 SHA512 5fa740eac218192453eeb6014df37a62eec671ebe2141afa5518ba8930712fb66749490bf939e169958ab8c39f2ee7b6a6094bd24c340532b8495dd8cf6a71c3
-EBUILD wmcpuload-1.1.1.ebuild 522 BLAKE2B 86f0d23f520656526bb0af5b57180d8a456f37c82642b5c8a27d1dd98a7e24e623338fe0d29e31b21113e34a74b13327416a91e17499cf1e4b3dd6c1d4e3d787 SHA512 786bf7756dfa6a2b12aa07a2dffa1c575c096e9d5a0116a7de023d42da4efde9b810514bc3c5c576206adfd0b44de1f69201740b80e06bfdcf98db2297692c15
+EBUILD wmcpuload-1.1.1.ebuild 519 BLAKE2B cf9841b4196d21a0bb0e1271e715015550026f7113a46c6b6ea7333de6249d7a7cb9d5d3c137804e6899389dc577f804ec3f7e00f4fdc9f67274b244dbd12af6 SHA512 2cf6d7b80a1eab7dc7b618b324ac4a882c974ba92bd8eb66352c1d9ea74c64ead273e56550cb3d90835bc5e36a0f75f99010022baa6a1527c97ba28c1d5236f7
 MISC metadata.xml 755 BLAKE2B 99af546994519ef129f172dbb8cdfc99efaa25e68bc7030ec17d11e19482e2969bb158a1f953c4747f55913624890b437e4e86c50293b7869da104e27fc168b9 SHA512 bb53d6458b3d61d382e27c36dad9745ef6af4b9f6b9ea23178cbafe49abe74923a9e22c31786f111178f9cbf02048a2f2ca3f29e7f3a3f3cc63ae38ae9930c35
diff --git a/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild b/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
index e42d7a424a27..6f1af6e0c172 100644
--- a/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
+++ b/x11-plugins/wmcpuload/wmcpuload-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmmoonclock/Manifest b/x11-plugins/wmmoonclock/Manifest
index dfb717fe6468..1cc535fc8ea1 100644
--- a/x11-plugins/wmmoonclock/Manifest
+++ b/x11-plugins/wmmoonclock/Manifest
@@ -3,5 +3,5 @@ AUX wmmoonclock-1.27-makefile.patch 1056 BLAKE2B 77b018d13e30cd944373ff8d41cfae3
 DIST wmmoonclock-1.27.tar.gz 153080 BLAKE2B 9cafa3c53c18b73ab69e0c114d3dfb3424825cd1770c1ff6cc0ceb58ccc904865bc926196608873dc669f0fecf154bd80cded165a3267b32f30fa400e6cc1b71 SHA512 94c4b80882e1564780498e11e88ec31918605f64dd39f0c87544d29d9d8bc0db54823fd1fe5fbc992f212526a762de867598cb94236d18723d316bd04f5b097d
 DIST wmmoonclock-1.29.tar.gz 234991 BLAKE2B 7d38b4758d6bd4b78d069ae7d872c60f1a43a25fc424a51615ff0506d249bc0ee416cec9dc389ea27281f0b1eafa299bb126f0ea177334508ebb2b3542162162 SHA512 c36850034a0f3b7863ecfd03f73f91f9b935f645362cebeb33186873f700585d682dc5c35f3b5d67932afd3c5699fca56bf012e8f8a06615ff52c44a47ba552e
 EBUILD wmmoonclock-1.27-r1.ebuild 849 BLAKE2B 49b051d3fdec06da68c437df680b5c750feb2bbf3cd3a7998393b78cafeffcec6a5606cc8388a084a6ec9191b2cdc1afef3302818d999ab4e6af1d1156b034a6 SHA512 303b660900f9aab3c527b07a275e99f09068fd42be1664d664dc3d25754fce116f6a11923eb1267f26a2e273258d48e469a92906d3c74e0ec79877799ab07617
-EBUILD wmmoonclock-1.29.ebuild 462 BLAKE2B 5e865585d0c2e0f207309bae2ff5f33cfa0447fe0e883ea3d25401b2865b41e2e2cdb96c4aad76ed70a8cb3d83bebd99fc225309e06217d843e38bddd7e89e0a SHA512 af3b2c6f3e7366b4ea8b0832a2f40a01096a2f157a255351fe604ebec3fca5156e83cef7ec971dac741488b921a18bf79e8a363fe656baa632079dae74bf1282
+EBUILD wmmoonclock-1.29.ebuild 460 BLAKE2B 5f366495a7360c585399b1997721d16bb5cb6841dbfd5846c5b3f73898233f04a9d6a5d87dbddf554a8e461392eec5c6aeb1a6cd91616aa094b033df5d12062f SHA512 6c27394ed6250538287f12de339e4fe2e92660ba67419e846fef6883ea875d9f939a8ecb6404e111b5a0d048b6586135d27a011e6e168adad735b35849a105c1
 MISC metadata.xml 717 BLAKE2B e5c17235e51c6f1491c4b9005324c9f8d8a718bd4ded9dd8e7b314109c69c88cb7583a57d7023ccf7dd06a86da4d5980152b4fdde077d43f8bf633027b0ba4eb SHA512 8b4e39220460db02c6adc76d282fa041650b96af82c46f7f308e8afa098d3f016a5646079f48e37b3814d6e168f0468f4ce921225e28bb3fe2b0ab5832a76a1f
diff --git a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
index 6fdf31a18417..0345f7cf9a51 100644
--- a/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
+++ b/x11-plugins/wmmoonclock/wmmoonclock-1.29.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmpeople/Manifest b/x11-plugins/wmpeople/Manifest
deleted file mode 100644
index 6468c05e0e3d..000000000000
--- a/x11-plugins/wmpeople/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wmpeople-1.3.tar.gz 111148 BLAKE2B 6a3fbfa8d4d47d6a80da7eaaaf07dbc269c529bba20bde9e229b415a54c8dd016f9fbbd021dcf9e9788d5d22f62f58bd8a2e745cd5e1014cb52cad7e06d54104 SHA512 af01e2d43d158eab3d520ebb0b9ebd50e1b5955920e3b86d5238d9bc0313cc055001bfa44d76e1ccfe721f668b9494373f18175f2ef7d248a0e237bbefe9e129
-EBUILD wmpeople-1.3-r1.ebuild 757 BLAKE2B fe6d7bf88e39992f4349e5365684110efff68ee177f6281ba5ab68ec03ab28d8d73bed6687d551591c74fd8b58b45e21f6a6b2531afde6cbc2bf431cade27ad1 SHA512 b162b1663157b52e870a6b2638e73d15012cf0698436498bf35844cda0beb427f440e2acad85165d95b0ed330d7942e4149fee487df76cc41e6aed89d7095055
-MISC metadata.xml 330 BLAKE2B b6738c078f6ef15476ae01b2ce8f8a792a26e5c5bc2d79cd26ce3d76678bf9a8a3b5638592a8c95360c9a438bc2eeace80b149ee9d10fb86501dfb6ee01aed94 SHA512 2f1848b2c96ef0957292045ad958b252910c8f3a29428e72f8131659575f095bbd18e8a594ac9bff21c2634d86556894b0fadd9b7f9d7990f637da2f30f0320a
diff --git a/x11-plugins/wmpeople/metadata.xml b/x11-plugins/wmpeople/metadata.xml
deleted file mode 100644
index e001cb9cfa03..000000000000
--- a/x11-plugins/wmpeople/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">peephole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild b/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild
deleted file mode 100644
index 2441c69f293a..000000000000
--- a/x11-plugins/wmpeople/wmpeople-1.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Nice, highly configurable WMaker DockApp that monitors your mail boxes"
-HOMEPAGE="http://peephole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/peephole/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	>=net-mail/peephole-1.2"
-
-pkg_postinst() {
-	einfo "Before you can use wmpeople you must copy"
-	einfo "/etc/skel/.wmpeoplerc to your home dir"
-	einfo "and edit it to suit your needs."
-	einfo "Also, make sure that the peephole daemon"
-	einfo "is up and running before you start wmpeople."
-}
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
index e8761b4d0675..4c51aac3ee75 100644
--- a/x11-plugins/wmpinboard/Manifest
+++ b/x11-plugins/wmpinboard/Manifest
@@ -1,6 +1,6 @@
 AUX wmpinboard-1.0-segfault.patch 320 BLAKE2B 16061622af33f12fb19f027a003a2f7a05c203005a101603bed4cda2112d7a9fd3b9c9a95c1ea9d79075256890abd9c7ac82ff769ff6aaa2de2e52436e4008a0 SHA512 2dffff646c53dce2815bfd145434b393c1735c66bf5abf9e8c7a476b4adc99143dd02cfff835c232ef549882499793b92ebd5bdc2a76f388478111d791c6bfea
 DIST wmpinboard-1.0.1.tar.gz 195782 BLAKE2B f88368b61645c91958d81161e9f5e8523d09b7ef825476afebb2b4318c8cf04f11319b3eaf9b152fe97a4dea2dac6147e9b70eb70cd9cddbc1f45960df6529e5 SHA512 5728aa8a040ba81a814a0851f5bed2d5fbf933b400bdafd2b92deef8eb35d62a050293bdb98d71c6a8db058223e5ae64de932dcf971fd244aea8f48f8832aa36
 DIST wmpinboard-1.0.tar.gz 133290 BLAKE2B 06ed6c09d12556adf8af9a69c86ae6e60450cc6dfd3e9d0b45bf8650c057fdf54434280b36822965d5f0c0586956a84098285aa0a976090a83fd9077ada481a0 SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd
-EBUILD wmpinboard-1.0.1.ebuild 494 BLAKE2B 851adf3df64d460cacce1128c406024c47aa90b31ecf960dc00cb5a3902efe3407b54fad275a17e0751158ead6fea39aa831c71c602d590fe5c74fff0896e20f SHA512 d601a1cc6f23889c7de7e6afbca7e83bc6bbdd348c59c9fc2a4179904bdbfa73961684f3c8b9aa31586c2f4e9a55a8cf6e3011e6a686286079a179e129cc96e3
+EBUILD wmpinboard-1.0.1.ebuild 492 BLAKE2B 7f4a990c46d65beceb7a2709b35903d8d0d42cff624aee02fa40b80877b8412563faef9abf051e0d48af6efbe4259681735ab6b4640f77b88cf97e58eec2d866 SHA512 8fb00fac97abc6be3b8ced51fb4791a74d233eb3dc8a552e987117fdfc3072d511318fc19e780e2da6adb0b6f32876b3066ba2f192f61b175d48c0a265e6086f
 EBUILD wmpinboard-1.0.ebuild 659 BLAKE2B 4f06ef3ebb05fe25a36bd42d50c73eea6ee9c7bc3d63933cfd60b4a9a78382888ef65028911ffe9837b6d9f9e8eccd347bde5ec21bceb5a3e72ae520d3183634 SHA512 7d8ba3dd2cc36716a729f37373ff0a5152ffc5588ca842c7e84c6e24f217ff816ce55ae4ee3babec5e3e393bb72cc3b84985bbcf023bc64926b37ffdf2670c78
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
index 7e3dc396cfb4..b5ae0445d4c4 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
index cf8ab5477a5c..137309791ee8 100644
--- a/x11-plugins/wmstickynotes/Manifest
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -1,4 +1,4 @@
 AUX wmstickynotes-0.2-gold.patch 936 BLAKE2B 73720102f99d3dd2142678f5c5ce3051081f12aac36d0935fae94ecfd8dfb385a2faa3767bf226348691f967a3e77cc52e4e5e3a4f1c772eb80d476bc9d3be49 SHA512 ef17d30f9057dfde9dea18e2ceab04ef36956d5561af3884cf2ad5ca133c0ad164b2f857564d5db1d2cf65785cf91e4fb7791fad22b703f0d60ae695fefe4d96
 DIST wmstickynotes-0.2.tar.gz 107432 BLAKE2B 2164c351adc723caa22689cbec277554b4adc1d73dce67b52f3ba30ce14a6cc70c39762ae6eb00f2d51b4c365738edfe5713580aa1c30d9256cf112efe579a4b SHA512 59e54e64157a04296f12c1c8c224c5c4b05685f2f0e05abe2a23a1c2137c0656c30e7befc4e5a39b4cb97f99e2ff68f53173cf6456b95f3fef80441661d19b63
-EBUILD wmstickynotes-0.2.ebuild 465 BLAKE2B 6980fa43d734f6558d6552eb9981a9636d71e5c5cd7d3f6c345555efcfafe5479ae832362166e53ef1ad18ae50123a52133f4f8cb1935756ec172e03967f9323 SHA512 b54efda5a3ec54ea17fb827fe2f6a507f298c755c5f3821aa70a6c6604ca63dd49973b3a5d08a4d191b9aefec08693b917df0760de85b434709bc4298630a990
+EBUILD wmstickynotes-0.2-r1.ebuild 434 BLAKE2B e9f5263336330f5c247182603fd54d16b90269e012343fbbff5dfc17778fe3e0e0deae7e667a484fd286bf92671cca0371d14a8c10cb0edd7a76d8cc9aead562 SHA512 e10014ad8e530b2c6a3710c466171abe53920cc483cb520e846c15c57f7bf56dd782e4729ed2bf9bde0643eb007739b75bf813d49f325dfc3d4ad79b9ce9048e
 MISC metadata.xml 250 BLAKE2B 5c9284e42091ba8f046e7cddda959f1b2ccadcd5a40d8ca9fad678eeff8f1581efc19be860f006d983463c0e782dc9168fc38068fbcaaaac250f1f65e5f3fa1c SHA512 420837cc3889fa0536104e9813d3c0dacb9dfe3a62aa44739e4eaf48c3955b2d2fb356ce1a476a2543fd12b24f141a3f633c8600422eb064fc1e457ba5b77c37
diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.2.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
index 4ebbce8e36b5..61bae078ca75 100644
--- a/x11-plugins/wmstickynotes/wmstickynotes-0.2.ebuild
+++ b/x11-plugins/wmstickynotes/wmstickynotes-0.2-r1.ebuild
@@ -1,22 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A dockapp for keeping small notes around on the desktop"
-HOMEPAGE="http://wmstickynotes.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="x11-libs/gtk+:2"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gold.patch )
diff --git a/x11-plugins/wmweather/Manifest b/x11-plugins/wmweather/Manifest
index 9e64ef507fdb..f082814cccb9 100644
--- a/x11-plugins/wmweather/Manifest
+++ b/x11-plugins/wmweather/Manifest
@@ -3,5 +3,5 @@ DIST wmweather_2.4.6.orig.tar.gz 86672 BLAKE2B 8b63c4aad9c6d7fbbe4f132471abeeda0
 DIST wmweather_2.4.7.orig.tar.gz 86220 BLAKE2B 55eeab40bb4cdb30d8e82b801728e7d0b8a32f741769e098b6d61ba087af27ed8401391853f53e7f06e616d5a99e6f38714c438b9e66765c1159c07f6d324d12 SHA512 d9d0c46e85a24aaa278aa75e0fcd51fc417c3c094d9e69c5820a288955c3ebdde21a24b26964824d9275a41ec053e3d942b185b24088d806e033e311e6e09108
 EBUILD wmweather-2.4.4.ebuild 688 BLAKE2B d613244b926eff1e135c88d4d2e2a918bd5dc849198b74febfb2db347aea13291bbc6a28b773f01422d57c21799d33104fa729cd3016d93825fc19c08fe47845 SHA512 67d49b323469021117f8d7c42801cf8b463f9ef394c4bb5330f412ee116b2c11dd672fa08fe10873396b4056f4da122e4f81c6eaeac5284b8d4ec17fe38b8bcb
 EBUILD wmweather-2.4.6.ebuild 650 BLAKE2B 36bb43a90299b9aa7e17251ec53fdf1bea2c599ae20c4ee53827000c68d963570dcbab79765329a0d7ebba0627a7fcfa8b1f60fab0cc10b94d0f0cd25a3b1e8a SHA512 471b6f77d7c251fa916faaf84506f397462a7576b32960439edd10eb7a18df109301934f6ee56d54984ca1c3be4f3f31f60e36b6b1e3804f180d4c4cc2202469
-EBUILD wmweather-2.4.7.ebuild 649 BLAKE2B e0c80259e9743f1ee17b532607ba3e796343018e8ea577aa3e3668c23dae60cf5f1a1973bf8d405fd84fa1b899c2021aab5b3d33f6bd5a66b458552475535c3f SHA512 0ac32eadc4fa024baa7629473a34a030fa2cc4f4b2a3ada8116da1814adecfb7169787eea7f1892f6bc43675a3821c82e5c91c4738fa4ed0b7183ff2c0fd4fd3
+EBUILD wmweather-2.4.7.ebuild 646 BLAKE2B 49a6a943af7d5d92af2087d59fdf7ae6d44ac741a0dad0a6c1bac7735e200d74e72de0f7379318fdbce1a6be3cb27d2de08ed8a70556f315c2e0851b4bd9a987 SHA512 11e33bcd29d921cb52ac7f293358cdf867534914b09b3ee3e6c7fe03a3221138b090daf406c64888ce4007ad42df111109670ec3c6282e8bf19861d40208db8d
 MISC metadata.xml 624 BLAKE2B 749ad41f486ac2c7dda230ecb730bd4ed85f8ae0af9c255a5d0a9ef73b10aacd4bc6d22287c4be755a441294fc7e986dfaba26d02fea1ca43e1380e5793c40a6 SHA512 67438cee5e0e29f3519357fff49a638a78782c854b78fa10a9a5b2f1b079ae08d053963b49033187655a4830c63d38bdb5682bebdb3f1de15a640be15f8a0e92
diff --git a/x11-plugins/wmweather/wmweather-2.4.7.ebuild b/x11-plugins/wmweather/wmweather-2.4.7.ebuild
index f30f0310edb3..2109007a6f6d 100644
--- a/x11-plugins/wmweather/wmweather-2.4.7.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11