qa

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 27 insertions, 95 deletions

diff --git a/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild b/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild
index 0e85d633687d..bbaac3fafd36 100644
--- a/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild,v 1.2 2009/07/10 12:49:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild,v 1.3 2009/07/29 15:03:36 ssuominen Exp $
 
-EAPI="1"
+EAPI=2
+inherit autotools eutils distutils
 
-inherit eutils distutils autotools
-
-MY_P="lib${P}"
-S="${WORKDIR}/${MY_P}"
+MY_P=lib${P}
 
 DESCRIPTION="TunePimp is a library to create MusicBrainz enabled tagging applications."
 HOMEPAGE="http://www.musicbrainz.org/products/tunepimp"
@@ -16,60 +14,56 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-# Most use flags were void as not deterministic - needs a patch sooner or later.
-#IUSE="flac mp3 readline perl python vorbis"
 IUSE="python"
 
 RDEPEND="sys-libs/zlib
 	dev-libs/expat
 	net-misc/curl
-	>=media-libs/flac-1.1.2
+	media-libs/flac
 	media-libs/libmad
-	>=media-libs/musicbrainz-2.1.0:1
-	media-libs/libmp4v2
+	>=media-libs/musicbrainz-2.1:1
+	>=media-libs/libmp4v2-1.9
 	media-libs/libofa
 	media-libs/libvorbis
-	!media-sound/trm
 	sys-libs/readline"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	!media-sound/trm"
 
 # parallel build is broken - https://bugs.gentoo.org/204174
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${MY_P}
 
+src_prepare() {
 	epatch \
-		"${FILESDIR}/${P}-gcc43.patch" \
-		"${FILESDIR}/${P}-libtool.patch" \
-		"${FILESDIR}/${P}-build-fix.patch" \
-		"${FILESDIR}/${P}-gcc44.patch"
-
-	sed -i -e "s: tta::" configure.in
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-libtool.patch \
+		"${FILESDIR}"/${P}-build-fix.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-new_libmp4v2.patch
 
-	if has_version ">=media-libs/libmp4v2-1.9.0"; then
-		epatch "${FILESDIR}"/${P}-new_libmp4v2.patch
-	fi
+	sed -i -e "s: tta::" configure.in || die "sed failed"
 
 	eautoreconf
 }
 
+src_configure() {
+	default
+}
+
 src_compile() {
-	# We need to override distutils_src_compile, bug 160145
-	econf || die 'econf failed'
-	emake || die 'emake failed'
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL README TODO || die "installing docs failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog INSTALL README TODO
 
 	if use python; then
-		cd "${S}/python"
+		cd python
 		distutils_src_install
-		insinto /usr/share/doc/${PF}/examples/
-		doins examples/* || die "installing examples failed"
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/* || die "doins failed"
 	fi
 }
diff --git a/media-libs/tunepimp/tunepimp-0.5.3.ebuild b/media-libs/tunepimp/tunepimp-0.5.3.ebuild
deleted file mode 100644
index 14143b87d882..000000000000
--- a/media-libs/tunepimp/tunepimp-0.5.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3.ebuild,v 1.10 2008/07/01 18:55:56 keytoaster Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils distutils autotools
-
-MY_P="lib${P}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="TunePimp is a library to create MusicBrainz enabled tagging applications."
-HOMEPAGE="http://www.musicbrainz.org/products/tunepimp"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-# Most use flags were void as not deterministic - needs a patch sooner or later.
-#IUSE="flac mp3 readline perl python vorbis"
-IUSE="python"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/expat
-	net-misc/curl
-	>=media-libs/flac-1.1.2
-	media-libs/libmad
-	>=media-libs/musicbrainz-2.1.0
-	=media-libs/musicbrainz-2*
-	media-libs/libofa
-	media-libs/libvorbis
-	!media-sound/trm
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s: tta::" configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	# We need to override distutils_src_compile, bug 160145
-	econf || die 'econf failed'
-	emake || die 'emake failed'
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-	if use python; then
-		cd "${S}/python"
-		distutils_src_install
-		insinto /usr/share/doc/${PF}/examples/
-		doins examples/*
-	fi
-}