Make FLAC++ optional, enabled by default thanks to EAPI=1

Package-Manager: portage-2.1.3.19

4 files changed, 89 insertions, 5 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 17e57f3722a5..bdcaab2608e5 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.132 2007/11/01 19:07:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.133 2007/11/18 19:22:16 aballier Exp $
+
+*flac-1.2.1-r2 (18 Nov 2007)
+
+  18 Nov 2007; Alexis Ballier <aballier@gentoo.org> +flac-1.2.1-r2.ebuild:
+  Make FLAC++ optional, enabled by default thanks to EAPI=1
 
   01 Nov 2007; Raúl Porcel <armin76@gentoo.org> flac-1.2.1-r1.ebuild:
   sparc stable, thanks to Alex Maclean for testing
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index ded97ee90498..59b0174d8172 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SHA1 9cf5708bcc181b66632868e95e23a84b0a1644af SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b
 MD5 123897707d3c91abadf526b9163a01c0 files/flac-1.2.1-asm.patch 2844
 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 files/flac-1.2.1-asm.patch 2844
@@ -27,10 +30,14 @@ EBUILD flac-1.2.1-r1.ebuild 1441 RMD160 31117fe1a522d99d25e0f6851c0aee4eefa738a9
 MD5 0d4bdf5b0c8553d1a16bcf9713eb31ea flac-1.2.1-r1.ebuild 1441
 RMD160 31117fe1a522d99d25e0f6851c0aee4eefa738a9 flac-1.2.1-r1.ebuild 1441
 SHA256 a751f26ea7719463dd6bdcf37087ffb891a497f9e02cc72d4492917477bc6835 flac-1.2.1-r1.ebuild 1441
-MISC ChangeLog 18428 RMD160 39408e3ceb66630c07b209fbb529980d8c885ff3 SHA1 7f461a406e168e72175f6cf12bffb113e587dec2 SHA256 617a6be676ab2b6b08ce7076b3bb36cb7787e2112dfefb1609297eebc37435b3
-MD5 9566f251ff653401851a44f6331e6c0d ChangeLog 18428
-RMD160 39408e3ceb66630c07b209fbb529980d8c885ff3 ChangeLog 18428
-SHA256 617a6be676ab2b6b08ce7076b3bb36cb7787e2112dfefb1609297eebc37435b3 ChangeLog 18428
+EBUILD flac-1.2.1-r2.ebuild 1494 RMD160 8daf0e7f0c6be3d5c747b035bade67f1f51a048b SHA1 9d16cbc8f4038b5fe73ccd81d744869272fa95e8 SHA256 3405d6dca45fb56325b466df2a6308be70843ea9ab1644d7d35dc6d931487b45
+MD5 8f58d9b10c56ae90ed2ea34077422884 flac-1.2.1-r2.ebuild 1494
+RMD160 8daf0e7f0c6be3d5c747b035bade67f1f51a048b flac-1.2.1-r2.ebuild 1494
+SHA256 3405d6dca45fb56325b466df2a6308be70843ea9ab1644d7d35dc6d931487b45 flac-1.2.1-r2.ebuild 1494
+MISC ChangeLog 18595 RMD160 ea5b92fbf3114ed3570f780a204018d2de4699fb SHA1 772ef569b597689fb252a2921184ccc6ec97eb1d SHA256 8aafc83fb20af2e1be4322838eec652b5cdc713b957647b3a6f860afff15c32a
+MD5 6ac6d3749de4a338616221a6deab2076 ChangeLog 18595
+RMD160 ea5b92fbf3114ed3570f780a204018d2de4699fb ChangeLog 18595
+SHA256 8aafc83fb20af2e1be4322838eec652b5cdc713b957647b3a6f860afff15c32a ChangeLog 18595
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -44,3 +51,13 @@ SHA256 b89c8cb30133ab8c8b6bdefddb9e994fcfec1264c6a57c2155fca2470f369809 files/di
 MD5 8c7d52c68177f53a96c7e8abb29e76f2 files/digest-flac-1.2.1-r1 235
 RMD160 dd7c4777804d72a8a3b75166d75a029e24264033 files/digest-flac-1.2.1-r1 235
 SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/digest-flac-1.2.1-r1 235
+MD5 8c7d52c68177f53a96c7e8abb29e76f2 files/digest-flac-1.2.1-r2 235
+RMD160 dd7c4777804d72a8a3b75166d75a029e24264033 files/digest-flac-1.2.1-r2 235
+SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/digest-flac-1.2.1-r2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQJEIvFcC4BYPU0oRAhcAAJ9j9PCctZkvaEG5F4xkBhXJqN54rACeMZjv
+XvThcNCuA0mJTwofPDEjw20=
+=QtRQ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.2.1-r2 b/media-libs/flac/files/digest-flac-1.2.1-r2
new file mode 100644
index 000000000000..061357afea8b
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.2.1-r2
@@ -0,0 +1,3 @@
+MD5 153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz 2009217
+RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc flac-1.2.1.tar.gz 2009217
+SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf flac-1.2.1.tar.gz 2009217
diff --git a/media-libs/flac/flac-1.2.1-r2.ebuild b/media-libs/flac/flac-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..7bff4e7a0a34
--- /dev/null
+++ b/media-libs/flac/flac-1.2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r2.ebuild,v 1.1 2007/11/18 19:22:16 aballier Exp $
+
+EAPI="1"
+
+inherit autotools eutils
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow altivec +cxx debug doc ogg sse"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Stop using upstream CFLAGS. Fix building with
+	# ldflag asneeded on non glibc systems. Fix
+	# broken asm causing text relocations.
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-asm.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable ogg) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable debug) \
+		$(use_enable cxx cpplibs) \
+		--disable-doxygen-docs \
+		--disable-dependency-tracking \
+		--disable-xmms-plugin
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	rm -rf "${D}"/usr/share/doc/flac-1.2.1
+	dodoc AUTHORS README
+	use doc && dohtml -r doc/html/*
+}