Extend SSSE Darwin fix to all Intel-based targets

Package-Manager: portage-2.2.01.20271-prefix/cvs/Darwin i386

4 files changed, 17 insertions, 23 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 91e070540760..2b1a4a8ff750 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.168 2012/03/23 17:06:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.169 2012/03/25 18:52:09 grobian Exp $
+
+  25 Mar 2012; Fabian Groffen <grobian@gentoo.org> qt-gui-4.7.4-r1.ebuild,
+  qt-gui-4.8.0-r3.ebuild:
+  Extend SSSE Darwin fix to all Intel-based targets
 
   23 Mar 2012; Davide Pesavento <pesa@gentoo.org> -qt-gui-4.7.4.ebuild,
   qt-gui-4.7.4-r1.ebuild, qt-gui-4.8.0-r3.ebuild:
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 9d67cfb15ee5..34999ed946ab 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX qt-gui-4.6-libpng-1.5.patch 11322 RMD160 dba67fb2e79b96644e70715d6ffb28f3e676e884 SHA1 84c758d2fb76470b9282348a487e096dba33a92b SHA256 05c7a5aceeff1cc4c2bad065402025e6d4fead98c0eb0d786d15f65d7d1774a9
 AUX qt-gui-4.7.3-cups.patch 3297 RMD160 fc99e57ccfa8db47a1df799186d6daedcbdf744d SHA1 d712b9b570101de5c996692551ba5a3ae4a410e9 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33
@@ -14,24 +14,14 @@ EBUILD qt-gui-4.6.2.ebuild 5299 RMD160 f957942dfae65dffe841074af5ecc1209098d1c4
 EBUILD qt-gui-4.6.3-r2.ebuild 5507 RMD160 12202a5ad50432a891b3a86fe3aed2002cc39069 SHA1 ed926629a993781c960a6d7af54e5b37a2234556 SHA256 88c1aa6f81aff5867525707639bed06f79f27b9cb11ddb6354862da6f1fca636
 EBUILD qt-gui-4.6.3.ebuild 5483 RMD160 000cc1f41b04464e87fa72556484fb8bdbc17c8d SHA1 e3ff17f716fb8ca8d2b687b65d29cb4ad3ccbcab SHA256 2b2bfc833533b1ff33756aede685b1fc02b8ae25a9517098c9536bb12bc03e69
 EBUILD qt-gui-4.7.2.ebuild 6350 RMD160 a47834c6bc9471eeb188fd26ca1394083b08225a SHA1 8e34ec70e3a1a10a7302171629f8754ea13eabdf SHA256 43e21b9cea2aac8d8ee82d46585168436bfad570e3e0695244eb300d41c02110
