gentoo resync : 18.11.2018

28 files changed, 224 insertions, 149 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 5b83188df3ed..2a61ea4c6d78 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 70259999fd45..c4c7229678cf 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,4 +1,6 @@
+AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
+EBUILD enigmail-2.0.8-r1.ebuild 2206 BLAKE2B 286242ee5ba5a0cb00fd371da69dad0bbb3b71b18f2235a1989b2788a3a35dd5d0ff2b174178bae3e9b8e3703ecec23a24709d1b74da41868fe9f61298c8a780 SHA512 242bc8ba275030446053378e8e099278936f59757de4a2ff8b130c2464fd918402b4156e2720efae6a428169a67354f7c307dec3c4e112bc29bdd30759a08058
 EBUILD enigmail-2.0.8.ebuild 2144 BLAKE2B 9eb9bffaccac6d4f95191c86a0318b81a206f2ece0c3a85035b738944f7222a4118b3b7a220635e3feee1bdd402fc75c5f9b6525f1602826c41055925126f5c5 SHA512 298973dc1ea6659cea0acbf368ec3c86d2f558fafdfae3332402b7a43be93a88698ee3bd80aeb99438062f1359d5849208d82c37962298dab376aa1ae94807be
 EBUILD enigmail-9999.ebuild 2148 BLAKE2B 532d31b61db1afe4e693270121290ed89ba0c7b9147b5629ede083959708cde75e2f7cf12a2abca025d684d2065f83da3ebcc755f655aba558d741ffd5f60024 SHA512 47d7bf2c26ea8e27aba644cf893d72018e307800ab19029631f06e847768f2ef22061e98e0b43ae11fe2221f945cbf8f1b9896df6ad181493368d313081bda27
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..e716fbf703a6
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-no_pEp_auto_download.patch"
+)
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch
new file mode 100644
index 000000000000..086e00e649ae
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-no_pEp_auto_download.patch
@@ -0,0 +1,33 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Wed, 7 Mar 2018 11:31:50 +0100
+Subject: Avoid auto-download of pEpEngine (Closes: #891882)
+
+When pEpEngine is available in debian, enigmail should Depend: or
+Recommend: it.  In the meantime, we should disable auto-download of
+the pEp engine and prefer enigmail.
+---
+ package/prefs/defaultPrefs.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/prefs/defaultPrefs.js b/package/prefs/defaultPrefs.js
+index a1f031e..10f2c25 100755
+--- a/package/prefs/defaultPrefs.js
++++ b/package/prefs/defaultPrefs.js
+@@ -14,7 +14,7 @@
+ // 0: force using Enigmail
+ // 1: automatic mode (use pEp if Enigmail and S/MIME are not configured for any identity)
+ // 2: force using pEp
+-pref("extensions.enigmail.juniorMode", 1);
++pref("extensions.enigmail.juniorMode", 0);
+ 
+ // the last configured Enigmail version
+ pref("extensions.enigmail.configuredVersion", "");
+@@ -204,7 +204,7 @@ pref("extensions.enigmail.warnDownloadContactKeys", true);
+ pref("extensions.enigmail.wrapHtmlBeforeSend", true);
+ 
+ // automatically download pepmda if it is available (without askin user)
+-pref("extensions.enigmail.pEpAutoDownload", true);
++pref("extensions.enigmail.pEpAutoDownload", false);
+ 
+ // holds the last result of the last check for pEp updates
+ pref("extensions.enigmail.pEpLastUpdate", 0);
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index 425dbcc9cc08..96a1655889e0 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,3 +1,3 @@
 DIST telegram-purple_1.3.1.orig.tar.gz 509083 BLAKE2B 5842fac81fa1cd9d2681fe5ac790f0be227dadc49d2031a1682da74f62ae163c7ee9d7bb8f421a974bb0d3ea135b1d44983c976b1afbb81758a3953e89f9c68a SHA512 3d088ea8b77aeba1d7f26dcd3223420bcd50372d610368b8786eca0cbdb0a11bcc2d93f7948348c5e0305479703f74e5b5ad8e06e782e2df119cfd73a4e4a63e
-EBUILD pidgin-telegram-1.3.1.ebuild 1117 BLAKE2B e0a7043249640c11c117822c1e1a019bdb0655bc1ad29d3063dd2bb2ba8d9c123b53d162d1840482fc325489c3435eb89f12666398a74938cd78240f62ec7fc6 SHA512 2337b8ebe509a281ade569fad0e8307dd657a6c7afbb5adb7eed983ad11a7917352041bb9d71a59ed03337cd618dc320f65417ab8a8bb38dbe0dc6b24c41bf35
-MISC metadata.xml 688 BLAKE2B 516c934c562bb806a075bccc91c11cb8dfa6c7b914f1e35292135d96d6ea033486d077ef197ee49eda0c5851f6999badd2b542b5056e1f34f3a916c78012341d SHA512 6cb1f3fdcd8ad4acaa7f9263c651204c261863b45403d7b51f25bc56527d9008f8ba2393bdaea989cf20fcce31e93c632bc400b258f9d7d24065b5de19eaf5c8
+EBUILD pidgin-telegram-1.3.1-r1.ebuild 1058 BLAKE2B e926b7b87df1ac3d907d7a468d38ee2cfb35451e8e7adcda3c7b8a111ffcc08dbd6e5105e865648a6a800a2b28dca96e64a69589c6f81810acc94c3d22eafa05 SHA512 d8a9d59c89582473643fc472e2794fe896438f59a33be38f2c7678310c077817ededfc3b0538f9ec492adddf78e1bf41be7016a73080734c3488e3d58abbafe9
+MISC metadata.xml 841 BLAKE2B 418d8799e7ed539b31cbe2a4db6ac744f9f6b72a23b1b4056e56efd91cbec160ee7af899eed2d9655a4a08aafea54b0065559b7286012fe5d57b45a80ab34a8e SHA512 7465ee52ba4461a1051acd37a2ebfcff479d92b1acdba5495a244d29126baed68d101355fc4b2a04bcb30be30bd9a581a8955a601a4d5644639750ea086350a6
diff --git a/x11-plugins/pidgin-telegram/metadata.xml b/x11-plugins/pidgin-telegram/metadata.xml
index c8fb36cb1a77..e23b905712c1 100644
--- a/x11-plugins/pidgin-telegram/metadata.xml
+++ b/x11-plugins/pidgin-telegram/metadata.xml
@@ -14,6 +14,10 @@
 		which can be used directly in net-im/pidgin.
 		Telegram is a cloud-based instant messaging and voice over IP service.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/majn/telegram-purple/issues</bugs-to>
+		<remote-id type="github">majn/telegram-purple</remote-id>
+	</upstream>
 	<use>
 		<flag name="gcrypt">Use dev-libs/libgcrypt instead of dev-libs/openssl.</flag>
 	</use>
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
index 8292344ef651..ca6954389b7a 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
 HOMEPAGE="https://github.com/majn/telegram-purple"
@@ -10,20 +10,21 @@ SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegr
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="gcrypt libressl +nls +webp"
+IUSE="gcrypt +nls +webp"
 
-RDEPEND="net-im/pidgin
+RDEPEND="
+	net-im/pidgin
 	sys-libs/zlib:=
 	gcrypt? ( dev-libs/libgcrypt:0= )
-	!gcrypt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	!gcrypt? ( dev-libs/openssl:0= )
 	nls? ( sys-devel/gettext )
-	webp? ( media-libs/libwebp:= )"
+	webp? ( media-libs/libwebp:= )
+"
 
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/telegram-purple"
 
diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest
index 9a1c703f7362..5e43f9982ca2 100644
--- a/x11-plugins/purple-hangouts/Manifest
+++ b/x11-plugins/purple-hangouts/Manifest
@@ -1,7 +1,8 @@
-DIST purple-hangouts-0_p20170209.tar.gz 144521 BLAKE2B 09b7b733f83f69df172a4fe9893dc74666f9eeba0a7b73b5b46a8c20edeef75c84f9ceeddd17cd22590dfdd9f28a7880c4b7d8c97fb98d22484d6f8becfffce6 SHA512 aa5dda98e122cfdd7917b71c6f9e9322c9e8d4bf01b57569406004a7b0f0819b8170ef553088339a08a3932ff1e467a1779ec17acacc7f83af709e0596956d4c
 DIST purple-hangouts-0_p20170714.tar.gz 145914 BLAKE2B cb932c7c31bffe98c62b2ce77b39a2262689d59676f51d66b3c6cfe31a3319226d429ee241e37985c836389809089c633f7a04152659eb88195372259281465b SHA512 4b14eccd2140c98c88b5fb2bed6039306454484dc23c359b7860bc55997161bc8f5bbf1cb1939041bca40e98dd30afd224508903993031ee10dfb38b088d891e
 DIST purple-hangouts-0_p20180328.tar.gz 149992 BLAKE2B a9db51f236859806625ecaa70a18a39584278cd7865a3212355d4f88dd5a5d3da589ebc9a26ca24f5e3190ea37748251525b4f44e15124109f8902ed573bf127 SHA512 f20d3e7625d7d617c50a911a758af9131cee4d02f948db3f396e0241c0d556dd65070aff2f7f5f1db56e61a9e91975fed420d7d17e0c7c80f1714cab08e342c5
-EBUILD purple-hangouts-0_p20170209.ebuild 1015 BLAKE2B a3fcd6c45af0492d1233147da2409609897a1d85d37fa11eeb43370e0481bdb5e7376a8c1f6924448b34f0f5133bb0280a7379e9f170a4ba9e50970cf2938f06 SHA512 09f723c5e6a72596ee4e1a231928ad1a9edb0bc021cf09f3367449332240c28ed58a759bb244f3acbacfb2e969e0b50bab1c02570584297176a1bd763a20c640
+DIST purple-hangouts-0_p20181024.tar.gz 150600 BLAKE2B 4dc9b689642b73d242d89f780188d581aac2524665048ef2c35606b2d15a852e6ef111238d1f7a3c65895555d8169c96a7158767ec2a6fa5fb6645fc3f5260eb SHA512 e1200845e64f20aef1b75bd8d7a128fa6b1fe2b731c7d83db876900e2bac988007f04d59996c86c78190770186210401af5a51e0ed490c0027a0933445ce125b
 EBUILD purple-hangouts-0_p20170714.ebuild 1011 BLAKE2B b568a827ca99e1e42ec3f28fffb5da7d96828bb84cd3e3434f40571555d747a7b3c6adde943e79293e358da4fedf19ba515b133d47a7a273df4c633e73bb5ab5 SHA512 d1282849c7c6840194a0b54535a81682bcd130ca472681ec19afe8f8f29da37fd24078545ace929b47a67bdb8f20a2c75b5e8d63dad3d1dfa4228aade76bccd1
 EBUILD purple-hangouts-0_p20180328.ebuild 1011 BLAKE2B fcdfa1998875f84f706e096b0aeaf7417ae0e36be53de0f60228e8935e1f2a6235d4dc6c6d68370bbcb2c5e3fba2a3ffc3e6d47b75aa6acb3328d3eb5d83e5ef SHA512 9391ccf695bf4656f03ed64ca065069f90b0145fb2243cfd0e212b2d70ca80e5f6ba0fafe78f9ded0f66cd628de67f7a6d89f2a1ce1be332d986570f4409be14
-MISC metadata.xml 264 BLAKE2B 85dada98abdefab04b759e2d9b9283f0e7ce51004efd5b11459b53ceed2465a864668d9a6b4f458039c4c7be75105170993d6bcb5fd026386ef00dc20b08e917 SHA512 c34e7ca664e98ccc80b9980da675d09b6752b0497f3dbaa707a7ccf5d7033cd54194cda48767de3a1be912378d2117e2c7c20acc618aab3e9659372dea0643ce
+EBUILD purple-hangouts-0_p20181024.ebuild 1008 BLAKE2B 3af6f001904d98317e37f11d861225faae819134a5756f591feb2d77a5ccc0cd94be0243bf3bfb9f46322983f541992b475230474d659d42311dcc636594e82c SHA512 63bac60236a9c49da137b07f471d962ee46f1d0d74921d11c53809769b56f15639ab7b3b2b442e28a3636523df5faa758998d235f030d1dfdebfd2b817dd85b4
+EBUILD purple-hangouts-9999.ebuild 774 BLAKE2B 56b0a07005c10b7eaf5f3170e09029bb2808d485cc78a62ceeb19ddf326274ad4b8dbea2580f5fdfcd9271698bcadf72f561690d62f39f2a8c326ea3ffa30c76 SHA512 ab0625e350dbfd97ac1c0603ad8eb663657af7b6cdc2caa11c86429c6c2d820230cfcb9fe4c9aa4b3cb1e6ad1bd0dde8793e676fd03ba07271d5a6974957123f
+MISC metadata.xml 463 BLAKE2B 558c5baffa16e75ac65c79d77a024e9ad3efdd2ec18a5e1027b59e4bc64cd86ff41d459cf0a019d0e3f202b863566c5eb502fe49ff3438585976a4993f183b00 SHA512 8208ce706b102de7a1565b817805f010964831387cb685499ca6e78cd0a46eb2deb97ac69b51d7c71c9bb455de5d1feaec6f51a30f6bb68299533af538138482
diff --git a/x11-plugins/purple-hangouts/metadata.xml b/x11-plugins/purple-hangouts/metadata.xml
index 03d729b8c798..a6fcf93cf0b8 100644
--- a/x11-plugins/purple-hangouts/metadata.xml
+++ b/x11-plugins/purple-hangouts/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>stefan.strogin@gmail.com</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">EionRobb/purple-hangouts</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20170209.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
index afcc47e83831..3954afa7a3b2 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20170209.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181024.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
 else
-	COMMIT_ID="b7c56354ba8e"
+	COMMIT_ID="a044363c1883"
 	SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
 
 	# Does not respect CFLAGS
 	sed -i Makefile -e 's/-g -ggdb//g' || die
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
new file mode 100644
index 000000000000..2a8db6f38b1d
--- /dev/null
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs mercurial
+
+DESCRIPTION="Hangouts Plugin for libpurple"
+HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts"
+EHG_REPO_URI="https://bitbucket.org/EionRobb/purple-hangouts"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/protobuf-c:=
+	net-im/pidgin
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Does not respect CFLAGS
+	sed -i Makefile -e 's/-g -ggdb//g' || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		DESTDIR="${ED}" \
+		install
+
+	einstalldocs
+}
diff --git a/x11-plugins/wmCalClock/Manifest b/x11-plugins/wmCalClock/Manifest
index 0ea623b009e1..64d3187cf247 100644
--- a/x11-plugins/wmCalClock/Manifest
+++ b/x11-plugins/wmCalClock/Manifest
@@ -1,5 +1,4 @@
 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 693 BLAKE2B d38e69dfc786df9d2d1ba6c7229d08748638c403eef25f731b0267caddb63e6fab798bdbc9bb4c586611995830f4a251828d0bd543cb1b6bde2ff0c7b25d036c SHA512 01ff03edecb79bb0543b8d114e4b6700359b7358c504d1615c5263984bd617e8b976185133fd78c278a7004ff76eec791de44273738343752d65a13fc386db72
