gentoo resync : 30.09.2018

3 files changed, 2 insertions, 37 deletions

diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest
index c76756f76cea..5e05677e1cf8 100644
--- a/media-sound/wavsplit/Manifest
+++ b/media-sound/wavsplit/Manifest
@@ -2,6 +2,5 @@ AUX wavsplit-1.2.1-64bit.patch 1929 BLAKE2B 66e6e92a9f5c090bb383cd582cd9ff2310f0
 AUX wavsplit-1.2.1-Makefile.patch 495 BLAKE2B 8aa9ac0991630cca8d8720af33d1649b788f00cb1c171acfc77f4b04de1dc157e581eeefc3025a3b498000f8e331a910680096877462b0545632d2a3130224a2 SHA512 53bb5a83d30429f616f4d2274516741b5454fec82befe3bb5399d7d3d5a7f00160474dbb1104375de7cef090dc96719cb0f8c39cc72eeaada7974a53c22d4ec7
 AUX wavsplit-1.2.1-large-files.patch 6277 BLAKE2B 01e763a872a321aa6e477c7324ead458d358dfca3c2c26bc491615c66fdf10d8d1ee386baada563c7be8107e7c144d7931113547bc17d5ba4f2c8c97c23cbe16 SHA512 06d1250034e09c4a1937742ec992a4d42fe296034c59c5ea40131f093a574d9894b66b9a0217bf424f8171e779cf7a08fd45955bd36e183b6b698e0c33e6586e
 DIST wavsplit-1.2.1.tar.gz 32246 BLAKE2B 38e9e4f27c0adef12ece224224765a60442f34fa4a7ef5af1416071374a5c1f8f4908836fe568c6e046472da26abd51c6ba91a03f0ca10acea5b73a04f961859 SHA512 df0e4bf867fb19e50a8be10f13ed6f4c40e848106c6053661f7226e9893715f0318af4b19bf289b840dbf72768b8508af38351c24725cf3eb81a9f3dbcd27a19
-EBUILD wavsplit-1.2.1-r1.ebuild 812 BLAKE2B aaa5b7deb1621a68561374b0bbe1a5c88fa4994b58d862faf722d13da3182b22f0c46c17fdbfecbd51b7f689642fff61ab04985f79e27030f6099d1cc75c813e SHA512 a5dc805776a23e54bcdde8057503ffc00bf4c78fb34a4870eb2d2338b6c55861d113b06b066ce8036527d0bbfc8f0f57fabcd138f9c29f092084654e14e9f2e8
-EBUILD wavsplit-1.2.1-r2.ebuild 766 BLAKE2B c8dfc4b388ecc6059f28c81ace1ef016c4c5213bdc8236cde0d9cc3e3b2365833f30a709f63d7ea81f51cf38477bfd3ecb96ada18893b745062e732c72e5e7b2 SHA512 9998be51fef2424dd4e2fecad87089ac582935cd152469c4ee782a26ac5ee3db6c58632616571c20d14da6f44a7cff8b71775f125cbb0e238accc11dbde973b0
+EBUILD wavsplit-1.2.1-r2.ebuild 764 BLAKE2B aeafffd30d884c5909467bfa0e3faf4726c9ea9687f006c62ee0e40a9468ee2840f1157cd665ecaf18792e954e385f1e0fe899733651e10349e3242b2ae8e07e SHA512 8f0ec619fc2258674066fb11f5ae9afb5aa1be920dbc9bcfc446197453aaedec140812dc533b63a6fdae00d662eece2c02b89eb62f0d7669e55611ac233b6bdf
 MISC metadata.xml 331 BLAKE2B 53308e6ee29eac8d7573ff409099d4825985af37eb40f30b78523891f0fd7fce3628c30e559935e5506c6a8139a5dba45bf0303305222055891c1932bc2e46f3 SHA512 c9839a79cbe27caf7ce682e8b6db6e6b0abda1b1ee643820272f78026f6f7695e641980cbed35d8a89a050ff778d715bc7e7960bdef04fd4e1a29b355fba08f2
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
deleted file mode 100644
index 18b9dbcd2bb3..000000000000
--- a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
-HOMEPAGE="https://sourceforge.net/projects/wavsplit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
-KEYWORDS="~amd64 -sparc x86"
-IUSE=""
-
-src_prepare() {
-	emake clean || die
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-large-files.patch \
-		"${FILESDIR}"/${P}-64bit.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_test() { :; } #294302
-
-src_install() {
-	dobin wav{ren,split} || die
-	doman wav{ren,split}.1 || die
-	dodoc BUGS CHANGES CREDITS README{,.wavren}
-}
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
index 7e422e4d3fa0..4f4669af7bd7 100644
--- a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
-KEYWORDS="~amd64 -sparc ~x86"
+KEYWORDS="amd64 -sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch