gentoo resync : 26.12.2017

16 files changed, 8 insertions, 256 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 7d4bd7b3f33f..3bfd76510e84 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmapmload/Manifest b/x11-plugins/wmapmload/Manifest
index 57f3d75bcc4e..eb947ef5a91b 100644
--- a/x11-plugins/wmapmload/Manifest
+++ b/x11-plugins/wmapmload/Manifest
@@ -1,4 +1,3 @@
 DIST wmapmload-0.3.4.tar.gz 91667 BLAKE2B 09fc05c918456d7e6654980181124da3caee3e9e1585501a4baa1d6f9d3eff0e5bb9a4173dc73bcdb3e4cf2072abf06b4da6019da20ceea8ecec1d544943acfc SHA512 8e7e879c9f7bd4ac976c63ebc50232c0123621118c22c96803ced86ee4d0f934a75369cc5949e5b11402db02f57b527a32e5c5db16a8002cccdc0a2a4dc3904d
 EBUILD wmapmload-0.3.4-r1.ebuild 454 BLAKE2B 5afdbe62155b2bd97e8959e92f4800725acdef2f46efb38bbd0a0094d7911ff0ea332759634c1d2cfc38591a7e0e10fdad7213a294cabc054ddd490002a011d5 SHA512 5b1151a63d8a4b54f0b2cf7f39162cd38d9c0d71d730fc42252452cd17b9f2802a94b193d4922847a9012f4ffad69aead6447c8e9e2b63664d56f25f63164091
-EBUILD wmapmload-0.3.4.ebuild 556 BLAKE2B fb90ecd9f87fba4071e72a3e9f3c8807b5538e8122217d708c1eb7c0bf3dc4e0a41711244a32ec8103c029513aed4e84ab8d8d4472ba6c236267af765d31978c SHA512 ef09f10e5f7a1d355d4e237d59d4bebe2515dbc30a12c315536c78c2a9f1efc36796d08aeae8d8cff89f74f99ea5033f76a04d0fbf5c5398edf66937a9fa0aac
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.4.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.4.ebuild
deleted file mode 100644
index 6e136457fb87..000000000000
--- a/x11-plugins/wmapmload/wmapmload-0.3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DESCRIPTION="dockapp that monitors your apm battery status"
-SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
-HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "installation failed"
-}
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index feb92cb466ae..eac7e8616976 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,5 +1,3 @@
-DIST wmclock-1.0.13.tar.gz 45740 BLAKE2B ccc1c9f6fc49af57556dd5e44acba6ad8b89451525eaa9e8174a8dcf8e09e1941cf258df8b116291fa953e323b5668b508467faf66d027ec6ca9dd794be642e7 SHA512 b7d202798767705157a2a5199344f645aa44201d3a3b6b4eb7a6213ebb10074cea68554d8d4ff9862eabfa2a94e88e453d36c22c451de74e9cac656c4d8af63c
 DIST wmclock-1.0.16.tar.gz 35448 BLAKE2B 2a6ee148664b10850a31bb7f20f68b8f2d0c7e1e9d353f6823e9280b40ab7e43ebf1e824428e233d03608217a2cdb7f7463480530ca89d5bd7278ffeabf2de80 SHA512 1325a3a25d03a04e5321bf99bbd6ffac0e08f9f2a635425689458cf74219a9338d60d832143031639f75575dfc63fd307a15e651f90345887cf95de90cc8fbe0
