gentoo resync : 26.12.2017

4 files changed, 2 insertions, 92 deletions

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