+EBUILD wmCalClock-1.25-r3.ebuild 689 BLAKE2B 1f2d911653120c9fd463e222dd9689d94913f046e38b74e4482c1a68ae9d630b08734464d4e3ade4f016610d61cad84480918502acd85c5ce93b0535f19a4a5e SHA512 69528315f774ef2fb528ee9a168248e220ab1878e3ecf60975d034168f4f5d90355b09a6711aa9b3aebc8940455c4fa435c0f326fb0e93bbd8754521739e13ec
 MISC metadata.xml 476 BLAKE2B 743b22ba315a1e4f01909148a31b652ff649a05bed840f8c2a2a2c69ddc45afc32b5604083ec9e5c623621291a7603b66c5e0153e782fce98353c513655f049d SHA512 2281d53175fc5377c916eed033127c71d17b572982fb0c0c9264349866f9c0cc784771fb9d34b7542972b623e784c4bb76c0c4524db160884ad1d1e08e29aa43
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r2.ebuild
deleted file mode 100644
index c78e78b51b63..000000000000
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r2.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 multilib toolchain-funcs
-
-DESCRIPTION="WMaker DockApp: A Calendar clock with antialiased text"
-HOMEPAGE="https://www.dockapps.net/wmcalclock"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${P}/Src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc ../{BUGS,CHANGES,HINTS,README,TODO}
-}
diff --git a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
index a59a7b2e157f..5acbd4856b4b 100644
--- a/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
+++ b/x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/wmappl/Manifest b/x11-plugins/wmappl/Manifest
index 941b972c0b66..2e4906eaff2c 100644
--- a/x11-plugins/wmappl/Manifest
+++ b/x11-plugins/wmappl/Manifest
@@ -1,4 +1,3 @@
 DIST wmappl-0.71.tar.gz 139219 BLAKE2B 0c28182608e446f1d65441ba57a86105a745b374b9e54c84d52bee58876097b83520a33a7413358ccf0d687696cee11541cbf6536c42442f85b64aae6e70b451 SHA512 dbcf1441960fd22b5436515c28c6870ff8400cfbe0b2aa4129ff1eaad6faeb5e0a3500b4c6f19b6ce3ea3dc8b52bc38a6fc591b93e6cb12e13d8447c3eb371d2
