gentoo resync : 11.07.2019

3 files changed, 2 insertions, 74 deletions

diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 45295000c3e5..b7f0f9f40f45 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,6 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
-DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.8.1.ebuild 1749 BLAKE2B 667eab5834dfb542bba2d825152de1bd4b4a30a6464cf868cef5ad20c5bbbbe97a4fc5678d7029ca6e435bb3d5716c7e8e31860f9002bf753c29e14485a37f60 SHA512 74bd3b26110ffb38a45aee0a4f2ff720ae841bba1bc59deb35e39676acb279de5554895dc4a32b05abcb50d9387b43a90ed771f514caff01770a0d6055c04c60
-EBUILD abcde-2.9.3.ebuild 1838 BLAKE2B 0d66b75738f79e87073f2f52cf6017aad0532e5fa7b7a97b4a4997f082cf300a8bd1ae8015ea28e89898aaea83e022b714d8006a8c3a0f6792b1c1719e6958ab SHA512 ed9472d325ebf382e818c31fa5aae6c4fadbfa9f9561011aec15e2575f8d76365416c99688b94f198be566b0e2549d93dd35b1760e658bb30912a6d64d7f5e55
+EBUILD abcde-2.9.3.ebuild 1836 BLAKE2B df25a24c07c9a13e5c64f19270184f97d978d08640304ea1ff5f66568545e10dabf3dfe0ff24640154af8bab36fc635ac2021e8607056989e77c6b0c3ee44801 SHA512 a8ce354679a46488ca1cada2699c525911efb129ce3979e511ebea279d7896148187a4670a0f170337e083cec52f4a23d254fd5fd23b725042164f925c17a3d1
 MISC metadata.xml 687 BLAKE2B 003c2762435868462c70ea9a6d21e7c50b7db96f10cdf3ee68788d027f92e6e656046dcd070f3054888c473dc0fdc273462f36067c2ebbe48b64fe4a8cfa95cf SHA512 42995ba554653993a07ab04e6ad8f8a50ed2fcf3319869fc54b76480a61fe2c22c1186c39354f9a5920ed4b065cf8ef52fa10e67cfa258199dae6da9db3a9581
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
deleted file mode 100644
index 2a06fdfdf54f..000000000000
--- a/media-sound/abcde/abcde-2.8.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A command line CD encoder"
-HOMEPAGE="https://abcde.einval.com/"
-SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-# Enable MP3 related flags by default
-IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
-
-# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
-RDEPEND="media-sound/cd-discid
-	net-misc/wget
-	virtual/eject
-	aac? (
-		media-libs/faac
-		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
-		)
-	cdparanoia? (
-		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
-		)
-	cdr? ( virtual/cdrtools )
-	flac? ( media-libs/flac )
-	id3tag? (
-		dev-python/eyeD3:0.7
-		>=media-sound/id3-0.12
-		media-sound/id3v2
-		)
-	lame? ( media-sound/lame )
-	mac? (
-		media-sound/apetag
-		media-sound/mac
-		)
-	musepack? ( media-sound/musepack-tools )
-	musicbrainz? (
-		dev-perl/MusicBrainz-DiscID
-		dev-perl/WebService-MusicBrainz
-		virtual/perl-Digest-SHA
-		virtual/perl-Getopt-Long
-		)
-	normalize? ( >=media-sound/normalize-0.7.4 )
-	opus? ( media-sound/opus-tools )
-	replaygain? (
-		vorbis? ( media-sound/vorbisgain )
-		lame? ( media-sound/mp3gain )
-		)
-	speex? ( media-libs/speex )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )
-"
-
-src_prepare() {
-	default
-	sed -i 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
-	sed -i -e '/^prefix/s/=/?=/' -e '/^sysconfdir/s/=/?=/' Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" sysconfdir="/etc/abcde" install
-
-	dodoc changelog FAQ README
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/media-sound/abcde/abcde-2.9.3.ebuild b/media-sound/abcde/abcde-2.9.3.ebuild
index ba5f79807f99..d68fe4df557c 100644
--- a/media-sound/abcde/abcde-2.9.3.ebuild
+++ b/media-sound/abcde/abcde-2.9.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 # Enable MP3 related flags by default
 IUSE="aac aiff cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"