bump to EAPI=4, solving bug #378519.

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

3 files changed, 35 insertions, 28 deletions

diff --git a/app-cdr/cuecue/ChangeLog b/app-cdr/cuecue/ChangeLog
index 28c2afa395ae..75479ac9ef6a 100644
--- a/app-cdr/cuecue/ChangeLog
+++ b/app-cdr/cuecue/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cuecue
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuecue/ChangeLog,v 1.9 2009/03/10 22:08:00 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuecue/ChangeLog,v 1.10 2011/10/20 13:37:50 sbriesen Exp $
+
+  20 Oct 2011; Stefan Briesenick <sbriesen@gentoo.org> cuecue-0.2.2-r1.ebuild:
+  bump to EAPI=4, solving bug #378519.
 
   10 Mar 2009; Steve Dibb <beandog@gentoo.org> cuecue-0.2.2-r1.ebuild:
   Enable vorbis by default, bug 254745
diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
index 93c4026a6124..1adb4865c44b 100644
--- a/app-cdr/cuecue/Manifest
+++ b/app-cdr/cuecue/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cuecue-0.2.2-flac113.diff 3659 RMD160 e87e57e37767659b582582217882aa88e60341ad SHA1 1ff60a0e65f0e93e5b4b58c915ff62295dedb8a4 SHA256 8c609312b0833a0c5a797c32b0bf80f4d2388733d754057e7c19075bdbfde436
 DIST cuecue-0.2.2.tar.gz 97927 RMD160 a456c197f83cbd303f06922c6c3c7f7c40ce752b SHA1 761c81164cb1cc28abeb1309fdc066d857da51cd SHA256 dbab57f1df3e50d041ba8cad0ee0851c1aea97c4685f89fd1d3259b4b79f081f
-EBUILD cuecue-0.2.2-r1.ebuild 1404 RMD160 315ebdb5ea92e4d4b0be8f5afae6dc55efa655ed SHA1 a369bfad88a6b5561d61287515fff221f9d58b94 SHA256 ba8d8a39bd8f8437afbcd15358136f7a1bb3dece53c446a66df3fbd605b4dd59
-MISC ChangeLog 1445 RMD160 b6cefa60a4a90bb9ee4acee2897c77efb7d67091 SHA1 edc9b7aed4131904b663a53393ceb27a49f8ce85 SHA256 5d14409ac2e6156574d08b4cd852655c4f92998fb099bad92f1d861eb1480e86
+EBUILD cuecue-0.2.2-r1.ebuild 1211 RMD160 db1ddc4c138e48eb54fd5bb4d6edbd6389370417 SHA1 dce53f223934297eb328e6a08aed96ec6f8f33df SHA256 0602d66ca4eaa0fd73650354c69a42a7c29e547fe6a3df9033c593c42cd2d5be
+MISC ChangeLog 1566 RMD160 53995f2dc8fc102e5a2b3b1d20ac0138f5f830ff SHA1 817fbc690a9c0faa8b7877752a56b0d50d951859 SHA256 190bc989b897dfc0d73626dcdaa850b6df76816bf520149ddebf8fc3094262b3
 MISC metadata.xml 478 RMD160 557844c9151ce0cf25df1e3c1bf734e2d01975e3 SHA1 7aa4f63178a6c831bb2e8fbf4629d36f45b97b68 SHA256 5a80387bc6e9c67456afef325cc236b8b5d81a8f37dca278b0e650e8581c7399
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQECAAYFAk6gJEkACgkQIaLonLtsQsd7wgP9FArIk1XvTR8fK6dE9AhFPyxF
+ePORqf6GwOTsaO5NoKupz6vhM6214cEcSz3v7yaMo9TMc0o19IaCHEfSV7hkuh96
+0abmw4/r/CiBg/CVZHn91lG0zzPHSOJOGGR7vrCtYA1uZxLU6y/w4OzZdaWDZSY/
+dFzzo4ragVFiPKsIxF0=
+=GbHP
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild
index af3b87da5845..d0e722fe2a13 100644
--- a/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild
+++ b/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild,v 1.5 2009/03/10 22:08:00 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild,v 1.6 2011/10/20 13:37:50 sbriesen Exp $
 
-EAPI="1"
-inherit eutils
+EAPI=4
+
+inherit base eutils flag-o-matic
 
 DESCRIPTION="Cuecue is a suite to convert .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin."
 HOMEPAGE="http://cuecue.berlios.de/"
@@ -14,26 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # Enable one use flag by default, bug 254745"
 IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
 
 DEPEND="mp3? ( media-libs/libmad )
 	flac? ( media-libs/flac )
 	vorbis? ( media-libs/libvorbis media-libs/libogg )"
 
-pkg_setup() {
-	for X in ${IUSE}; do
-		use ${X} && return 0
-	done
-	eerror "You must enable at least one of these USE flags: ${IUSE}"
-	die "no format, no compile! ;-)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flac113.diff # bug 157706
-}
+PATCHES=( "${FILESDIR}/${P}-flac113.diff" ) # bug 157706
+DOCS="CHANGES README TODO"
 
-src_compile() {
+src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable mp3) \
@@ -41,16 +32,17 @@ src_compile() {
 		--disable-oggtest \
 		--disable-vorbistest \
 		$(use_enable flac) \
-		--disable-libFLACtest \
-		|| die "econf failed."
+		--disable-libFLACtest
+}
 
-	emake CFLAGS="-ansi -pedantic ${CFLAGS}" \
-		|| die "emake failed."
+src_compile() {
+	# fixes portage QA notice
+	append-flags "-ansi -pedantic"
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	default
 	insinto /usr/include
 	doins src/libcuecue/cuecue.h || die "doins failed."
-	dodoc CHANGES README TODO
 }