-EBUILD wmappl-0.71-r1.ebuild 454 BLAKE2B c3d78b53d57234c2ce6d616322b65fd30b95dd78ce2ffa5f954f01f24d2bcbc98cebc288f970abff74a4f3e2909f6594494ed5c1f9772a0c0d3155dbc0f7abe0 SHA512 55814ec0a138dcd920a10c51fc679523a266df88ea41ceaedda953eb518ce1642d8f9b85dbc6ef89fcf1794d71fb65bfbe1cc617c6928d4edddd84e3fa678caf
-EBUILD wmappl-0.71.ebuild 630 BLAKE2B 89fbc2aa192b7315cbf35ab1b36d2543c3ec47b7a74f1633d426110372afa3ac27e7067bd5dd1d3eebf53aa0cb64313a31b01f331f6ca26f3a382079fa9c5eb6 SHA512 8683f32b6a8131233b54651a56347db2f466428fadc20b26f119798281c2ac39b7c0abd0a16fe81faf1d09a0836ac23091742f9521c62a62bf074212a1537319
+EBUILD wmappl-0.71-r1.ebuild 450 BLAKE2B 20a01900d0fc019c3657f0ae92a2a405aa39c80e9539e61fd74e32d3eadeed23d1f0bf7be4c684ef883ee9109a5949f8cd3220d61fc88b3a61eead084244f7e1 SHA512 9c22b03b295a678f188a57ad98c8196a563d0237c65fce0e6e5994e23928e8f166ba7c45cdde2ff40871b09d281566d7a0a595871de531bb445870af400900c9
 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 2c9782c0d49d..58df593547ac 100644