-EBUILD qt-gui-4.7.4-r1.ebuild 6298 RMD160 2eecf90a61a7d08d1939133a4db3e6f38cb93e81 SHA1 9909339ae1ed4821930b0512afc811fe0988ceee SHA256 da72440f53efe6b5c1bc70d9f4a087b3be26ba53a1a2a5455f9727051c5a1f6e
-EBUILD qt-gui-4.8.0-r3.ebuild 7297 RMD160 331c35fa02f5abfee3afd31948748598b2667be5 SHA1 f198d33a86d4e7f039ba72e21b613b04ff044582 SHA256 5f4b84d352110d5fec6d059d6c5b5791c1e7d13a048da49d7c613a42f7905b08
-MISC ChangeLog 25497 RMD160 753d390c3219843af209e082263329972b081863 SHA1 3a50f3f6c0c8edf6caa5c63283658ba400061d51 SHA256 9b8b162aea7c1d2637b2d1cc6f527642a50b65fc90f58fad83f26496e3fea8b5
+EBUILD qt-gui-4.7.4-r1.ebuild 6299 RMD160 091b2d9d4479eecf0ca94b38e3aef941a0c52ff0 SHA1 53c380c416c36356a6c7c3677287b3ade92790bf SHA256 1b651c907acc0efd16bde3dee2ea109442bf609c788937f652327a01a0154cc1
+EBUILD qt-gui-4.8.0-r3.ebuild 7298 RMD160 b838520f36d6f5207a1819ee977fff71f00beaba SHA1 7e50445be94f3deb728067bccfa431b127b96701 SHA256 b7932bd734867399f5402b016482681d18b798aa4ac16a7b960abb175bddb6ea
+MISC ChangeLog 25654 RMD160 fdf3093dc567bad23e6da301e6957b4b7b7caed1 SHA1 b7a7a06b4095f208dc284bf7ed49a33e3dd76996 SHA256 1e321bf8c44140507cf48b1f0eb91092c6d90177c7bee82122d90f598279daef
 MISC metadata.xml 1321 RMD160 1542571f692bb2835d37878f355c92d733e67723 SHA1 da96dabea1aa946e1a5d9a983d6ea618dee58999 SHA256 a494da2f630a67491fd5f1950247277abce91216ed93b879cd511a13672da903
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQIcBAEBCgAGBQJPbK2jAAoJENXLsxwXqFxyW0gP/1jLLXXJwoFMDTyGGrtLn1xt
-huRQt87XSZQb29ATneNB6PZDpWqe0/Fu3D6dfPo/zct0R13K6+MnAkYUngx9kRJ4
-uKUgJqw4ReUVruNMpYo4tBEOdZfxHMLSp0ffaJpwBL/9MQWaJ0czgTdBE16dcgQw
-Bxb4lWELG/uW+MeMnfHjKVoNLLCYi4t31OX1xB585m+NgUhCHuksVkWfnUeXHjQG
-NUGm5TtFzvehyEqPj0R7PyITbL4zbD2bj39VTlJft1kggG6h2nswCfZTJj2CpzPl
-a7oHBLtGHzXfYe/dqKrb+kvxGqvRdsbyjou5lIqNr1k+LnscXDWyLpQ9B/cDU6dX
-BKSfTswEoQ9UK45ejOC8Mgl+j+patwmuJhNjBjmMtHLfFfQYxHzBeJMN/wQi/p/7
-5aIA8a4vjd70yjpBkovTu1QEydgtl32EsgAbbSsQzxoplJnb0AZAJHr1VA04qWEj
-c38pGOIGy8biUGHqiowMcmAJSf+53RuSxERb/csnodm0mCS2CY/2fia5AKNO7Xz4
-byoWIXnNlfi9f43/NIccuBjdklDjtyNlNK+OOi43+2QGLlwVa6j8C2VJxSHZ6Ixm
-k44+s41s2rex28vnYbcewPmkJVx/9xxXjznNdVPGogiR8UqsInyCsxhkPyXyc85/
-G2ZdXDHd7cjSim9Ri5jz
-=xlsb
+iEYEARECAAYFAk9vaYMACgkQX3X2B8XHTolpJACdH5/eeU5WnKlmCqgWTBDuc1ms
+wx4AoIlvG7HWFG8fzkQtJZGoz1NDC+Nk
+=fka0
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
index a3f629bd01ff..5e377e4bd3d1 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v 1.7 2012/03/23 17:06:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v 1.8 2012/03/25 18:52:09 grobian Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -110,7 +110,7 @@ src_configure() {
 	use nas	&& myconf="${myconf} -system-nas-sound"
 	use raster && myconf="${myconf} -graphicssystem raster"
 
-	[[ ${CHOST} == x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
 
 	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2
diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild
index 812bd9d1bbd8..d9fb51a1a9f2 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild,v 1.2 2012/03/23 17:06:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r3.ebuild,v 1.3 2012/03/25 18:52:09 grobian Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -130,7 +130,7 @@ src_configure() {
 	use gif || myconf+=" -no-gif"
 	use nas	&& myconf+=" -system-nas-sound"
 
-	[[ ${CHOST} == x86_64-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
 
 	myconf+="
 		-system-libpng -system-libjpeg