Rice it down, don't append -ffast-math unconditionally. Also simplify applying of patches.

Package-Manager: portage-2.1_rc2-r2

4 files changed, 45 insertions, 15 deletions

diff --git a/media-libs/libmodplug/ChangeLog b/media-libs/libmodplug/ChangeLog
index 790712cad98a..69698e02e1ab 100644
--- a/media-libs/libmodplug/ChangeLog
+++ b/media-libs/libmodplug/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmodplug
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.16 2006/04/21 21:25:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.17 2006/05/25 00:31:25 flameeyes Exp $
+
+  25 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/libmodplug-0.7-amd64.patch, libmodplug-0.8.ebuild:
+  Rice it down, don't append -ffast-math unconditionally. Also simplify
+  applying of patches.
 
   21 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> libmodplug-0.7.ebuild:
   Stable on hppa wrt #130123
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index d7cfd95ac3b4..43a5b641ecf9 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,18 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0570fb51deed59fbbcf35deec600b5b5 ChangeLog 1842
-MD5 5009236d8b451fecef858961aed24428 files/digest-libmodplug-0.7 66
-MD5 6099a721c7a188eabdc91042dac3de3d files/digest-libmodplug-0.8 244
-MD5 b10f6248932b7fd4ce0df1a025df6e8a files/libmodplug-0.7-amd64.patch 1550
+AUX libmodplug-0.7-amd64.patch 1580 RMD160 75793a88b2d4113e8872c79da028ba2f7d98f569 SHA1 661f62ed0c1ff5848cab9cb3a663c0d285741163 SHA256 931534f2420722e51ddf136f8f84d3a7ef0d6b065fddd9cc8c244a06e0373e5e
+MD5 a8b506be2f9429c8b4ac508b04213432 files/libmodplug-0.7-amd64.patch 1580
+RMD160 75793a88b2d4113e8872c79da028ba2f7d98f569 files/libmodplug-0.7-amd64.patch 1580
+SHA256 931534f2420722e51ddf136f8f84d3a7ef0d6b065fddd9cc8c244a06e0373e5e files/libmodplug-0.7-amd64.patch 1580
+AUX libmodplug-0.7-asneeded.patch 421 RMD160 453028054887c5366aee85a34bfb7571c787fff4 SHA1 0a8fa922512c08f69e533bf80dd47f38901121bb SHA256 221ce05b1f727f2c22747463db6b3917f32d74a9cd26ad6c24f96738975568e3
 MD5 9ad05c4679d06d99935b79cc3ad19026 files/libmodplug-0.7-asneeded.patch 421
+RMD160 453028054887c5366aee85a34bfb7571c787fff4 files/libmodplug-0.7-asneeded.patch 421
+SHA256 221ce05b1f727f2c22747463db6b3917f32d74a9cd26ad6c24f96738975568e3 files/libmodplug-0.7-asneeded.patch 421
+DIST libmodplug-0.7.tar.gz 329398
+DIST libmodplug-0.8.tar.gz 441612 RMD160 ccf5c29b06a2f5ed93f7b42676d892521c65bfbd SHA1 62c755e178e708cab2113c54b351d3dce793bc21 SHA256 ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
+EBUILD libmodplug-0.7.ebuild 817 RMD160 81cc003d9a126eb41ac306c550e135d44919174d SHA1 a0839253602ef369d164a4fa922620a8798a95de SHA256 024f11be67ba4ff6a71ea05dcc4d8d6538a221128893b422ccad414d170a70cb
 MD5 4512e87aa4ca1db50c4c4dd6baa3ec66 libmodplug-0.7.ebuild 817