--- a/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
+++ b/x11-plugins/wmappl/wmappl-0.71-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,4 +16,4 @@ DEPEND="${RDEPEND}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
diff --git a/x11-plugins/wmappl/wmappl-0.71.ebuild b/x11-plugins/wmappl/wmappl-0.71.ebuild
deleted file mode 100644
index bbd0ab35203d..000000000000
--- a/x11-plugins/wmappl/wmappl-0.71.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-DESCRIPTION="Simple application launcher for the Window Maker dock"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.dockapps.net/wmappl"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
-
-src_compile() {
-	econf || die "Configuration failed"
-	emake || die "Compilation failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "Installation failed"
-}
diff --git a/x11-plugins/wmbinclock/Manifest b/x11-plugins/wmbinclock/Manifest
index 508839925395..f09db24b2fd9 100644
--- a/x11-plugins/wmbinclock/Manifest
+++ b/x11-plugins/wmbinclock/Manifest
@@ -1,4 +1,3 @@
 DIST wmbinclock-0.5.tar.bz2 15909 BLAKE2B 71a5e53fea8f042bd8e01c0a8dde9057b22e398a4d483b556221d8344b5542f097e835f0d4eafd7cf24964b4b08f04f844c476cddc443ebc8f469e8fbb5142ec SHA512 f0f1f46b19e9c34f9168e03df2d4be2f9c7a73b09dd8247a7bc977309a3354069adf34032f3c0106aa763fe259993176edd84b029941191d05a11505e27de695
