Fixed noogg patch to actually work when libogg is not installed.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 97 insertions, 8 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index a39718cb8150..c01cc8faae5d 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.62 2005/05/23 19:49:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.63 2005/06/12 07:59:04 chriswhite Exp $
+
+*flac-1.1.2-r2 (12 Jun 2005)
+
+  12 Jun 2005; Chris White <chriswhite@gentoo.org> +flac-1.1.2-r2.ebuild:
+  Fixed noogg patch to actually work when libogg is not installed.
 
   23 May 2005; Aron Griffis <agriffis@gentoo.org> flac-1.1.1.ebuild:
   stable on alpha
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index eba75755951c..dfbf176fe053 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,21 +1,33 @@
-MD5 31317f855ae7376ca7b030d7ad82c9d5 ChangeLog 8098
-MD5 4f214a8b2236782cf91e8b09f5999f31 flac-1.1.2-r1.ebuild 1960
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67e3eef6d421987077e1bd1307dafe81 ChangeLog 8272
+MD5 67683a1745142256ab2198a061ac85e0 flac-1.1.2-r2.ebuild 1961
 MD5 038e7f5da79649a9aec46a9b894325e5 flac-1.1.0-r2.ebuild 1380
 MD5 8a5f0b8e9adfd2c0b322c917dae6b379 flac-1.1.0.ebuild 1550
 MD5 5010869f58e1cae9bf250cfe95b22e3f flac-1.1.1.ebuild 1651
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
-MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
+MD5 4f214a8b2236782cf91e8b09f5999f31 flac-1.1.2-r1.ebuild 1960
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
-MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+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
+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 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
-MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r1 63
+MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r2 63
 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 96fbd16daecafb18ff0c203d9d041ee2 files/flac-1.1.2-xmms-config.patch 373
 MD5 c1f9ecf4351858a72b4767313277455c files/flac-1.1.2-noogg.patch 807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCq+toFdQwWVoAgN4RAr5QAKCdBEuo1X5OkWVEwwTgYrM7hngblACgoI8W
+FHvzDxx4KnaumwX34urDQxM=
+=XFwy
+-----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r2 b/media-libs/flac/files/digest-flac-1.1.2-r2
new file mode 100644
index 000000000000..ff97332b0a84
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.2-r2
@@ -0,0 +1 @@
+MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
diff --git a/media-libs/flac/flac-1.1.2-r2.ebuild b/media-libs/flac/flac-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..f981dde00905
--- /dev/null
+++ b/media-libs/flac/flac-1.1.2-r2.ebuild
@@ -0,0 +1,71 @@
+# 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-r2.ebuild,v 1.1 2005/06/12 07:59:04 chriswhite Exp $
+
+inherit libtool eutils flag-o-matic
+
+DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
+HOMEPAGE="http://flac.sourceforge.net/"
+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="3dnow debug doc ogg sse xmms"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
+	xmms? ( media-sound/xmms )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use xmms ; then
+		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"
+	epatch "${FILESDIR}/${P}-noogg.patch"
+	./autogen.sh || die "autogen failed"
+	libtoolize --copy --force
+	elibtoolize --reverse-deps
+}
+
+src_compile() {
+	use doc || export ac_cv_prog_DOXYGEN=''
+	econf \
+		$(use_enable ogg) \
+		$(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 failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README
+}
+
+pkg_postinst() {
+	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
+	ewarn "packages that linked against flac by running:"
+	ewarn "revdep-rebuild"
+}
+
+# see #59482
+src_test() { :; }