Bump to flac-1.1.3 final, fix AM_PATH_XMMS removal.

Package-Manager: portage-2.1.2_rc2-r3

5 files changed, 93 insertions, 5 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 006487743765..056ad78b5e61 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.96 2006/11/25 11:07:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.97 2006/12/03 15:09:50 flameeyes Exp $
+
+*flac-1.1.3 (03 Dec 2006)
+
+  03 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> flac-1.1.2-r3.ebuild,
+  flac-1.1.2-r8.ebuild, -flac-1.1.3_beta2.ebuild, +flac-1.1.3.ebuild:
+  Bump to flac-1.1.3 final, fix AM_PATH_XMMS removal.
 
   25 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> flac-1.1.2-r3.ebuild,
   flac-1.1.2-r8.ebuild, flac-1.1.3_beta2.ebuild:
diff --git a/media-libs/flac/files/digest-flac-1.1.3 b/media-libs/flac/files/digest-flac-1.1.3
new file mode 100644
index 000000000000..564097663f11
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.3
@@ -0,0 +1,6 @@
+MD5 b084603948b60ee338e0c29978cc580c flac-1.1.3.tar.gz 1592699
+RMD160 3bb360940775b6b2a5127accfb12d29c04da1132 flac-1.1.3.tar.gz 1592699
+SHA256 ba0bf8b4720537b08aba9b0d2d5b3fbe796ce9957a56334354a2f95694866a7c flac-1.1.3.tar.gz 1592699
+MD5 0edb6d5e4056ebef93f953d4753a809e flac-patches-10.tar.bz2 4620
+RMD160 ef1a4d223bdf3648a5d341c997e38f2ea30fe130 flac-patches-10.tar.bz2 4620
+SHA256 6a9fed09dff2ba5cda4200081a66cfcab8e6ffa77685f1e4aa962362c09b98bb flac-patches-10.tar.bz2 4620
diff --git a/media-libs/flac/flac-1.1.2-r3.ebuild b/media-libs/flac/flac-1.1.2-r3.ebuild
index 2b21f303f865..fa52e6f3a0ee 100644
--- a/media-libs/flac/flac-1.1.2-r3.ebuild
+++ b/media-libs/flac/flac-1.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.14 2006/11/25 11:07:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r3.ebuild,v 1.15 2006/12/03 15:09:50 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -30,7 +30,7 @@ src_unpack() {
 	cd "${S}"
 
 	# Hard-disable the XMMS plugin now that XMMS is removed.
-	sed -i -e '/AM_PATH_XMMS/d' "${S}/configure.in"
+	sed -i -e '/AM_PATH_XMMS/s:^.*$:true:' "${S}/configure.in"
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
 
diff --git a/media-libs/flac/flac-1.1.2-r8.ebuild b/media-libs/flac/flac-1.1.2-r8.ebuild
index caf8f1db21cf..3dd27edbef9e 100644
--- a/media-libs/flac/flac-1.1.2-r8.ebuild
+++ b/media-libs/flac/flac-1.1.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r8.ebuild,v 1.3 2006/11/25 11:07:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r8.ebuild,v 1.4 2006/12/03 15:09:50 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -36,7 +36,7 @@ src_unpack() {
 		export EPATCH_EXCLUDE="130_all_visibility.patch 140_all_visibility-xmms.patch 160_all_protected.patch"
 
 	# Hard-disable the XMMS plugin now that XMMS is removed.
-	sed -i -e '/AM_PATH_XMMS/d' "${S}/configure.in"
+	sed -i -e '/AM_PATH_XMMS/s:^.*$:true:' "${S}/configure.in"
 
 	EPATCH_SUFFIX="patch" \
 	epatch "${WORKDIR}/patches"
diff --git a/media-libs/flac/flac-1.1.3.ebuild b/media-libs/flac/flac-1.1.3.ebuild
new file mode 100644
index 000000000000..3a364b963cdc
--- /dev/null
+++ b/media-libs/flac/flac-1.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.3.ebuild,v 1.1 2006/12/03 15:09:50 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit libtool eutils toolchain-funcs autotools
+
+MY_P="${P/_beta/-beta}"
+
+PATCHLEVEL="10"
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flac/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow debug doc ogg sse"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Enable only for GCC 4.1 and later
+	[[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] || \
+		export EPATCH_EXCLUDE="130_all_visibility.patch 160_all_protected.patch"
+
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		$(use_enable ogg) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable debug) \
+		$(use_enable doc doxygen-docs) \
+		--disable-dependency-tracking || die
+
+	# the man page ebuild requires docbook2man... yick!
+	sed -i -e 's:include man:include:g' Makefile
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
+		install || die "make install failed"
+	dodoc AUTHORS README
+
+	use doc || rm -rf "${D}/usr/share/doc/${PF}/api"
+
+	doman man/{flac,metaflac}.1
+}
+
+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 revdep-rebuild"
+}