Now added sophisicated logic to filter out -fforce-addr based on comment #17 in Bug #141323.

Package-Manager: portage-2.1.2_rc2-r3

3 files changed, 25 insertions, 20 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 68573d4da8bf..907a18912ddc 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.56 2006/11/29 12:22:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.57 2006/11/29 13:15:41 zzam Exp $
+
+  29 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  libmpeg3-1.5.2-r3.ebuild:
+  Now added sophisicated logic to filter out -fforce-addr based on comment #17
+  in Bug #141323.
 
   29 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> -libmpeg3-1.5.2.ebuild:
   Removed older ebuild, now all ebuilds block gcc-3.3, solving Bug #132651.
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 05da741d37f9..9e984ce2c8ca 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libmpeg3-1.5.2-a52.patch 2866 RMD160 9661ab5b21dbeed9d016694027a88139f6c9fac6 SHA1 cec5037f426fd664cf791d39eaa25423c48b45a0 SHA256 08cfa24a53e5413e0d0dccb1ca64fe818d0f2af840c8b8b2de7d33e491ec75da
 MD5 5a8203b4e0f074a75883fec16e2c883a files/libmpeg3-1.5.2-a52.patch 2866
 RMD160 9661ab5b21dbeed9d016694027a88139f6c9fac6 files/libmpeg3-1.5.2-a52.patch 2866
@@ -18,18 +15,18 @@ DIST libmpeg3-1.5.2-textrel-fix.patch.bz2 6386 RMD160 6547523cac00f1035505f40ce1
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 RMD160 27c6e0d5afdc5a2198d6d2968913ec7748058157 SHA1 38d925f104c7674446dd19016726293f663aa3fe SHA256 6dde60e78776e7a3c761218e35afc6432a9289eb1ae18c4e4e7f85f67d63572d
 DIST libmpeg3-1.7-src.tar.bz2 320897 RMD160 f1989c4b52d97ee29833edc79efd731b6219f126 SHA1 577da1ddf77f1e1fcd1deb69829eec3567daed36 SHA256 b9e840ab489fd57860d305cdfb43d2c25fbb01105c4db4e16f09122727ee052d
 DIST libmpeg3-patches-3.tar.bz2 4251 RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 SHA1 7ee89ad5766637da12cd1870f207e1a2e5c900de SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186
-EBUILD libmpeg3-1.5.2-r3.ebuild 2405 RMD160 ec3aaea27be11e21915ea92a2165d51ae51c6da2 SHA1 9176e1272036f225057fdb881b4cc9e4d073ecb4 SHA256 4d29863e657574fae71817bdac8e21bc2c2c155abff52927e3d94baacd82eb0d
-MD5 ea4397423aeb0a3e5fae4c28e835aabf libmpeg3-1.5.2-r3.ebuild 2405
-RMD160 ec3aaea27be11e21915ea92a2165d51ae51c6da2 libmpeg3-1.5.2-r3.ebuild 2405
-SHA256 4d29863e657574fae71817bdac8e21bc2c2c155abff52927e3d94baacd82eb0d libmpeg3-1.5.2-r3.ebuild 2405
+EBUILD libmpeg3-1.5.2-r3.ebuild 2725 RMD160 e549582a3500b300c0c63009b174ffd5aa211b97 SHA1 4057d8b57373d181ca60e32596247c621739e589 SHA256 d9b68c104385001780258c85cc40f9870e169665b9ae449b75ad80b5f0e89d78
+MD5 2c9c2f0e5448265c262b08640c44360c libmpeg3-1.5.2-r3.ebuild 2725
+RMD160 e549582a3500b300c0c63009b174ffd5aa211b97 libmpeg3-1.5.2-r3.ebuild 2725
+SHA256 d9b68c104385001780258c85cc40f9870e169665b9ae449b75ad80b5f0e89d78 libmpeg3-1.5.2-r3.ebuild 2725
 EBUILD libmpeg3-1.7.ebuild 2044 RMD160 2d2150657c6dd3fb095b08f75e0b43c22a160470 SHA1 ef4a3569c456aba70a3573db93bc36d55605cd43 SHA256 93e91f382ea917c5c51d1342af081a8875caad8f784944a1a3e63473055cbd08
 MD5 e8b9391bd4cafb6a8d2d747e35cd2498 libmpeg3-1.7.ebuild 2044
 RMD160 2d2150657c6dd3fb095b08f75e0b43c22a160470 libmpeg3-1.7.ebuild 2044
 SHA256 93e91f382ea917c5c51d1342af081a8875caad8f784944a1a3e63473055cbd08 libmpeg3-1.7.ebuild 2044
