gentoo resync : 22.10.2018

3 files changed, 3 insertions, 37 deletions

diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 1f3cfcea5a0a..fee970a66d55 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,4 +1,3 @@
 DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
-EBUILD wmsmixer-0.5.1-r1.ebuild 803 BLAKE2B 737c3051ab73fc116c6995537ba294098a864fd182eb5e8027eb713cc753f1170fe70b784ff2f0984bcdec5f4a608ecf5e46718d191e3bdfceb48c8246d3776f SHA512 c18f519059f287865f14d11ca48b7ecfa1d3b17c32480a0649760d210507624f2aa433229e6727aecab1248f6f77367f2082e5feb8455bd6951ddfb7dc642a36
-EBUILD wmsmixer-0.5.1.ebuild 766 BLAKE2B fad312494ceb4f84ad9623e7fa5978c1399fac9db8970a61b4c40deaedca4d074c3975bce7224397d7190ce9e6141d6f1c4365b451108e7b68894c40902cd341 SHA512 bddab4b86259fab433b87374707bf8193c8f0b4febaf4edd5f1f4af6177a957c62b8fe599416ed6f4a81ca7e5a54a41d2bd3ffaa34fe5eb6b36bcd3e442b1235
+EBUILD wmsmixer-0.5.1-r1.ebuild 799 BLAKE2B 4dc59a27f5bdedb55f719803c0ac9f713756cc1347868138423dc5fe151523cbf3ef63528713579a443a97a026cd6f1cbcb4d38d816c45bc79380d908a5173b5 SHA512 dea489e02d5fba22932b10f37dbb988f56469b7679e2ffdaf241a622db4e9e1ff1e1c86ed648a33735c26a4625247498f54c74e1a23907d44b9909d593277332
 MISC metadata.xml 464 BLAKE2B cda6cb18a92e65299fcbd76d3cb5c22755d17c16d4d634db82dbee0a7421c0023159ac479369e9bd7c448b1e72b53d3b28ec393190c92d09856ff86c7f2fc3cd SHA512 ff0c18c9f0dd4c316c9e82b22a18d15a08d68b58e63420d96da5ae0e70872e2946e0c767f8b5c80951aedce5057a5e8bacafacdcff84416e7eb529c8746c186d
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
index f60c53331932..0b0c25be6b64 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1-r1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.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
@@ -11,7 +11,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"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
deleted file mode 100644
index 1a156b595773..000000000000
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.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 eutils
-IUSE=""
-DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="https://www.dockapps.net/wmsmixer"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_compile() {
-	g++ ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
-	rm -f wmsmixer
-	g++ ${LDFLAGS} -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
-}
-
-src_install() {
-	insinto /usr/bin
-	insopts -m0655
-	doins wmsmixer
-	dodoc README README.wmmixer
-}