introduced more useflag to get more control over the resulting binaries. enhancements suggested by Diego Pettenò' <dgp85@users.sourceforge.net>, fixes #82741

(Portage version: 2.0.51.19)

3 files changed, 31 insertions, 19 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index e87471c9afa0..0ba22ae1fdc8 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.51 2005/04/08 18:55:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.52 2005/04/15 18:01:27 luckyduck Exp $
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> flac-1.1.2.ebuild:
+  introduced more useflag to get more control over the resulting binaries.
+  enhancements suggested by Diego Pettenò <dgp85@users.sourceforge.net>, fixes
+  #82741
 
   08 Apr 2005; Markus Rothe <corsair@gentoo.org> flac-1.1.1.ebuild:
   Stable on ppc64
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index a74c700d1468..bde8e9fe58e0 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,21 +1,21 @@
-MD5 03aa68124b0e3f17f222ace0ee385932 ChangeLog 6762
 MD5 6ab3635d825a48fba589f342fb7e72b1 flac-1.1.0-r1.ebuild 1564
-MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
-MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
 MD5 7fc4626617f89879ae4b42a52a46ada2 flac-1.1.1.ebuild 1648
-MD5 b62680ec8c3ea069b0c9d229ae93a8ee flac-1.1.2.ebuild 1634
+MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
+MD5 08f817fac902f6d687df6bfe3b975006 ChangeLog 6998
+MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
+MD5 a3f4637f5d58f2aab30ad5f9182adf57 flac-1.1.2.ebuild 1881
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
+MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
 MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2 63
-MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
-MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
-MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
-MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
-MD5 1faa1c73bc3f7236f9677ed41e22ef33 files/flac-1.1.2-gas.patch 735
-MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
+MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175
+MD5 1faa1c73bc3f7236f9677ed41e22ef33 files/flac-1.1.2-gas.patch 735
+MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511
diff --git a/media-libs/flac/flac-1.1.2.ebuild b/media-libs/flac/flac-1.1.2.ebuild
index 141f6fb7d056..c9ef8b38dd2f 100644
--- a/media-libs/flac/flac-1.1.2.ebuild
+++ b/media-libs/flac/flac-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.6 2005/02/21 16:55:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2.ebuild,v 1.7 2005/04/15 18:01:27 luckyduck Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -11,13 +11,14 @@ SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="sse xmms"
+IUSE="3dnow debug doc ogg sse xmms"
 
-RDEPEND=">=media-libs/libogg-1.0_rc2
+RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
 	xmms? ( media-sound/xmms )"
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
-	sys-apps/gawk"
+	sys-apps/gawk
+	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
@@ -36,17 +37,23 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable sse) || die
+	use doc || export ac_cv_prog_DOXYGEN=''
+	econf \
+		$(use_with ogg ogg /usr) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable debug) \
+		--disable-dependency-tracking || die
 
 	# the man page ebuild requires docbook2man... yick!
 	sed -i -e 's:include man:include:g' Makefile
 
 	# emake seems to mess up the building of the xmms input plugin
-	make || die
+	make || die "make failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS README
 
 	# Keep around old lib