Fix for gcc-4.1, bug #132051

Package-Manager: portage-2.1_rc3-r1

3 files changed, 26 insertions, 22 deletions

diff --git a/games-emulation/mupen64-riceplugin/ChangeLog b/games-emulation/mupen64-riceplugin/ChangeLog
index a58c4815e0c8..f01e8c59e9c5 100644
--- a/games-emulation/mupen64-riceplugin/ChangeLog
+++ b/games-emulation/mupen64-riceplugin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/mupen64-riceplugin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/ChangeLog,v 1.13 2006/04/27 19:46:20 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/ChangeLog,v 1.14 2006/06/01 18:51:02 tupone Exp $
+
+  01 Jun 2006; <Tupone@gentoo.org> mupen64-riceplugin-5.1.0.ebuild:
+  Fix for gcc-4.1 not compiling without -msse, bug #132051 by me
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/games-emulation/mupen64-riceplugin/Manifest b/games-emulation/mupen64-riceplugin/Manifest
index 94f64a972c24..32da2121212e 100644
--- a/games-emulation/mupen64-riceplugin/Manifest
+++ b/games-emulation/mupen64-riceplugin/Manifest
@@ -1,32 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mupen64-riceplugin-compile.patch 6601 RMD160 ef7773dc9afc0f7e37850160fcfd2f7ade6133b3 SHA1 f25931cd76dc29d70521f4444b81ebd197ea8e32 SHA256 ccf844428e86dfe066cc0f6c004f414694a7e7db23e71b22acef5fd515163d81 size 6601
+AUX mupen64-riceplugin-compile.patch 6601 RMD160 ef7773dc9afc0f7e37850160fcfd2f7ade6133b3 SHA1 f25931cd76dc29d70521f4444b81ebd197ea8e32 SHA256 ccf844428e86dfe066cc0f6c004f414694a7e7db23e71b22acef5fd515163d81
 MD5 5818587f7353a1f0bc54a08443734016 files/mupen64-riceplugin-compile.patch 6601
 RMD160 ef7773dc9afc0f7e37850160fcfd2f7ade6133b3 files/mupen64-riceplugin-compile.patch 6601
 SHA256 ccf844428e86dfe066cc0f6c004f414694a7e7db23e71b22acef5fd515163d81 files/mupen64-riceplugin-compile.patch 6601
-AUX mupen64-riceplugin-gcc4.patch 1036 RMD160 95b17b5613234a5837b80ad2d7ee8ff1a0632205 SHA1 c98657f5649cdef3969e28a4bb7a996f6d859369 SHA256 0d8295948be78e1d25f201923a29554da47140568c961e403308c76624ec26be size 1036
+AUX mupen64-riceplugin-gcc4.patch 1036 RMD160 95b17b5613234a5837b80ad2d7ee8ff1a0632205 SHA1 c98657f5649cdef3969e28a4bb7a996f6d859369 SHA256 0d8295948be78e1d25f201923a29554da47140568c961e403308c76624ec26be
 MD5 4c865bc8d557b967692b1c85e54bbe77 files/mupen64-riceplugin-gcc4.patch 1036
 RMD160 95b17b5613234a5837b80ad2d7ee8ff1a0632205 files/mupen64-riceplugin-gcc4.patch 1036
 SHA256 0d8295948be78e1d25f201923a29554da47140568c961e403308c76624ec26be files/mupen64-riceplugin-gcc4.patch 1036
-AUX mupen64-riceplugin-gtk2.patch 631 RMD160 ae52b739b6a812df27792fe1111fcadaf5809548 SHA1 2f475357af5852fd5aeacda92f72d075a29191c5 SHA256 d8cdde32157ca7ab29c0957c5d13878d9ae1b59e2d7648de2f2426cf9b786717 size 631
+AUX mupen64-riceplugin-gtk2.patch 631 RMD160 ae52b739b6a812df27792fe1111fcadaf5809548 SHA1 2f475357af5852fd5aeacda92f72d075a29191c5 SHA256 d8cdde32157ca7ab29c0957c5d13878d9ae1b59e2d7648de2f2426cf9b786717
 MD5 c79ad1f4cdadf86d6bf4fab101ea3ae5 files/mupen64-riceplugin-gtk2.patch 631
 RMD160 ae52b739b6a812df27792fe1111fcadaf5809548 files/mupen64-riceplugin-gtk2.patch 631
 SHA256 d8cdde32157ca7ab29c0957c5d13878d9ae1b59e2d7648de2f2426cf9b786717 files/mupen64-riceplugin-gtk2.patch 631
-AUX mupen64-riceplugin-makefile.patch 1013 RMD160 98e0dbd8d4912c91e2aa6fe15ef5dfe09d830459 SHA1 94406b99c49a503f420731a0635099c5a9d7a231 SHA256 e1672b5c1cc8a8e93698f1e20b55842062a63efed48442125f5405b6ccaadafc size 1013
+AUX mupen64-riceplugin-makefile.patch 1013 RMD160 98e0dbd8d4912c91e2aa6fe15ef5dfe09d830459 SHA1 94406b99c49a503f420731a0635099c5a9d7a231 SHA256 e1672b5c1cc8a8e93698f1e20b55842062a63efed48442125f5405b6ccaadafc
 MD5 45e5b555bb4c252b8ebe4731dd1229f8 files/mupen64-riceplugin-makefile.patch 1013
 RMD160 98e0dbd8d4912c91e2aa6fe15ef5dfe09d830459 files/mupen64-riceplugin-makefile.patch 1013
 SHA256 e1672b5c1cc8a8e93698f1e20b55842062a63efed48442125f5405b6ccaadafc files/mupen64-riceplugin-makefile.patch 1013