-MISC ChangeLog 9015 RMD160 9e0634519ebbcb3b52e4a93969043e6f73b6d185 SHA1 eb5e4fb99828ae5481de5e2a57fb16e7e63cb4dc SHA256 e8b67c3c4cde0ba028f8b13769e599787cb246e8577f3ed71fcbe07d304e9d9c
-MD5 841b7eaccf576b6639b104598b666a09 ChangeLog 9015
-RMD160 9e0634519ebbcb3b52e4a93969043e6f73b6d185 ChangeLog 9015
-SHA256 e8b67c3c4cde0ba028f8b13769e599787cb246e8577f3ed71fcbe07d304e9d9c ChangeLog 9015
+MISC ChangeLog 9194 RMD160 1e06dd5667fa1957e791a01872a750515a6dca3e SHA1 d656c60581ccf8af0d47ed8a912011fa20d9fc36 SHA256 bce1224cf395e489f70a2785697169049c7146af906648212b050ba95ab8bb50
+MD5 69c81f0eceef92a474c5e1dde5aa8c48 ChangeLog 9194
+RMD160 1e06dd5667fa1957e791a01872a750515a6dca3e ChangeLog 9194
+SHA256 bce1224cf395e489f70a2785697169049c7146af906648212b050ba95ab8bb50 ChangeLog 9194
 MISC metadata.xml 250 RMD160 3cfca2c8a681fb3f7f476bd33e2af4eca7e716c6 SHA1 cd2b38496f16def449282e6112f889ab7ccbfc08 SHA256 8350b0a582ab7e37713efbe9d2319194cdc2899a243dbfbedb17844233857752
 MD5 dfdbc45ac8c6b5bd5ef17490455082c2 metadata.xml 250
 RMD160 3cfca2c8a681fb3f7f476bd33e2af4eca7e716c6 metadata.xml 250
@@ -40,10 +37,3 @@ SHA256 268817d6fddb4be51d6e5c8c4f414a76583228e864ea8f0326c62dc3c86aaff1 files/di
 MD5 d3080ee3fa5cc7b9cbc9626d97b08540 files/digest-libmpeg3-1.7 509
 RMD160 0757fea98046ac1610d962e7369f93f6fe064033 files/digest-libmpeg3-1.7 509
 SHA256 de9a8f8ee4eb3205fefb4f7fb0799e47a87afaa4826fa3baf7ebba365654dba2 files/digest-libmpeg3-1.7 509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFbXujt2vP6XvVdOcRAjvXAKCJawTBxWjeEKfjuWsyde0e5H5HcACeNiX3
-La6LStMW3Da75illq+u+Fy8=
-=z1+J
------END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
index 47d5408a6a8b..52ec39687a29 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.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/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.12 2006/10/20 21:48:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.13 2006/11/29 13:15:41 zzam Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -22,6 +22,16 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	mmx? ( dev-lang/nasm )"
 
+pkg_setup() {
+	if use x86; then
+		if is-flagq -O3 || is-flagq -finline-functions; then
+			# with flag -fforce-addr we have too less registers for mmx-asm-code on x86 (Bug #141323)
+			is-flagq -fforce-addr && einfo "Removing flag -fforce-addr to get enough registers for mmx-code."
+			filter-flags -fforce-addr
+		fi
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"