-EBUILD wmclock-1.0.13.ebuild 766 BLAKE2B e3e75b16826fcbf75c94e6ba0b881b8b3cdfcf1c7df6a2e7d506ef2d970a89443d5bcc9895fd1dc458808a4a5124ef4f157718c2c936b61a598e59019f063d4a SHA512 6a0818e5d1e2b76ba3e8405813f711773eae340e8a45dce647c2bc4ec046d74bd73a4785bb500ba5dbd37f66e9caa6c8b31dd35c123179de70f6e1dd3a27bee6
-EBUILD wmclock-1.0.16.ebuild 579 BLAKE2B f824026ff0c05dc9d064de242e2e40a1c94c1a8b8236934ce0c16be9ce62457be02fd5b113312286175d894db7848832115299e8a7dc475acf29b2d77ccf338d SHA512 0c889e8c023495d09924619c1349b5d13b5285b461d19a1d3807bcd7a5f04f1f97d4612a071b33ec51adc9c29bbc16694f5ca7aa8b723572ed6d2177d313d732
+EBUILD wmclock-1.0.16.ebuild 578 BLAKE2B 932abfcb310d436dfe63eb4ff628fcdcc5158978eb54ffe1ac0b1ca7f7b690af2c48f1b0db33c22d0404a9547908a4271bb96a6a333a529e430a9029f3829629 SHA512 9462d30e90905d088d589efb94c42418632f999196c3c579510309a81934dc258bb8cef69106a7e63c5be3bb4ac81b2b2ce22ee3932736087eefaeae76f4531a
 MISC metadata.xml 688 BLAKE2B 227ee0b283753824b8e06e77fe0905eb26142adf58a7b376519281dc67e19ff15956baaab9af4b375a550782b281525187332b38ab128d4192a76926ed240e8d SHA512 a11af53f6a28b0791ab43350e677a07b587b6bbe65bc1e5495277ae12d4cbc89417e6757b5561dd55e123fe7f83e7202adec0fc3dfa2a2887ee0c5f817d5b112
diff --git a/x11-plugins/wmclock/wmclock-1.0.13.ebuild b/x11-plugins/wmclock/wmclock-1.0.13.ebuild
deleted file mode 100644
index 2551053c7907..000000000000
--- a/x11-plugins/wmclock/wmclock-1.0.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="a dockapp that displays time and date (same style as NEXTSTEP(tm) OS)"
-SRC_URI="http://www.bluestop.org/wmclock/${P}.tar.gz"
-HOMEPAGE="http://www.bluestop.org/wmclock/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" || die "make failed"
-}
-
-src_install() {
-	dobin wmclock || die "dobin failed"
-	newman wmclock.man wmclock.1
-	dodoc ChangeLog README
-}
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
index bc5350ac8019..5b47ff92a352 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
index 924b42a806bd..c29b2fb802a8 100644
--- a/x11-plugins/wmcube/Manifest
+++ b/x11-plugins/wmcube/Manifest
@@ -1,6 +1,4 @@
 AUX wmcube-0.98-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
-DIST wmcube-0.98.tar.gz 38305 BLAKE2B ceb2f4211ba2f0459242183e3023e3e4203cfc6295f01ce2945ab384f8fb14bdfa7b2cc64fae6c20a96a52d2a22716299ffe117243d4a41ba0c153212127cc57 SHA512 137e31b3de175bcbe593c420b79804a8904436923747e0db338258e87e08ed6dc4748c29910c68e01e072850fb0f0ca6d1979fee22d6e8edc76c500a5cd84230
 DIST wmcube-1.0.2.tar.gz 56908 BLAKE2B 4ce373b3822e9d515d611e577214a2c51a8e4fb62cc47cf9f64ad49441bd3c53ba09d301c898a37f6ffafecf984ae04cefce9890c593797719b29fb54425f6c7 SHA512 171700848a9d674ced3ee33468b967b2be706e72863f8356f0d8d72785c06a1c34b5be3597e5604bf74e97ee911ca05b68a28bfe67c1171a61c7084450d622de