-EBUILD wmbinclock-0.5-r1.ebuild 678 BLAKE2B cd5ba02e2b4e70787cf9e74c1a1b13210220ef610c4a00ed493448dbe297d7019adb0797c4448165011e40d0795657a132a7d6013474ceda2ed35e35716efa27 SHA512 c5af80e8749d7b10d7ca6e74e46f8b8a3d8a08a3d687be30e8b069721ed765ff30dfd1990c7e730d54f496349f932cd57e22be8a933d7c4f7665afceafcabc68
-EBUILD wmbinclock-0.5.ebuild 707 BLAKE2B fec849654b00638dd0b442286b38e4421da361b8f5fc166947adba56377697ebc4eaabb981ed9d5ebbe4c83c9113c311c9fc89a525b53b5a331e11cef19fc451 SHA512 034feae221a815d7131dffd23ad753a2d4f20cf474b181bd8285c079de2f5148465bbcc32d79ee85608343d642a37648af676ff9ac2bfef62a41c66f79e6304f
+EBUILD wmbinclock-0.5-r1.ebuild 674 BLAKE2B 3f550c8ecbf613ea93442af640fcdb20cc5d3c21ef68b4d0606f15df78822cd0b82172782c88b05fa7bd7ef8c62b6401ad45989b87834752e2d0338eff9b3469 SHA512 570c64f54a7942f5a08feaa0b9d0b59f808bd058a943efa848825bf8fe879eda1b0cedf7754b680aff042a5a637c777067cb126924e8ee03202ce8603ebfdeed
 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 74d7c6fe8558..77d11a2018b0 100644
