New version, that does not invalidate the configure cache (and adds a --disable-doc configure option). Also installs the user documentation in the right directory for Gentoo. Use eautoreconf to rebuild autotools support, and add the m4 file via patch instead than copying it. Install man page shipped with the package (and don't regenerate them).

Package-Manager: portage-2.0.53_rc7

4 files changed, 87 insertions, 5 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 3a76520d2fd9..e7da6906e0aa 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,15 @@
 # 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.77 2005/11/26 00:23:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.78 2005/11/28 12:21:24 flameeyes Exp $
+
+*flac-1.1.2-r4 (28 Nov 2005)
+
+  28 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> +flac-1.1.2-r4.ebuild:
+  New version, that does not invalidate the configure cache (and adds a
+  --disable-doc configure option). Also installs the user documentation in the
+  right directory for Gentoo. Use eautoreconf to rebuild autotools support,
+  and add the m4 file via patch instead than copying it. Install man page
+  shipped with the package (and don't regenerate them).
 
   26 Nov 2005; Mark Loeser <halcy0n@gentoo.org> flac-1.1.2-r3.ebuild:
   Stable on x86; bug #113519
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 85cb883b8b79..db6d28ef3065 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4a558846741378f7d13af1e67b006fc2 ChangeLog 10389
+MD5 28fb92af22a62fc02a7db934c4bcab28 ChangeLog 10855
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
 MD5 7070b10e66383782b73856e6dc37ba70 files/digest-flac-1.1.2-r3 128
+MD5 56e6ece9916c60a6cbc372bc6177e082 files/digest-flac-1.1.2-r4 128
 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 fd56b1b8ffec55c61c135ead55df01e6 flac-1.1.1.ebuild 1650
 MD5 b78da34d0be8ea0197bbcec57537e7bf flac-1.1.2-r3.ebuild 1774
+MD5 eff31071fae53fed4a82458af09000ca flac-1.1.2-r4.ebuild 1833
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDh6r2CRZPokWLroQRAq1CAKCtbvBA8gHbFNsZrTew8wvTWhkPxACdE7qH
-pKYzH4JkivDlcqMbYkz2hwk=
-=BFKQ
+iD8DBQFDivZQAiZjviIA2XgRAlcTAJ9db/2ywFYedz/dXh189B9giO72EACfZa66
+yQ47vS9H967QLgIHLItYoQg=
+=r3ch
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r4 b/media-libs/flac/files/digest-flac-1.1.2-r4
new file mode 100644
index 000000000000..1a661936e079
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.2-r4
@@ -0,0 +1,2 @@
+MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
+MD5 3bc4571a2fd8261e98921e43121b8e1a flac-patches-2.tar.bz2 4768
diff --git a/media-libs/flac/flac-1.1.2-r4.ebuild b/media-libs/flac/flac-1.1.2-r4.ebuild
new file mode 100644
index 000000000000..728398ad9f58
--- /dev/null
+++ b/media-libs/flac/flac-1.1.2-r4.ebuild
@@ -0,0 +1,69 @@
+# 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-r4.ebuild,v 1.1 2005/11/28 12:21:24 flameeyes Exp $
+
+inherit libtool eutils flag-o-matic autotools
+
+PATCHLEVEL="2"
+DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
+HOMEPAGE="http://flac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flac/${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 ~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 )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Have to force this or the m4 file is not applied correctly
+	EPATCH_SUFFIX="patch" \
+	EPATCH_OPTS="-p1 ${EPATCH_OPTS}" \
+		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) \
+		--disable-dependency-tracking || die
+
+	# the man page ebuild requires docbook2man... yick!
+	sed -i -e 's:include man:include:g' Makefile
+
+	# parallel make seems to mess up the building of the xmms input plugin
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
+		install || die "make install failed"
+	dodoc AUTHORS README
+
+	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:"
+	ewarn "revdep-rebuild"
+}
+
+# see #59482
+src_test() { :; }