-DIST riceplugin.tar.bz2 287672 RMD160 312d57354818b55550a5c74e2b62332a41016eeb SHA256 3fa3065d70a697f3b6afb17bceb505fd5e117a1503a345ef9a819f63943de210 size 287672
-EBUILD mupen64-riceplugin-5.1.0.ebuild 1031 RMD160 19c006abc05ae64c0697a081d7c1b8c3ac81a8c9 SHA1 f52c06f32e301575c11aaa02516f2af30f38ea4b SHA256 7a8cd5080035a1680ff41bb8646db8afe659ceabbeca27879ee450f4fc3cc4ac size 1031
-MD5 42d4df70b03c18d41e7a289c71ee5694 mupen64-riceplugin-5.1.0.ebuild 1031
-RMD160 19c006abc05ae64c0697a081d7c1b8c3ac81a8c9 mupen64-riceplugin-5.1.0.ebuild 1031
-SHA256 7a8cd5080035a1680ff41bb8646db8afe659ceabbeca27879ee450f4fc3cc4ac mupen64-riceplugin-5.1.0.ebuild 1031
-MISC ChangeLog 2145 RMD160 9669a86ed1f98473fe08462c373bf14cae81f8ab SHA1 711371538494a733cea8666c227f0969b422427b SHA256 0bfc06a60a98522684d2d3bc192b3c00637b60d7e39ddf6723d76280403a3379 size 2145
-MD5 de3aaaa99434c7dd818d52150da896c9 ChangeLog 2145
-RMD160 9669a86ed1f98473fe08462c373bf14cae81f8ab ChangeLog 2145
-SHA256 0bfc06a60a98522684d2d3bc192b3c00637b60d7e39ddf6723d76280403a3379 ChangeLog 2145
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+DIST riceplugin.tar.bz2 287672 RMD160 312d57354818b55550a5c74e2b62332a41016eeb SHA1 72a11bf1b3e5bf479fb3e3ed9183071f50b760a2 SHA256 3fa3065d70a697f3b6afb17bceb505fd5e117a1503a345ef9a819f63943de210
+EBUILD mupen64-riceplugin-5.1.0.ebuild 1133 RMD160 dfe1485219f04b1c2e3f8f57154fcdb930e4ef97 SHA1 e09b5a68d6366fcb5d5bb49815015ab1bd8708b2 SHA256 2ae147fea746cccb00c39815aa93ef0e72f5c1739b93e9aa57a84c3d50fe4417
+MD5 abb8571c08fee6eb2129d459fe054499 mupen64-riceplugin-5.1.0.ebuild 1133
+RMD160 dfe1485219f04b1c2e3f8f57154fcdb930e4ef97 mupen64-riceplugin-5.1.0.ebuild 1133
+SHA256 2ae147fea746cccb00c39815aa93ef0e72f5c1739b93e9aa57a84c3d50fe4417 mupen64-riceplugin-5.1.0.ebuild 1133
+MISC ChangeLog 2278 RMD160 42816f9b179e6e3ea21194b13b7df94d18404425 SHA1 6adc5e0e7f73dbdf3952f390067ecea9b4477489 SHA256 c95d84081e4f75944768c426ac7f0ceb30145464be27bc8916bc0a3f8deddb6b
+MD5 146ee2ebdf7fd715810b8851313d312e ChangeLog 2278
+RMD160 42816f9b179e6e3ea21194b13b7df94d18404425 ChangeLog 2278
+SHA256 c95d84081e4f75944768c426ac7f0ceb30145464be27bc8916bc0a3f8deddb6b ChangeLog 2278
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -34,9 +34,9 @@ MD5 374f37e72b78633b10a9c1b2b1dfabbc files/digest-mupen64-riceplugin-5.1.0 235
 RMD160 86118568913fbb756007fd27cadc4ee2a9dd9ba3 files/digest-mupen64-riceplugin-5.1.0 235
 SHA256 5556ec96723754e79925df7eca7ea45829d29b2419a555b0262819affa8b0aa1 files/digest-mupen64-riceplugin-5.1.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXaDd/aM9DdBw91cRAop4AJsHiqLFq8+60P4bw8l8SdHPYq9U1gCeLeGT
-hjbq1kSTOt/RooGs2nRPxAk=
-=CR9T
+iD8DBQFEfzch2CTtIKiFlQIRAjgeAJ4gqxezupR1pqijJWI3wfKEniitkQCfSKA1
+Jg6Tgs5QmJ22RiwUuqg1Ekc=
+=WDs3
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild b/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild
index 3b147380bd87..d86d38245798 100644
--- a/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild
+++ b/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild,v 1.9 2005/09/20 15:26:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild,v 1.10 2006/06/01 18:51:02 tupone Exp $
 
-inherit eutils libtool games
+inherit toolchain-funcs eutils libtool flag-o-matic games
 
 DESCRIPTION="an graphics plugin for mupen64"
 SRC_URI="http://mupen64.emulation64.com/files/0.4/riceplugin.tar.bz2"
@@ -35,6 +35,7 @@ src_unpack() {
 }
 
 src_compile() {
+	[[ $(gcc-major-version) -ge 4 ]] && ! is-flag -msse && append-flags -msse
 	emake || die "emake failed"
 }