Fix CFLAGS patch to cover a case that was missed. Thanks to Sebastian in bug

#123215.
Package-Manager: portage-2.1.3_rc6

5 files changed, 103 insertions, 11 deletions

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index ec0558049816..47216f472ba4 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmad
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.50 2007/06/14 17:26:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.51 2007/07/01 02:33:44 dirtyepic Exp $
+
+*libmad-0.15.1b-r3 (01 Jul 2007)
+
+  01 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  files/libmad-0.15.1b-cflags.patch, +libmad-0.15.1b-r3.ebuild:
+  Fix CFLAGS patch to cover a case that was missed. Thanks to Sebastian in bug
+  #123215.
 
   14 Jun 2007; Raúl Porcel <armin76@gentoo.org> libmad-0.15.1b-r2.ebuild:
   alpha stable wrt #163113
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 2953237da955..6e5eada656f6 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -1,7 +1,7 @@
-AUX libmad-0.15.1b-cflags.patch 4765 RMD160 3f19584260e5399c2dea9d7b2865697a44bf71e7 SHA1 7ff9566813b426e9ee589b75d189c52276896246 SHA256 b11f816fdf5fdd2e22cfdadfc3dcfd053b80272c2a71426b72bad5ac3fbf7be7
-MD5 67e8dfa6117377e3535104eab60a22c6 files/libmad-0.15.1b-cflags.patch 4765
-RMD160 3f19584260e5399c2dea9d7b2865697a44bf71e7 files/libmad-0.15.1b-cflags.patch 4765
-SHA256 b11f816fdf5fdd2e22cfdadfc3dcfd053b80272c2a71426b72bad5ac3fbf7be7 files/libmad-0.15.1b-cflags.patch 4765
+AUX libmad-0.15.1b-cflags.patch 5001 RMD160 9d9207da111b15f51790fa93673e3254e2670bee SHA1 5765bab77678075c1156f57e469978cfb77d3166 SHA256 71afa91542f67049b6868cfe3bd96b2d12f6fc02ddcfd8b43252daa156f3c0bb
+MD5 49ae712f2f6edbfae313c60966c37f54 files/libmad-0.15.1b-cflags.patch 5001
+RMD160 9d9207da111b15f51790fa93673e3254e2670bee files/libmad-0.15.1b-cflags.patch 5001
+SHA256 71afa91542f67049b6868cfe3bd96b2d12f6fc02ddcfd8b43252daa156f3c0bb files/libmad-0.15.1b-cflags.patch 5001
 AUX mad.pc 211 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c SHA1 c119a0ac710c4a3255fc643ca60c9107a31e3e7c SHA256 821918a6be761d7b8a697af951e4a9a5d2e48920cd80c9b6b9fa19d78afcf3b3
 MD5 89806934195402446d21d1a83f523b11 files/mad.pc 211
 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c files/mad.pc 211
@@ -11,14 +11,18 @@ EBUILD libmad-0.15.1b-r2.ebuild 1840 RMD160 c3038b885ad3aa7312c09f5a54fc1ef93bcc
 MD5 f599954685bb7179ae3ae6368b16069b libmad-0.15.1b-r2.ebuild 1840
 RMD160 c3038b885ad3aa7312c09f5a54fc1ef93bcceee6 libmad-0.15.1b-r2.ebuild 1840
 SHA256 4ccecf883c860e1c3e152c14287980fe38d17085004d5d823465284e5e5c6a5e libmad-0.15.1b-r2.ebuild 1840
+EBUILD libmad-0.15.1b-r3.ebuild 1851 RMD160 b5407c7b16cd0489f22810727eebaaae4d318ee1 SHA1 4eb241827925548ad7ac676360dc17472658eabf SHA256 e29a7d47f479859b94caad2be1628152f1cc44046f5ea12d1e8609c17f4eee93
+MD5 2fea7b0c0347c71ac13afc55aa1b2148 libmad-0.15.1b-r3.ebuild 1851
+RMD160 b5407c7b16cd0489f22810727eebaaae4d318ee1 libmad-0.15.1b-r3.ebuild 1851
+SHA256 e29a7d47f479859b94caad2be1628152f1cc44046f5ea12d1e8609c17f4eee93 libmad-0.15.1b-r3.ebuild 1851
 EBUILD libmad-0.15.1b.ebuild 1525 RMD160 91cc057032f76dc8d3f9e2461d6b4cd1ae2bc8b6 SHA1 4414a6c6006e2f32c022c7406764d4a8cbe03209 SHA256 81b82fdf8dd7cd4aaf9cfebc6e6b468a2b0ba290e38ea162ae061ddd1d0d680d
 MD5 66122c91d4a73f5612805f3e0e20315f libmad-0.15.1b.ebuild 1525
 RMD160 91cc057032f76dc8d3f9e2461d6b4cd1ae2bc8b6 libmad-0.15.1b.ebuild 1525
 SHA256 81b82fdf8dd7cd4aaf9cfebc6e6b468a2b0ba290e38ea162ae061ddd1d0d680d libmad-0.15.1b.ebuild 1525
-MISC ChangeLog 6235 RMD160 05d44227e659a397837baccb5899811f9e02f7fa SHA1 f4310f154b4ceea25bba827af9d4ba21327309d4 SHA256 d9be07701aa5d027de8ee5e0556ca7e69a0b6e5aa6ae6db8ce3ddf86774a6956
-MD5 964e294e9cd6fc6f3246d67778b698de ChangeLog 6235
-RMD160 05d44227e659a397837baccb5899811f9e02f7fa ChangeLog 6235
-SHA256 d9be07701aa5d027de8ee5e0556ca7e69a0b6e5aa6ae6db8ce3ddf86774a6956 ChangeLog 6235
+MISC ChangeLog 6474 RMD160 cb582b17eea5d3d420e3ab3d932b37931a835c0e SHA1 59f97417a4782463fce1c55c88d9d25174032154 SHA256 f61b39af5aad4fc3af35fba4510562a8a915af966584da5fcb2dc584dff856b2
+MD5 0c3636c02f4158de9d827172089fb22b ChangeLog 6474
+RMD160 cb582b17eea5d3d420e3ab3d932b37931a835c0e ChangeLog 6474
+SHA256 f61b39af5aad4fc3af35fba4510562a8a915af966584da5fcb2dc584dff856b2 ChangeLog 6474
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
@@ -29,3 +33,6 @@ SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/di
 MD5 3cddcde24c345af3f67f1c4ffd65b3d2 files/digest-libmad-0.15.1b-r2 244
 RMD160 eaeda17d3affb5ade8c671365344cc4571e2eaf0 files/digest-libmad-0.15.1b-r2 244
 SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/digest-libmad-0.15.1b-r2 244
+MD5 3cddcde24c345af3f67f1c4ffd65b3d2 files/digest-libmad-0.15.1b-r3 244
+RMD160 eaeda17d3affb5ade8c671365344cc4571e2eaf0 files/digest-libmad-0.15.1b-r3 244
+SHA256 c43a94cef6b9450f33e5f12f2bb0e8bbf6e776c720a3f398bc3eef6b2573e98a files/digest-libmad-0.15.1b-r3 244
diff --git a/media-libs/libmad/files/digest-libmad-0.15.1b-r3 b/media-libs/libmad/files/digest-libmad-0.15.1b-r3
new file mode 100644
index 000000000000..e475d46a8d95
--- /dev/null
+++ b/media-libs/libmad/files/digest-libmad-0.15.1b-r3
@@ -0,0 +1,3 @@
+MD5 1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz 502379
+RMD160 0f3415ee10b188681e282ca69dec74c46ca73b0f libmad-0.15.1b.tar.gz 502379
+SHA256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz 502379
diff --git a/media-libs/libmad/files/libmad-0.15.1b-cflags.patch b/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
index 2e4eced4f969..2509fea671e3 100644
--- a/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
+++ b/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
@@ -1,5 +1,15 @@
---- configure.ac.orig	2006-03-10 15:10:24.000000000 -0500
-+++ configure.ac	2006-03-10 15:14:10.000000000 -0500
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac	2007-06-30 20:22:31.000000000 -0600
++++ libmad-0.15.1b/configure.ac	2007-06-30 20:25:31.000000000 -0600
+@@ -105,7 +105,7 @@
+ 	    shift
+ 	    ;;
+ 	-O2)
+-	    optimize="-O"
++	    optimize="-O2"
+ 	    shift
+ 	    ;;
+ 	-fomit-frame-pointer)
 @@ -122,74 +122,74 @@
      esac
  done
diff --git a/media-libs/libmad/libmad-0.15.1b-r3.ebuild b/media-libs/libmad/libmad-0.15.1b-r3.ebuild
new file mode 100644
index 000000000000..5d20eb04f835
--- /dev/null
+++ b/media-libs/libmad/libmad-0.15.1b-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r3.ebuild,v 1.1 2007/07/01 02:33:44 dirtyepic Exp $
+
+inherit eutils autotools libtool flag-o-matic
+
+DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library"
+HOMEPAGE="http://mad.sourceforge.net"
+SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/libmad-0.15.1b-cflags.patch"
+
+	eautoreconf
+
+	elibtoolize
+	epunt_cxx #74490
+}
+
+src_compile() {
+	use ppc && append-flags -fno-strict-aliasing
+
+	local myconf="--enable-accuracy"
+	# --enable-speed		 optimize for speed over accuracy
+	# --enable-accuracy		 optimize for accuracy over speed
+	# --enable-experimental	 enable code using the EXPERIMENTAL
+	#						 preprocessor define
+
+	# Fix for b0rked sound on sparc64 (maybe also sparc32?)
+	# default/approx is also possible, uses less cpu but sounds worse
+	use sparc && myconf="${myconf} --enable-fpm=64bit"
+
+	[[ $(tc-arch) == "amd64" ]] && myconf="${myconf} --enable-fpm=64bit"
+	[[ $(tc-arch) == "x86" ]] && myconf="${myconf} --enable-fpm=intel"
+	[[ $(tc-arch) == "ppc" ]] && myconf="${myconf} --enable-fpm=ppc"
+
+	econf \
+		$(use_enable debug debugging) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	dodoc CHANGES CREDITS README TODO VERSION
+
+	# This file must be updated with each version update
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/mad.pc
+
+	# Use correct libdir in pkgconfig file
+	dosed "s:^libdir.*:libdir=/usr/$(get_libdir):" \
+		/usr/$(get_libdir)/pkgconfig/mad.pc
+}