-MD5 1fe712fc57886b2fd95d6a74b3f91fdc libmodplug-0.8.ebuild 860
+RMD160 81cc003d9a126eb41ac306c550e135d44919174d libmodplug-0.7.ebuild 817
+SHA256 024f11be67ba4ff6a71ea05dcc4d8d6538a221128893b422ccad414d170a70cb libmodplug-0.7.ebuild 817
+EBUILD libmodplug-0.8.ebuild 886 RMD160 c4abb420626760733610f11ca4ccfeb51a745004 SHA1 8eb5555ac0fac1ac2b46858dabf4ff1f19a52cb6 SHA256 21e3e3c965a00781f19c7ab768b2ee8e15bd49802f4bc2fb461cc4429fb77deb
+MD5 a7618571e61f4ed23ac48543f665d0a2 libmodplug-0.8.ebuild 886
+RMD160 c4abb420626760733610f11ca4ccfeb51a745004 libmodplug-0.8.ebuild 886
+SHA256 21e3e3c965a00781f19c7ab768b2ee8e15bd49802f4bc2fb461cc4429fb77deb libmodplug-0.8.ebuild 886
+MISC ChangeLog 2051 RMD160 39bf2a03a5bc8255be91658de3c27390690b997a SHA1 c2bbcd6af5101d02a5661018f772c0239628d16c SHA256 a7f21d6636807e5cfddc895c2c3fd9f515e82d60b742a73e8ca0b15eec7e1def
+MD5 97e68d5f4c6c8b9840f53771169eadc2 ChangeLog 2051
+RMD160 39bf2a03a5bc8255be91658de3c27390690b997a ChangeLog 2051
+SHA256 a7f21d6636807e5cfddc895c2c3fd9f515e82d60b742a73e8ca0b15eec7e1def ChangeLog 2051
+MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
+RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
+SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
+MD5 5009236d8b451fecef858961aed24428 files/digest-libmodplug-0.7 66
+RMD160 7e7b0a438de10bf76da0d1c96111548761540c38 files/digest-libmodplug-0.7 66
+SHA256 41053000021ec22c91a3b7328c9da9a5dd8b1d3c6f03e9f425d74f263a4e75ec files/digest-libmodplug-0.7 66
+MD5 6099a721c7a188eabdc91042dac3de3d files/digest-libmodplug-0.8 244
+RMD160 deea679a926392dd22bec1017cc644f8ed5764f1 files/digest-libmodplug-0.8 244
+SHA256 6aab7593739988a695fcbdba006f50c78d520cabe81cfaac7de84f5934363bf0 files/digest-libmodplug-0.8 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFESU3NKRy60XGEcJIRAvQ4AJwJeTLphmjKlJr1+wu/npJFdhui7wCdFrUH
-muCpJkMlstInFGIZQJcK4is=
-=HPrx
+iD8DBQFEdPrjAiZjviIA2XgRAowrAKC/n3CbF6pKjEFSkQ4mg0yQ24SO6wCfV3Xu
+MfbeLxLnAe8eZOxlXPUyZ6Y=
+=/ANa
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmodplug/files/libmodplug-0.7-amd64.patch b/media-libs/libmodplug/files/libmodplug-0.7-amd64.patch
index 9584268c3b3b..997f68f798c6 100644
--- a/media-libs/libmodplug/files/libmodplug-0.7-amd64.patch
+++ b/media-libs/libmodplug/files/libmodplug-0.7-amd64.patch
@@ -1,5 +1,5 @@
---- stdafx.h
-+++ stdafx.h
+--- src/libmodplug/stdafx.h
++++ src/libmodplug/stdafx.h
 23a24,91
 > #elif defined(__x86_64__)
 > 
diff --git a/media-libs/libmodplug/libmodplug-0.8.ebuild b/media-libs/libmodplug/libmodplug-0.8.ebuild
index c532ed7cc0c9..dec255831097 100644
--- a/media-libs/libmodplug/libmodplug-0.8.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.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/libmodplug/libmodplug-0.8.ebuild,v 1.1 2006/03/25 02:22:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.ebuild,v 1.2 2006/05/25 00:31:25 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -19,11 +19,12 @@ DEPEND="dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"/src/libmodplug
+	cd "${S}"
 	epatch "${FILESDIR}/${PN}-0.7-amd64.patch"
-	cd ${S}
 	epatch "${FILESDIR}/${PN}-0.7-asneeded.patch"
 
+	sed -i -e 's:-ffast-math::' "${S}/configure.in"
+
 	eautoreconf
 }