-EBUILD wmcube-0.98.ebuild 908 BLAKE2B ab604f531a0adb1b1ded5575eeab04d3206a7ab2d0582ac8b8d9b461312d39f14d966d04e132721a1fe1b1a603812f4a44096132ccbe5b6ed01a6a037d909b50 SHA512 fa296d46439830013e48743c835504b83c00dde1a343c3d2b53ed47155119ad793c81affbf1f25c2e21eccd3b881e2962c39a3f7e0a5f02e28f629b2bf826cd2
-EBUILD wmcube-1.0.2.ebuild 907 BLAKE2B 2d929f5a92cb735e2f0365e9c16ba3338ea5af326eaf6f32012c5539aeede9b1a1f3df14d4c85f180cb9cc4e3960ec25f49e42307192cec3e21349fb9637b8b2 SHA512 400e0bb67c2802234df311de87e041f76221e8b6c749aacc17ffbea13188f0a1bc0428f19a91ef212bcedf222f175cbd3a29f224d0d30272ab45ef732cb4d8da
+EBUILD wmcube-1.0.2.ebuild 905 BLAKE2B 7cdf13f3021adac5cd2b71b813fe8c4522c6fe819c4e16bdb6f520e5cc4ad008cf3c8695cf9279c931d15302efa7a4ae0aae05dfda6c2b83db5402b30f19f020 SHA512 4a73a28b1d57ba605f83fe5c7b2a5362a0d98369b409ea689f0f501065ff9b7584d86b08553d2a7dee8230fa09421c47e274da05aeed762c734a7590623c8210
 MISC metadata.xml 417 BLAKE2B 7d594431bb0c67d7275c73e53e6958ff415beaf1ec79b82bbf887b3ac16d17e13e8319f467c17bd376b04130959767be65e6112bd7032b853502b8d9dd07817e SHA512 370036b0e1a6a62c3251f22f687277a6ad684b02e423db1b2879fc08267db8c4b6de7e0e35de500b836dd1156d717bf3100e3de4027477473e30aeb1adf339ba
