Revbump to fix build issue with audiofile-0.3.1 (bug #385317 by SpanKY).

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 119 insertions, 3 deletions

diff --git a/media-sound/normalize/ChangeLog b/media-sound/normalize/ChangeLog
index e88e06e7dbaa..9fac9574d410 100644
--- a/media-sound/normalize/ChangeLog
+++ b/media-sound/normalize/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/normalize
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.28 2007/10/15 14:39:12 corsair Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.29 2011/10/27 10:17:51 radhermit Exp $
+
+*normalize-0.7.7-r1 (27 Oct 2011)
+
+  27 Oct 2011; Tim Harder <radhermit@gentoo.org> +normalize-0.7.7-r1.ebuild:
+  Revbump to fix build issue with audiofile-0.3.1 (bug #385317 by SpanKY).
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> normalize-0.7.7.ebuild:
   Stable on ppc64
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
index 003598a45bd4..ca2a74e75a9d 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -1,4 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 RMD160 359a0b3c5aeb02b42cf7702b17cc816be46fe1ea SHA1 f832dc85c741db35bb270ff35b50b649b4987d0e SHA256 cb39b0b0ddcdac6b87fc1329307f7c8f2c15fc2d6718823b6d8d46ab1a0b84b8
+DIST normalize-0.7.7-m4.patch.gz 5078 RMD160 0bcde8a203f5d1d71d2cc5e895d5cc661d27a5a6 SHA1 5095f66c02505de5c38821881259afbe62ada28f SHA256 8ac7d9e980f2534f7f2f7c81a7fc9f5dda90ac60cfe6675785f371a43ef6518a
 DIST normalize-0.7.7.tar.bz2 388777 RMD160 cfb47808816da4196b7d87033921716bf13f212d SHA1 1d84a9e1cd50b24ebb99428452604dd1fb78be9d SHA256 ef9d8558515cc942518981d3db8fa2490fba6d6b5b74e0a3b75336fbc66c6bd8
+EBUILD normalize-0.7.7-r1.ebuild 1045 RMD160 0a019d808a7ecfab10db430d8eb72e150e4a5bf9 SHA1 969be44f45b92d5d119ff078fb692c73fe375d25 SHA256 5dc3a85d385b0f36ca3fd0bd922af19c5fd37eb74808b2bacb42f0c6e2359331
 EBUILD normalize-0.7.7.ebuild 958 RMD160 92a7bda4a4ab776ee530507daf732c8b72e5d602 SHA1 730940514dd2cced75f87434064e8d0cb372e171 SHA256 3b1fabe698c2455e8b7aee641830cb0454661ff7063139be364ae49120bb98f8
-MISC ChangeLog 3729 RMD160 f98e9b27e85addacc7fa285b64897e95a8b055f9 SHA1 f767466dad85d0af01da1b01c8e7415df71b2d31 SHA256 2dacdef4d18372623967dc3f27d40328af4b516002bc97add6e73c1a8a99b341
+MISC ChangeLog 3919 RMD160 5e5b761be0ff046becfd872182997485199a7c19 SHA1 210bd5cf60a2b22f3a69c1b238b9280d0ce1b280 SHA256 475d5690d79f565ce7aaaf020b2592a16fbd748701006cc2947bb75781ef6dfb
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOqS/ZAAoJEEqz6FtPBkyjcdwH/2PMEGMpR7q755DVQ8ISc2Rf
+iOco7YRUr9f3fD10AMPbOdrANE/mpcgkhkCHFbGhK6WrYghMxueGfOlpMU/laU7N
+0Qen+5TiYtDmlgJDkf1V1U5RmSpE925hTVGdW6h6Xz67FhOI+eiE4ID09TtDouwQ
+dS1i3e4t+Lazx+VSLc8UsIQgc0ScnFYKmX21fvKMnomWw540gehNYeKVPCZsdVZ5
+nMsWNuRhuUuRk/p8CFqaTF3pGmJ5yQ06nc9M1K8gqHwsH7EgEoTX5JEwGykl+P0V
+izuA+86sK6xoP0XVvaK7uvmBLXyLByeV2uYdw3+pgUN8LozMgAQufbp7LwCNzNI=
+=L7ED
+-----END PGP SIGNATURE-----
diff --git a/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch b/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch
new file mode 100644
index 000000000000..09f211cdfb66
--- /dev/null
+++ b/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch
@@ -0,0 +1,55 @@
+Use pkgconfig to check for audiofile since the audiofile-config script was
+removed from >=audiofile-0.3.0.
+
+--- normalize-0.7.7/configure.ac.orig
++++ normalize-0.7.7/configure.ac
+@@ -248,33 +248,16 @@
+ 
+ 
+ dnl *** Stuff for audiofile library ***
+-dnl v0.2.1 and before have bugs with 24-bit LE files
+-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
+-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
++AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile],
++		   [use the audiofile library (default yes)]))
+ AH_TEMPLATE([USE_AUDIOFILE],
+ 	    [Define if you want to use the audiofile library.])
+-AC_ARG_WITH(audiofile,
+-    AC_HELP_STRING([--with-audiofile],
+-		   [use the audiofile library (default yes)]),
+-    [ case "$withval" in
+-	  no) with_audiofile=false ;;
+-	  *) with_audiofile=true ;;
+-      esac ])
+ 
+-use_audiofile=false
+-if test x$with_audiofile != xfalse; then
+-    if test x$have_audiofile = xtrue; then
+-	AC_DEFINE(USE_AUDIOFILE)
+-	use_audiofile=true
+-dnl	AUDIOFILELIBS="-laudiofile"
+-    elif test x$with_audiofile = xtrue; then
+-	AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
+-    fi
+-fi
+-dnl AC_SUBST(AUDIOFILELIBS)
+-test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
+-test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
+-AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
++AS_IF([test "x$with_audiofile" = "xyes"], [
++    PKG_CHECK_MODULES([AUDIOFILE], [audiofile])
++    AC_DEFINE(USE_AUDIOFILE)
++])
++AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes)
+ 
+ 
+ dnl *** Stuff for mad mpeg audio decoder library ***
+@@ -330,7 +313,7 @@
+ 
+ echo
+ echo "Configuration:"
+-echo "    audiofile library:         $use_audiofile"
++echo "    audiofile library:         $with_audiofile"
+ echo "    mpeg audio support:        $use_mad"
+ echo "    xmms volume adjust plugin: $use_xmms"
+ echo
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..bd00f3d08f34
--- /dev/null
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.7-r1.ebuild,v 1.1 2011/10/27 10:17:51 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="Audio file volume normalizer"
+HOMEPAGE="http://normalize.nongnu.org/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
+	http://dev.gentoo.org/~radhermit/distfiles/${P}-m4.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="audiofile mad nls userland_BSD"
+
+RDEPEND="mad? ( media-libs/libmad )
+	audiofile? ( >=media-libs/audiofile-0.3.1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( dev-util/intltool )"
+
+src_prepare() {
+	use userland_BSD && sed -i -e 's/md5sum/md5/' "${S}"/test/*.sh
+
+	epatch "${FILESDIR}"/${P}-audiofile-pkgconfig.patch
+	epatch "${WORKDIR}"/${P}-m4.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with audiofile) \
+		$(use_with mad) \
+		$(use_enable nls) \
+		--disable-xmms
+}