gentoo resync : 04.05.2019

4 files changed, 2 insertions, 90 deletions

diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 3106e59a70bc..c13b567b73f3 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,6 +1,3 @@
-AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 BLAKE2B 2ea52354945fa8d503b06785b0a6a1c9b8f982cf4fe962c7f155b43e87d9ef1ccc129a1bab0ea628f3616972790194519e8929cc9ac9280d2669b30f6df707a2 SHA512 6d9ac83d900f7c3b020903ed90568c5d0c5758664d899b8f778ca69a8ef0eb21d4d60795aa682fd031a0a27b95c2f0b1a7e635ef40e59f9c5f1f05d21f4bacdc
-DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4d8384a37c01a40cc550b584a3fc4ee1dcd88ae05980cf4a9368a51d2035e49717faa8086b922f2815f735a6 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
-EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
-EBUILD abcde-2.8.1.ebuild 1750 BLAKE2B 4a38d572e6c9bcc40b505c77e23914a1e84379871df34efa7151d25692d82eae2331e6001c30d9d2987595bb216d5e894dc9ad740214e44053c514556307d3ac SHA512 70a2f5379c8f1ea3aee668dc8b1e2981745868230972391928428051b5f60e1d8baeebd81bf8a244f543e47dd257b811077abed15330bb31854af9790bec4d69
+EBUILD abcde-2.8.1.ebuild 1749 BLAKE2B 667eab5834dfb542bba2d825152de1bd4b4a30a6464cf868cef5ad20c5bbbbe97a4fc5678d7029ca6e435bb3d5716c7e8e31860f9002bf753c29e14485a37f60 SHA512 74bd3b26110ffb38a45aee0a4f2ff720ae841bba1bc59deb35e39676acb279de5554895dc4a32b05abcb50d9387b43a90ed771f514caff01770a0d6055c04c60
 MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
diff --git a/media-sound/abcde/abcde-2.5.4-r1.ebuild b/media-sound/abcde/abcde-2.5.4-r1.ebuild
deleted file mode 100644
index 1a0fc6bf0134..000000000000
--- a/media-sound/abcde/abcde-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A command line CD encoder"
-HOMEPAGE="https://code.google.com/p/abcde/"
-SRC_URI="https://abcde.googlecode.com/files/${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 musicbrainz normalize replaygain speex vorbis"
-
-# 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 )
-	musicbrainz? (
-		dev-perl/MusicBrainz-DiscID
-		dev-perl/WebService-MusicBrainz
-		virtual/perl-Digest-SHA
-		virtual/perl-Getopt-Long
-		)
-	normalize? ( >=media-sound/normalize-0.7.4 )
-	replaygain? (
-		vorbis? ( media-sound/vorbisgain )
-		lame? ( media-sound/mp3gain )
-		)
-	speex? ( media-libs/speex )
-	vorbis? ( media-sound/vorbis-tools )"
-
-src_prepare() {
-	sed -i -e 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
-
-	epatch "${FILESDIR}"/${P}-eyeD3-0.7-api.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" etcdir="${D}"etc/abcde install
-
-	dodoc changelog FAQ README TODO USEPIPES
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
index 1dedefd70a54..2a06fdfdf54f 100644
--- a/media-sound/abcde/abcde-2.8.1.ebuild
+++ b/media-sound/abcde/abcde-2.8.1.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 cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
 
diff --git a/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
deleted file mode 100644
index 15f234877996..000000000000
--- a/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Update to eyeD3 >= 0.7.0 API
-
---- abcde
-+++ abcde
-@@ -829,7 +829,7 @@
-						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
-						-G "$GENREID" -n "${TRACKNUM:-$1}" \
-						${TRACKNUM:+-N "$TRACKS"} \
--						${ENCODING:+--set-encoding="$ENCODING"} \
-+						${ENCODING:+--encoding "$ENCODING"} \
-						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
-						"$ABCDETEMPDIR/track$1.$OUTPUT"
-					;;
-@@ -3879,7 +3879,7 @@
-	TAGGER="$EYED3"
-	TAGGEROPTS="$ID3V2OPTS"
-	ID3SYNTAX=eyed3
--	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+	TAGGEROPTS="--encoding utf16 $ID3V2OPTS"
- fi
-
- # NOGAP is specific to lame. Other encoders fail ...