diff --git a/x11-plugins/wmcube/wmcube-0.98.ebuild b/x11-plugins/wmcube/wmcube-0.98.ebuild
deleted file mode 100644
index e795d285b3fe..000000000000
--- a/x11-plugins/wmcube/wmcube-0.98.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
-HOMEPAGE="http://kling.mine.nu/kling/wmcube.htm"
-SRC_URI="http://kling.mine.nu/kling/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~mips ppc ppc64 ~sparc"
-
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-S="${WORKDIR}/${P}/wmcube"
-
-src_prepare() {
-	#Honour Gentoo LDFLAGS, see bug #337893.
-	sed -e "s/-o wmcube/${LDFLAGS} -o wmcube/" -i Makefile
-
-	cd "${WORKDIR}"/${P} || die
-	epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die "parallel make failed"
-}
-
-src_install() {
-	dobin wmcube
-
-	cd ..
-	dodoc README CHANGES
-
-	SHARE=/usr/share/wmcube
-	dodir ${SHARE}
-	insinto ${SHARE}
-	doins 3dObjects/*
-}
diff --git a/x11-plugins/wmcube/wmcube-1.0.2.ebuild b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
index 572702538b1f..34d11b5af88d 100644
--- a/x11-plugins/wmcube/wmcube-1.0.2.ebuild
+++ b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/wmcube-1.0.2.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
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 0d829291a915..4fedab6ceac3 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -3,10 +3,6 @@ AUX wmload-0.9.6-solaris.patch 3036 BLAKE2B 46982b6bad9e2b5a731ff5d90ee5ccac730a
 AUX wmload-ComplexProgramTargetNoMan.patch 224 BLAKE2B e592218a8c052ac63143e11889b55cd1321abd1c90151b166d4216bdb51a4a671a7b5b7235025135de069de781632e4d2dc08cba5aeb1c008148f930fa84bd6f SHA512 41753993f6cce969284c0093506d125d7b6b7508968a98a248e8c06cc0941fcd9daf2e1d31782aa58e21ce18a3ed8a03131fddee9f048c93c3b4d97560625cd5
 AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b
 AUX wmload.solaris.patch 3494 BLAKE2B 99e48775cac95c5d06c07cb82dab8d752f0251d53447df5f924f0a8314385d9b0a37361a06e8b136771b4949bc8f3c7049525bb0818b5a2685259812ac1beaf3 SHA512 9b65b4578168f3bc3b0e3bccff94097fb301e6763fecae712b58b3d21a994ceb8fbc8f39d640959374e19e2cfa71e3eab38d4eaf18c421bdf28c7113db1212f0
-DIST wmload-0.9.2.tgz 8499 BLAKE2B 4cca866eb5f3fba1ac69f75f768dc756ca4acba4d7791aa3b65ef2aaedcb1c4ae20509e6fc5139b69d174b1873fb7db2d64740d334968ba5b69e2bc8c1b98055 SHA512 fd3875d8da5bb309f0d49eb6ebe0903832d021a244b90ad70821e90aa85e835ef727d84957fb0cdb0290075ba1c0bb11cd4756a5a933cfebb35682f0b8e0dbca
-DIST wmload-0.9.6.tar.gz 17143 BLAKE2B 74224cd7c04873cdaf8028288dea2a6bbb55044ea4f820d75590b9313f1881b097dd1f4664e041c72c07b8ed539a87b2ed064eed080d70dad2b22643f60d0b83 SHA512 989dfce6f6bbc32403702e06b47c873af45b6196ff20572290e88022ced1817cc0d29bae79f20fb289cf37ec2bd532e1b6e7c975a9b1e6e6059c9307a4d7e63d
 DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
-EBUILD wmload-0.9.2.ebuild 1188 BLAKE2B 165569ef62346b7b18b74dc5c57b099389b6759273062c15329a6fb9e6926e936c600a040d7bccf55135ddb6dc0a6f59ced61b356883ee8f4d74ca7bc94cd2bf SHA512 0117c20dcbbd83ff6a3b461ea92e56bbce1976f3f346442b1d4bdabbd438f796274ccc5e2e121f0595f9b1206cf7d9d7040d0c7b503fa7b1cfb9bfe98d991b55
-EBUILD wmload-0.9.6.ebuild 809 BLAKE2B f14904eec966ebfc3e3f74861b5d53d8587138a8ef0aa33f332661e7faa5d68a84326d46c4be562491d94bdfd0d0e1c29858b0c603f25bb89699265947e8961a SHA512 9a5be64415d639d1c424664b66d7098bdbf5bcaa5bd04e7f8118f2556a5b75e176dda26f3538b583d22168375aa50c359f799f988074f4a8098dd9cc15784e5c
-EBUILD wmload-0.9.7.ebuild 790 BLAKE2B d82349d82a0c512b4cb9e7ff2395eaf0471ff77c4c0caff7f1b4756e80ec690e5891ab9ebc268c57ad9aea69abd37fb9bf45cc038866a8d81a959825d3469003 SHA512 92c0cfebdb1766a48f4c8f5147e7a6af2bba7896335823486f9cbf43052564340f4989bcb564d7a557dfa47d62486de1a9d0d021651b1b2f25384d46e3d53a8d
+EBUILD wmload-0.9.7.ebuild 789 BLAKE2B 75f80c22ad031132fb148e0e6969e6cbc3b1198580d7ac5ecdd1ffae0c362d2414620d1492dc163ebdc4e3ecb2b6f5eb10bc71fd60d34c9ab1d0e55a20b24655 SHA512 7c6056e4ed1bc456392acfe89e18b1d3851e0c81b18601271469e4086eb1fd7dbb21e867f1cdf6d21237fedbfa36864060871fafcd81e16381f9b23fe07f55dc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmload/wmload-0.9.2.ebuild b/x11-plugins/wmload/wmload-0.9.2.ebuild
deleted file mode 100644
index f5033d209a6d..000000000000
--- a/x11-plugins/wmload/wmload-0.9.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="yet another dock application showing a system load gauge"
-SRC_URI="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tgz"
-HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/sys.html#wmload"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-ComplexProgramTargetNoMan.patch
-	epatch "${FILESDIR}"/${PN}.solaris.patch
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	[[ ${CHOST} == *-solaris* ]] && \
-		sed -i -e 's/\(^XPMLIB = \)\(.*$\)/\1-lkstat \2/' Imakefile
-}
-
-src_configure() {
-	xmkmf || die "xmkmf failed."
-}
-
-src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${EPREFIX}"/usr/bin install \
-		|| die "install failed."
-
-	dodoc README
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
diff --git a/x11-plugins/wmload/wmload-0.9.6.ebuild b/x11-plugins/wmload/wmload-0.9.6.ebuild
deleted file mode 100644
index 13909c104063..000000000000
--- a/x11-plugins/wmload/wmload-0.9.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="yet another dock application showing a system load gauge"
-HOMEPAGE="http://www.dockapps.net/wmload"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-solaris.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-
-	dodoc README
-	domenu "${FILESDIR}"/${PN}.desktop
-}
diff --git a/x11-plugins/wmload/wmload-0.9.7.ebuild b/x11-plugins/wmload/wmload-0.9.7.ebuild
index 87607d022954..90d3e7041926 100644
--- a/x11-plugins/wmload/wmload-0.9.7.ebuild
+++ b/x11-plugins/wmload/wmload-0.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
index 03bd979d4dc2..c7452fdfebaa 100644
--- a/x11-plugins/wmtz/Manifest
+++ b/x11-plugins/wmtz/Manifest
@@ -1,7 +1,5 @@
 AUX wmtz-0.7-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
 AUX wmtz-0.7.patch 1305 BLAKE2B 13b09b49fda781a04e73a29d56dc87e1aec8a71a4ea643d49797fb15c2b6eecd390d02885c9fbdb17e5614285ddc7831f4d1c75b9fb58976aefe4aeb78c05bff SHA512 4e04a1a95d39ebe9982d4f26acf827fbbeb953f4dcc695c5b39dcb46423bd9d58336838a3d8a28af142b9a5391625a6965ece158b735514adce4438afa662194
-DIST wmtz-0.7.tar.gz 26350 BLAKE2B c0cad5c7bbca9ddfb8168ef360385305e99298a076e5c317504f646dbf372e1b3af704960a0d3b8e528e3cf97414cc8e3b2cff3d4c37739c81744254411b03f3 SHA512 5de721231c7d7bcccc8a9b962069f4adad85158b39df2e77c6015ed3f24d4f8e43c90f91645e186d7f7c656bc6fb937b435925caff4e55abcfa0a8b0a9e75da0
 DIST wmtz-0.7_p20150816.tar.gz 19310 BLAKE2B 7f3bc0b077a9a667211cc588f1fb7c3d1d246256724a6cf5a17f028d2d334d02f898a798aca6fae11910868d312844bbe8ac5bfd190229f3ae829e97e50e2247 SHA512 60c9b66423332b155ce262d30026a5091c0379eb3257f547af1203d331968e9f334a533ed03832476512893d06cea857db9c044b30115978904510f9725e8455
-EBUILD wmtz-0.7.ebuild 960 BLAKE2B 24fc9eadac584e82d6e5346ada042b2cf4aa7e41a9a0e972cea5231110fe5c3e5eb5199abd480e76a79b1e751169c1c71b0ce654370e1b434b16e9418a97ef91 SHA512 af3b432709a7b10538e13462eb36716a55fada1694c5dd563c04ab40856fec305eeb1a24887028be281d1363ded280a0a78f61eb0ac429e3ef8ff639c3b6cc54
-EBUILD wmtz-0.7_p20150816.ebuild 910 BLAKE2B 4b53043be4ed495e73b43f6e5e53dd7fe172186e08e0fe044e766d719c4b5749d42ddae4ab29847426d857222f53722a3b14471d9b2915cc0835d5ebd646c644 SHA512 3f564988eb3cb6d037efc75cc10c8740716830b982d32f66c8354de5aa3d35e303c813b6cfd05410c7d1bd1009e4c48a8f5dc363ef297dabe0497d99ff4d1b71
+EBUILD wmtz-0.7_p20150816.ebuild 909 BLAKE2B 1779da6b58b351f016470ae11fe49c583be86456f19c26c0a2d46a4d8d43c0afc0984db1a002004522686cacff9d0819339b1d7bea81ac16a97b76bf256c1dc0 SHA512 ac4cab3641b4e772f945afb41694c88d9d8a7a28bf44b91e42af6997d2ed9ff49c4ef1c9aa8fcafb8607d474e70a54471ec4c6023e131a846c3fc2601b05feec
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild
deleted file mode 100644
index e7714e1ab041..000000000000
--- a/x11-plugins/wmtz/wmtz-0.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="dockapp that shows the time in multiple timezones"
-HOMEPAGE="http://www.dockapps.net/wmtz"
-SRC_URI="http://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-proto/xextproto"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-
-	#Honour Gentoo LDFLAGS, see bug #337890.
-	sed -e "s/\$(FLAGS) -o wmtz/\$(LDFLAGS) -o wmtz/" -i Makefile
-
-	cd "${WORKDIR}"/${P} || die
-	epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
-		LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	insinto /etc
-	doins wmtzrc
-	dodoc ../{BUGS,CHANGES,README}
-}
diff --git a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
index 866034e5a8cb..8f22dabd31e7 100644
--- a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
+++ b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
@@ -11,7 +11,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/libdockapp-0.7:=