gentoo resync : 22.10.2018

3 files changed, 3 insertions, 43 deletions

diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index 0c387da267dd..5e5aaae21838 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,5 +1,4 @@
 AUX wmMatrix-0.2-makefile.patch 866 BLAKE2B 1c57ef78dc72af8f9ec41830e3109b6958e4d834191134e0d04877d98864d605668d89c894ef1d4360ed7e2eaa98a2666d5fb9b720c77dc40c11881c7165a348 SHA512 1e843e3699c634f9f9f42ba850d0552afddaff45e36e89cd15511cc9c1cb57822d354d8d6bd2d3eb56564c4e225025280ebc8686e48e9e0f70c38e294397d43c
 DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
-EBUILD wmMatrix-0.2-r1.ebuild 891 BLAKE2B 385c3da2de6cc29e17404c556b32bbd01069334d7bf1d6983a54b2f603ab26e2c4be5bfe955870aca67d7da7552704d7c82163c9cf444931b24d899e76098637 SHA512 c592bdf2eaca1956095eced7a07f8f8362c8e3394da6b54796fed8259f2dc5a1f7b9c960485c094d2f2200e603eed53e2f980e55737a93749d6c3700521a6a06
-EBUILD wmMatrix-0.2-r2.ebuild 742 BLAKE2B e882779fbcf4e86f851955cee3d1054c52e9f9bde83ea525f73a60eb1499a0d2754729c010da7b10ad2fa3c8b85484f4ac99f96fe949da828f1fc0bd1fe412fc SHA512 85d56442067f4b40b012013620a23e355fec2eeacfbdff4de34a023e5b7b4bfe23b90cb5f4480bd0fafbfcb8aef4fa068c78f3eba30147ce459e212cd1bccad9
+EBUILD wmMatrix-0.2-r2.ebuild 738 BLAKE2B 7f6bb4093bee694a7e3d67d2905459a1ba6d5802edb063766a360c3bbc16fad7108f66b156e3c6c7f5b57beb6ddd510ee44e90053c814e7da41e8cc024559059 SHA512 d57a4a69f31ea15c4a3de95c760507d1508353ee4102c57932f03710333761aa02aab825b94196122efd724fed76b6ec4bfde24ccafb7dff75844bc8cdaf9a48
 MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
deleted file mode 100644
index 3faffc472b9a..000000000000
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.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 toolchain-funcs multilib
-
-DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
-HOMEPAGE="https://www.dockapps.net/wmmatrix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-CDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${CDEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${CDEPEND}
-	x11-misc/xscreensaver"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	# this version is distributed with compiled binaries!
-	make clean
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "install failed"
-}
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
index 561d4e7bf7f2..e66928258312 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r2.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-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
@@ -19,7 +19,7 @@ RDEPEND="${CDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )