Restore CFLAGS patch for -r2 and add new patch for -r3.

Package-Manager: portage-2.1.3_rc6

5 files changed, 36 insertions, 23 deletions

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index 47216f472ba4..037d26b24232 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2007/07/01 02:33:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.52 2007/07/01 19:14:41 dirtyepic Exp $
+
+  01 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  files/libmad-0.15.1b-cflags.patch, +files/libmad-0.15.1b-cflags-O2.patch,
+  libmad-0.15.1b-r3.ebuild:
+  Restore CFLAGS patch for -r2 and add new patch for -r3.
 
 *libmad-0.15.1b-r3 (01 Jul 2007)
 
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 6e5eada656f6..8ffb0fdda8ef 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -1,7 +1,11 @@
-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 libmad-0.15.1b-cflags-O2.patch 347 RMD160 a2a0059dc8fb2c8f526a09fc250b5c16907e687a SHA1 334c2e88e180d8d4757934973f32f3ac270744bf SHA256 197bd69c064ba2957b23d83509c9fdc63c5315076fdf8c98dbc9eccd3ff236ca
+MD5 fbda7a1821e2038221deb3f476da034d files/libmad-0.15.1b-cflags-O2.patch 347
+RMD160 a2a0059dc8fb2c8f526a09fc250b5c16907e687a files/libmad-0.15.1b-cflags-O2.patch 347
+SHA256 197bd69c064ba2957b23d83509c9fdc63c5315076fdf8c98dbc9eccd3ff236ca files/libmad-0.15.1b-cflags-O2.patch 347
+AUX libmad-0.15.1b-cflags.patch 4867 RMD160 9103cec98f6dc746fd05e385159484098c6347b3 SHA1 e6e8c0de26ed6ef6ccfb6d1ea6e8b682695e1144 SHA256 0d92977b30b599be8d423e9bec39c0f76b9dbc0f38dbc98a397394c30e28243e
+MD5 bcd6eab331fc316baf4e9c9882fe13f4 files/libmad-0.15.1b-cflags.patch 4867
+RMD160 9103cec98f6dc746fd05e385159484098c6347b3 files/libmad-0.15.1b-cflags.patch 4867
+SHA256 0d92977b30b599be8d423e9bec39c0f76b9dbc0f38dbc98a397394c30e28243e files/libmad-0.15.1b-cflags.patch 4867
 AUX mad.pc 211 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c SHA1 c119a0ac710c4a3255fc643ca60c9107a31e3e7c SHA256 821918a6be761d7b8a697af951e4a9a5d2e48920cd80c9b6b9fa19d78afcf3b3
 MD5 89806934195402446d21d1a83f523b11 files/mad.pc 211
 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c files/mad.pc 211
@@ -11,18 +15,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-r3.ebuild 1904 RMD160 faeabfffe8144650e1b0641e5a97e906a0bd9c16 SHA1 8e0c7e607e1acd1f0c599cc82ce2850dae444ad4 SHA256 9bf486b26b11c2f1e81796a891f06ff905d2e78ed89c70cf0e5284758f76e4ce
+MD5 f9adf4f4c68c737a806fb4002cea582e libmad-0.15.1b-r3.ebuild 1904
+RMD160 faeabfffe8144650e1b0641e5a97e906a0bd9c16 libmad-0.15.1b-r3.ebuild 1904
+SHA256 9bf486b26b11c2f1e81796a891f06ff905d2e78ed89c70cf0e5284758f76e4ce libmad-0.15.1b-r3.ebuild 1904
 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 6474 RMD160 cb582b17eea5d3d420e3ab3d932b37931a835c0e SHA1 59f97417a4782463fce1c55c88d9d25174032154 SHA256 f61b39af5aad4fc3af35fba4510562a8a915af966584da5fcb2dc584dff856b2
-MD5 0c3636c02f4158de9d827172089fb22b ChangeLog 6474
-RMD160 cb582b17eea5d3d420e3ab3d932b37931a835c0e ChangeLog 6474
-SHA256 f61b39af5aad4fc3af35fba4510562a8a915af966584da5fcb2dc584dff856b2 ChangeLog 6474
+MISC ChangeLog 6685 RMD160 8bffdadf438bfff8c2e5cc51a027c2bb51b472dc SHA1 55e8fca1aa810b583d882215e5309573b1044694 SHA256 cd5d40136b0014384adb73487923b900cef883dc4b933c02fbc81d80a519f2b7
+MD5 4ac4fe55f06462c59f9469460161d31e ChangeLog 6685
+RMD160 8bffdadf438bfff8c2e5cc51a027c2bb51b472dc ChangeLog 6685
+SHA256 cd5d40136b0014384adb73487923b900cef883dc4b933c02fbc81d80a519f2b7 ChangeLog 6685
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
diff --git a/media-libs/libmad/files/libmad-0.15.1b-cflags-O2.patch b/media-libs/libmad/files/libmad-0.15.1b-cflags-O2.patch
new file mode 100644
index 000000000000..61b4b13bd73e
--- /dev/null
+++ b/media-libs/libmad/files/libmad-0.15.1b-cflags-O2.patch
@@ -0,0 +1,12 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac	2007-07-01 12:58:13.000000000 -0600
++++ libmad-0.15.1b/configure.ac	2007-07-01 12:59:13.000000000 -0600
+@@ -105,7 +105,7 @@
+ 	    shift
+ 	    ;;
+ 	-O2)
+-	    optimize="-O"
++	    optimize="-O2"
+ 	    shift
+ 	    ;;
+ 	-fomit-frame-pointer)
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 2509fea671e3..2ec44e344562 100644
--- a/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
+++ b/media-libs/libmad/files/libmad-0.15.1b-cflags.patch
@@ -1,15 +1,6 @@
 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
index 5d20eb04f835..d1835717472d 100644
--- a/media-libs/libmad/libmad-0.15.1b-r3.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r3.ebuild,v 1.2 2007/07/01 19:14:41 dirtyepic Exp $
 
 inherit eutils autotools libtool flag-o-matic
 
@@ -20,6 +20,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/libmad-0.15.1b-cflags.patch"
+	epatch "${FILESDIR}/libmad-0.15.1b-cflags-O2.patch"
 
 	eautoreconf