Remove XMMS requests, fixes #82721. Added configure param to disable ogg, fixes #91513.

(Portage version: 2.0.51.21-r1)

4 files changed, 38 insertions, 21 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index c016aabbedd8..fed65259e16c 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.57 2005/05/03 20:24:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.58 2005/05/07 01:09:22 flameeyes Exp $
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/flac-1.1.2-noogg.patch, flac-1.1.2-r1.ebuild:
+  Remove XMMS requests, fixes #82721. Added configure param to disable ogg,
+  fixes #91513.
 
 *flac-1.1.2-r1 (03 May 2005)
 
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 5db97a8d468c..b3ffce4f6c90 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,14 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4779463bd48c1574b6e68f512bfa99b6 ChangeLog 7443
 MD5 11a4150b0b0e5afd83bdc21d32e25e72 flac-1.1.0-r2.ebuild 1368
 MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
-MD5 661ec9fa473e205dfbacf367dfb742b6 flac-1.1.2-r1.ebuild 1859
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 0b0d3adee8366b72e36272ea752dce76 flac-1.1.1.ebuild 1643
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f16e13054d425f1ce20ef22999b0ca20 flac-1.1.2-r1.ebuild 1891
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
-MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r1 63
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
 MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
@@ -20,11 +16,6 @@ MD5 1faa1c73bc3f7236f9677ed41e22ef33 files/flac-1.1.2-gas.patch 735
 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175
 MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511
+MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r1 63
 MD5 96fbd16daecafb18ff0c203d9d041ee2 files/flac-1.1.2-xmms-config.patch 373
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeDFZArHZZzCEUG0RAh7OAJ97TeqQUM6PZIH8GOG6WPkkW+QXEgCffZEn
-hcvkxySDtsbVWk4Z/ZDuCm0=
-=W/P/
------END PGP SIGNATURE-----
+MD5 c1f9ecf4351858a72b4767313277455c files/flac-1.1.2-noogg.patch 807
diff --git a/media-libs/flac/files/flac-1.1.2-noogg.patch b/media-libs/flac/files/flac-1.1.2-noogg.patch
new file mode 100644
index 000000000000..ec901aefdf45
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.2-noogg.patch
@@ -0,0 +1,19 @@
+diff -x '*~' -ur flac-1.1.2/configure.in flac-1.1.2-noogg/configure.in
+--- flac-1.1.2/configure.in	2005-02-03 06:03:25.000000000 +0100
++++ flac-1.1.2-noogg/configure.in	2005-05-07 02:37:21.504620688 +0200
+@@ -151,7 +151,14 @@
+ fi
+ 
+ dnl check for ogg library
+-XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
++AC_ARG_ENABLE([ogg],
++	AC_HELP_STRING([--disable-ogg], [Disable ogg support (default:test)]),
++	[ want_ogg=$enableval ], [ want_ogg=yes ] )
++
++if test "x$want_ogg" != "xno"; then
++	XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
++fi
++
+ AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
+ if test x$have_ogg = xyes ; then
+ AC_DEFINE(FLAC__HAS_OGG)
diff --git a/media-libs/flac/flac-1.1.2-r1.ebuild b/media-libs/flac/flac-1.1.2-r1.ebuild
index 6e97168d736e..32be7e08c09f 100644
--- a/media-libs/flac/flac-1.1.2-r1.ebuild
+++ b/media-libs/flac/flac-1.1.2-r1.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-r1.ebuild,v 1.2 2005/05/04 02:19:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r1.ebuild,v 1.3 2005/05/07 01:09:22 flameeyes Exp $
 
 inherit libtool eutils flag-o-matic gcc
 
@@ -27,13 +27,15 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-xmms-config.patch
 	else
 		sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die
+		sed -i -e '/AM_PATH_XMMS/d' configure.in || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-libtool.patch
-	epatch "${FILESDIR}"/${P}-gas.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	./autogen.sh
+	epatch "${FILESDIR}/${P}-m4.patch"
+	epatch "${FILESDIR}/${P}-libtool.patch"
+	epatch "${FILESDIR}/${P}-gas.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}/${P}-noogg.patch"
+	./autogen.sh || die "autogen failed"
 	libtoolize --copy --force
 	elibtoolize --reverse-deps
 }
@@ -41,7 +43,7 @@ src_unpack() {
 src_compile() {
 	use doc || export ac_cv_prog_DOXYGEN=''
 	econf \
-		$(use_with ogg ogg /usr) \
+		$(use_enable ogg) \
 		$(use_enable sse) \
 		$(use_enable 3dnow) \
 		$(use_enable debug) \