gentoo resync : 22.10.2018

3 files changed, 3 insertions, 44 deletions

diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index a81bae6b5a60..807f44bd1a26 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,5 +1,4 @@
 DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
 DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
-EBUILD wmnet-1.06-r1.ebuild 804 BLAKE2B dd43869d6648d8a7bf33e6f4b9b4a42e2eabea73713e557a9900c34f7441f78458a6b90244153dbc50ca698b473e5b9c622ea25071e590f8344c734c0f75647c SHA512 dababf35f29f1b6ce7ee5167a4c7f808676f1c28f4bedbdd2a4c8e89aaadea885eb619277b039ebf53b8538b8e81d24eec04e99ae75f9d65f1bbea0500921329
-EBUILD wmnet-1.06-r2.ebuild 719 BLAKE2B 962487e2abcce6f8ac5a2dbd15475b3a4fa34e3392693a7d0382ca217e817d5295be0c808abe1bd5cb454eca244929ed09fa05614cae1482ff274ffc1878e5f2 SHA512 d4c893c7ec7d1353866f4702c01f53d28ac6790cd196ac821021ec74b6b54b12b3a20fba58bed1dd4a663904d524c5703c5a5dbd4a43cabbb43861c138ba30fe
+EBUILD wmnet-1.06-r2.ebuild 714 BLAKE2B 429508f474c6e30217c34ddaf918eb921f1d8f7e57d7f024cfb1f0db1e398011ce87304cb27cfab0e11da4c33c044012165e35b94ad730f78bf1e5dfb5e02c79 SHA512 b91594524501e078e4ec38e1c8b0a5cff4613a0a9126b86f34b8d3885ea0355d18ed41e4326b13c5aebc96c0cc9ff30d899394d7f2545fcf73297e195bcb3338
 MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
deleted file mode 100644
index ab44a64942e3..000000000000
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-misc.patch.bz2"
-HOMEPAGE="https://www.dockapps.net/wmnet"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	app-text/rman"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc alpha amd64 ppc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P}-misc.patch # bug 72818
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed."
-	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin wmnet
-	newman wmnet.man wmnet.1
-	dodoc README Changelog
-}
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index bc4a43c32e6b..eebaab37ef11 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-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=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.dockapps.net/download/${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