--- a/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
+++ b/x11-plugins/wmbinclock/wmbinclock-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/wmbinclock/wmbinclock-0.5.ebuild b/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
deleted file mode 100644
index 1cecaea87e81..000000000000
--- a/x11-plugins/wmbinclock/wmbinclock-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="a nifty little binary clock dockapp"
-HOMEPAGE="https://www.dockapps.net/wmbinclock"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		INCDIR="-I/usr/include/X11" LIBDIR="" \
-		SYSTEM="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin wmBinClock
-	dosym wmBinClock /usr/bin/${PN}
-	dodoc CHANGELOG README
-}
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index 992ffc2160ab..afa1b708b954 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,6 +1,6 @@
 DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
 DIST wmcalc-0.7.tar.gz 119785 BLAKE2B fbb6dff279282e3a383eb3a5c2eca31aee453968040838bbc418d64e27f573555218f6ca3f549c92aa09900389e1a3087e1856d24ed757145ad19410caf87811 SHA512 8cffc55b58900090eecd528daec85238d14294dc294bb042c8a6ed0beb3f4cec0ce9f072e5b124e2eb787afb80f24011576130075c8f9b2ddb2f670550c9328c
-EBUILD wmcalc-0.6-r1.ebuild 650 BLAKE2B 77194ae735a73662903f9aab7b4553fee26fda44af9a1240e5b95190011e5ed583eacf2aa6d789356ee6b77d335b0e5fe991f603ad1940dba3f42ddfad7674a6 SHA512 24b482e156197c49666168391281d4437874648297c9419deddc8e734a7ebcb15c84dc0c154e365edc0e38d779c7337055acc647e137a842b620be66910907e9
+EBUILD wmcalc-0.6-r1.ebuild 646 BLAKE2B d0ea649e16af43063f22f4954bac4d5361e36a36bda84603d02426457646730504b619ce4d059e4f0be3b9eb0ca673a0de9fc3dadfe4d0aebe95f66ce4752366 SHA512 7ee196f27477dc06156677b60b9c5d990c5cd668ddfa0470df1422bbc1d41aff41a8df77b3c8bab41b467e1430253787fc0442c3ac5c9ab58c0a7f091fa3beda
 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 3246ba1c98af..2da684ee5944 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest
