3 files changed, 93 insertions, 1 deletions
diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index 2a9fec099534..53078f76c8af 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/abcde
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.66 2013/01/23 11:52:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.67 2013/01/30 11:11:15 ssuominen Exp $
+
+*abcde-2.5.4-r1 (30 Jan 2013)
+
+  30 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> +abcde-2.5.4-r1.ebuild,
+  +files/abcde-2.5.4-eyeD3-0.7-api.patch:
+  Use the new eyeD3 from SLOT="0.7"
 
   23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> abcde-2.5.4.ebuild:
   Only cdparanoia executable is used. Convert the dependency to || () for
diff --git a/media-sound/abcde/abcde-2.5.4-r1.ebuild b/media-sound/abcde/abcde-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..692ecc89a97e
--- /dev/null
+++ b/media-sound/abcde/abcde-2.5.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v 1.1 2013/01/30 11:11:15 ssuominen Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="http://code.google.com/p/abcde/"
+SRC_URI="http://abcde.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+		)
+	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
+		perl-core/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/files/abcde-2.5.4-eyeD3-0.7-api.patch b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
new file mode 100644
index 000000000000..15f234877996
--- /dev/null
+++ b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
@@ -0,0 +1,22 @@
+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 ...