Disable gcdmaster if GCC is equal to or less than 3 wrt #230415. Rename USE flags ogg and mp3 to vorbis and mad as they should be.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 32 insertions, 41 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 1879107d4dea..d42552e07c78 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.134 2009/07/08 14:48:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.135 2009/07/14 09:07:08 ssuominen Exp $
+
+  14 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  cdrdao-1.2.3_rc2.ebuild:
+  Disable gcdmaster if GCC is equal to or less than 3 wrt #230415. Rename
+  USE flags ogg and mp3 to vorbis and mad as they should be.
 
   08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
   cdrdao-1.2.3_rc2.ebuild:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 240384f9ecdd..aa182f83ba84 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cdrdao-1.2.2-cdtext.patch 789 RMD160 8705b98f561ee698003bdecf9cd0739ce4a9fa7a SHA1 4b600e4cf8424f1922c01b6c69334f4567db82dc SHA256 f845fbb3870fe8a59471bf80f490a4859e5b1c23dcc8cffbbf8d82f3e9349def
 AUX cdrdao-1.2.2-device.patch 565 RMD160 e9989318abba5f9f290c0f80849ac3e3e231feea SHA1 dafb33325a9fd57e602135497c34e9cbcfd8e819 SHA256 8791ec4fc14196a7314932d95ed9119730480ea5cf1a8f94e65f986c25b9f0fa
 AUX cdrdao-1.2.2-excl.patch 2476 RMD160 71e1b06eea119141910798a3c44dddc4a0b6436c SHA1 285e1ebc2f571851c192da758a78b7614a7a3983 SHA256 c0790bfd26336427448bdd50026aad95c119a1ee23ab8c84750fba442ba8bff3
@@ -19,13 +16,6 @@ DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e
 DIST cdrdao-1.2.3rc2.tar.bz2 1435808 RMD160 60410652940fd271b272b74d4554986c86115787 SHA1 d23c756400f728cecbcc901ecadb1eea44c70e97 SHA256 2cd174111ed3de68d3b93333ae85cd376455598d6d355bcef94771bf047a5e08
 EBUILD cdrdao-1.2.2-r2.ebuild 2099 RMD160 11a65ea4439b883339fa195ff135a415487aa2fe SHA1 bbdfc4f5160bc1ba3590559f438a6b58a6df3a9c SHA256 4ef6d4fc2323dd18fb7bdab6c340a0b4a746f75bdaece5d8af2c7ee637e3d81a
 EBUILD cdrdao-1.2.2-r3.ebuild 2864 RMD160 cc0bab9ee9a0a1e5ed8543e422473c139313e87f SHA1 d96112ca904dfc76e9551b78892182271e318dda SHA256 6880bb12e34859fc0a0a9944082f44110845393128833cfcddfd41fa4fb3a351
-EBUILD cdrdao-1.2.3_rc2.ebuild 2113 RMD160 f75d03b748c56a569f02f3c76a8951c3b49795d7 SHA1 d956af26deb53bfe64117515f47a68e5972d4df1 SHA256 882e876887370292f87493cb12762396e2144a7c1c6ed5701bcf75627fd0aa6f
-MISC ChangeLog 18612 RMD160 9a28119db725eb0c8b418242ec3ca9c822b0f802 SHA1 55253b9e8c93b174ef96e9ab4e551d71bd8e7919 SHA256 2edf48454017a192a24bf221cffd171d4c3f84fdb9cb1d424cfb5e47152795ac
+EBUILD cdrdao-1.2.3_rc2.ebuild 2201 RMD160 2c314a40bf5857bafb172131f0814ad06a4786c2 SHA1 42dde9a323cf4325b315981f70ae4b573378dcf9 SHA256 9a2476870c6f618095fc80f3a2b3498c08d524270f4f25d818fe6e88f542d70e
+MISC ChangeLog 18833 RMD160 ef6d7856355cdf39f1933e0d331becf797f0c6ba SHA1 8b9c1f788b6b5a00b54a3696312be65157799733 SHA256 d035692bf0411c6c538f5eddc50b5249ef59e695f0e6b1107560fd55c40879f8
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpUscoACgkQNQqtfCuFneNMEACdGZiKbZr6qiq/qr+KIOaNaL3L
-0KIAn2A5odEgcryhV3XIuFvvq14qP6Ge
-=3Syz
------END PGP SIGNATURE-----
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
index 64017ecd2c48..c6b5878652ee 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.4 2009/07/08 14:48:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild,v 1.5 2009/07/14 09:07:08 ssuominen Exp $
 
 EAPI=2
-inherit eutils flag-o-matic eutils autotools
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
@@ -17,7 +17,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="gcdmaster encode pccts mp3 ogg"
+IUSE="gcdmaster encode pccts mad vorbis"
 
 RDEPEND="virtual/cdrtools
 	encode? ( >=media-sound/lame-3.90 )
@@ -26,22 +26,17 @@ RDEPEND="virtual/cdrtools
 		>=dev-cpp/libgnomecanvasmm-2.6
 		>=dev-cpp/gconfmm-2.6
 		>=dev-cpp/libgnomeuimm-2.6
-		media-libs/libao
-	)
-	mp3? (
-		media-libs/libmad
-		media-libs/libao
-	)
-	ogg? (
-		media-libs/libvorbis
-		media-libs/libao
-	)
-	"
+		media-libs/libao )
+	mad? ( media-libs/libmad
+		media-libs/libao )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libao )"
 DEPEND="${RDEPEND}
 	pccts? ( >=dev-util/pccts-1.33.24-r1 )
 	!app-cdr/cue2toc"
 
-S="${WORKDIR}/${P/_}"
+MAKEOPTS="${MAKEOPTS} -j1"
+S=${WORKDIR}/${P/_}
 
 src_prepare() {
 	# Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track.
@@ -61,23 +56,24 @@ src_prepare() {
 }
 
 src_configure() {
-	# A few CFLAGS do not work see bug #99998
-	#strip-flags
-	#append-flags "-fno-inline"
+	local myconf
 
-	econf \
-		$(use_with gcdmaster xdao)		\
-		$(use_with encode lame)			\
-		$(use_with mp3 mp3-support)		\
-		$(use_with ogg ogg-support)		\
-		--disable-dependency-tracking || die "configure failed"
-}
+	# GCC 3.x isn't safe wrt bug #230415
+	if [[ $(gcc-major-version) -le 3 ]]; then
+		myconf="--without-xdao"
+		use gcdmaster && ewarn "You need GCC 4.x for gcdmaster to be built."
+	fi
 
-src_compile() {
-	emake -j1 || die "could not compile"
+	econf \
+		$(use_with gcdmaster xdao) \
+		$(use_with encode lame) \
+		$(use_with mad mp3-support) \
+		$(use_with vorbis ogg-support) \
+		--disable-dependency-tracking \
+		${myconf}
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS CREDITS ChangeLog NEWS README*
 }