index acf1ff66ded2..0c039cd188cd 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 639 BLAKE2B c960fad404d671a093fe0a690a1ebc58327817be6b2bd0ee91c2491f57512b13d52e4ef2493b1967032c5ae26ec58484dd86ff7d09ad55b2f1861a5081ee6643 SHA512 67f603206451008b2c2a67276339e26686a8488b49ac700fd10c8e4b025757aabccad467341817c8f1a93d4598107ccd1d9ab37532da74678fc12050fb02b361
+EBUILD wmcliphist-2.1-r2.ebuild 635 BLAKE2B fb735454d49fb7c1eca28dc927aaf9fb39091a442de540f12f6375cf4b3801d9e92152ef85320bce9d1d6efb5d13c0c7c9b7c34bbe0771f2ccfede71bf46e3fa SHA512 7c726ded2d5d0189a509f3c6631e87060439063c0b289210f2e35b8407ddfcc01a27c40ec64d8185709daaa4fbe2e1ef3508af41c7783d25df8176ee8e25520d
 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 c93d97330746..430468e706bd 100644
--- a/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
+++ b/x11-plugins/wmcliphist/wmcliphist-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 d8061f6cd404..3595aefeefbe 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 587 BLAKE2B f1e5120f15b11b626329bde1405dba87e66f68ad19b71d35e1b7a517e4a50b536100bac064f0590744bc58b43878f84f29b53939e123e1067560ef868c48ae19 SHA512 537f6155cb44fd8d9c1b158022006439308cbbc03f7438d965e7077494eea30526ad4e561208bc11e3f5ea30547bbf75709dc9ed64c30bab1683386667299520
+EBUILD wmclock-1.0.16-r1.ebuild 583 BLAKE2B e89866695ddf031667fca630cfed58d0d726d3646992d065edef80b4b41a4ffc5d00d2560bb377f04dec8132b0cbba2c658e950c5b5adbbeba61cf3396a55088 SHA512 0b355f2cc180f7dd9394c864d659c31c6fe9fbe4c2103670f2e9fdc27a7dd1d0050b55821410b374789d50dafc17878a9244d0b72aed23045443909586f992eb
 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 f9178b00aabb..7581fe60d515 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 589db5304cb4..6c79dbeca60f 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 782 BLAKE2B 305231d8604d099f7b1ce0b5088749e0dd9a5fba5c88a1ef0a29293986ba10b696e9a94368872795f85bab2dde2d1c215af382a5ac4884a66533f57da6cecc49 SHA512 717d90c2f05af1aaf277125df600cbe57f5ec0e571b0e8324710d867b512d74f023763c1991bcdb23aee205922a46071a8182e2994f67cf9fecac7dfa1d724c9
+EBUILD wmclockmon-0.8.1-r1.ebuild 778 BLAKE2B e57d2d6ab0a1e6388f73ed281536f1d0f8ba521a56ae0cf7479df03841d16352e9ccd6c6597542ace1108c5f8774677145e654607b5da3ebce3f026230e12b13 SHA512 c07afeba69d7268ee1080bd9f3ace8768bebfefe7023c99a32e67f336fe3e1e3697e6608fd25a36db91804aeb09b3c7cc83051498d49d57b374a5647eb8d9fba
 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 2da49795d97a..1d0d2cc30035 100644
--- a/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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