Fix build on ppc.

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 35 insertions, 6 deletions

diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 6ad6bae11c3b..2b9cc8851caf 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -6,18 +6,29 @@ AUX tbb-4.0.297-ldflags.patch 11719 SHA256 05ca92a307e8c797b023c7984a739fc04ae54
 AUX tbb-4.0.297-underlinking.patch 475 SHA256 489473e0f30a53d13bd508d3d720df2e6db24b1348470febd162d0834bf6a3de SHA512 26103f87299e56e08d404e0cdda47f3b2be89e770ea12e84ee7f681050364e674aca1ba8326b81db0a73c2f53e973b89b97af3f36c7e762d4699767481b64486 WHIRLPOOL 10e6e3f886dc1a8638f1788254e38f7f92ebbd9deab645e215e9abecfe871e8918de490dc0612de276829e75571db82bd04fe1a8606a50e5f2a6b938821a25fe
 AUX tbb-4.1.20120718-ldflags.patch 14639 SHA256 92f025c7f4fee3b6409823b0cfc6f29866bc813f64646fd61df8bdd24e630b20 SHA512 5afe125357d679eac2b11afacfb2443fe6bbed841223caccb625edf677562fe0886a2dcb9db0b96b0cd6ee3bf5f07363e26496b52d0b593081bcf2196688d638 WHIRLPOOL 2f57784f596fd39a3008e8557484c1bb46aec1c800abebe54bc5e4cdf5f96bbbea4d1b1967c4c1f70c340641c2eb19bb6e6d84c8622817f0df15bbb551f02858
 AUX tbb-4.1.20121003-ldflags.patch 14517 SHA256 4ebbe650a8005ac5667fc5f4815ee0492dee84c90f4ded51169013072d561379 SHA512 78ef3992809a30d0d5a146f4ec3bb5c6674d59581626ad02dc82a41c080921d1291e1e29823509fe532043107bf1927fc04a9824294d9a416986264725ee58e3 WHIRLPOOL afcb4488dbd367c7659b1929a4ab2ab0dd2d91d214a33de8fdf4c7942d84943b171d19955db540c345acfbbf63125e034944bc0f2a0e7a8b59ec3e767b66a1d3
+AUX tbb-4.1.20121003-ppc.patch 895 SHA256 762ea4b118ede189c9f527d8fbe4bdad2fb3814729267dc0333b03a5f1056923 SHA512 1b07f84163a1f372519b2a44ce1ed355c5d9bdad1987f2b2efcd5a85b599624b37d907d0dcc0c1d2254b619803edbeabdc5cbb7d933986b78b77081ecd4a23ab WHIRLPOOL cbbe2829f4e829867b4844486f07ff0be509f6b850332f5ee376e86519e0eb63598a2179c687199ad5b16a67ce74080f178940c8ac6bff354bf66dafb7192b06
 DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
 DIST tbb41_20130116oss_src.tgz 2461689 SHA256 4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6 SHA512 a537411cf9ae66caaa97af33fbc1e56b6598be7b14526c42fd24cedebac06b1979b39c89b080ff9ff353a1ce82b1d10c4863add79fb15578dd3b1598aea1200f WHIRLPOOL 279eb059a4877cd11d7c01bd8483885c12fbb389c51d0944cfe96270051705b8b42b6d6273533bfb668c231a557fe0cc127b091f2ba88237349137a8015e5654
 EBUILD tbb-4.0.297.ebuild 3451 SHA256 14e96ebacffe7fe136c38159ae6efe1ae41955342681690b4ee68ff641226f84 SHA512 e0012d56dcee2fa675d59e04bb711f03ec358f509782b3cc4dfc4efff6a72a67f6baf8395d5341a97837d4a53548e33c64ed0e3c4330b82c85d06b82e977e54a WHIRLPOOL 8977fc59b91b6eb6975402b1113726274319591d501ad7f5a1d272adfbde44bc247d1e23d44a04d5e59296cacdb78aea12a15aba3acd7c62eb3bf7b26efa25df
-EBUILD tbb-4.1.20121003.ebuild 2886 SHA256 94eb50afd942cf462a8462057e70123836baeafc4161bcab8efd6308869a8a47 SHA512 9d43d37288f96e6ae024344c24c143fddfaeb9ae17a23ad3dc760cd84463c414940a8ef25d71fb177f0836af81bc40741e3ef90e5cf04be23e0069c119c958f1 WHIRLPOOL 064813c40c4c3539a658c10f14b05c7016c5858f5459e16e8272b269cec00c71ae4260533ac1eac2dbe6c9ca1bf0f787f871bc8557912e251756e302564e85eb
+EBUILD tbb-4.1.20121003.ebuild 2943 SHA256 30ac9e83299e7a142675410584d1ec7457de76300f9936afd5f583efd7862c95 SHA512 61d6a634e0db9b348d7e0fa538dc1f4eae3ee7cfd50ef6c1cf9b524c77f61070126a32d74a9677eb0018d745bdd73470000179c912c12ea5dbd934a8be6d37f7 WHIRLPOOL 437386756e73ce01027494aef4461bf979bdcc2dbfaf32ef6adafc4a856612e9b09586f5fce297ed314d873699f4a9ff6cf1491241fc8cf26915f6c601188be1
 EBUILD tbb-4.1.20130116.ebuild 2884 SHA256 9184d5d8b503881e2684cba780bf9dc4a8060e87c0b983462f1606396aeb127d SHA512 475325c448291c6321266422c3c12284ba6523669d714ce29861046eb123784d869ff64b1a1d4e11b8ba8dc7956ea06ac451cfd6bb7ca7fcc9d0836eafbfb628 WHIRLPOOL 30be62f549de21f0afd71eebf2049af571050b549bdc6c7175edced284fd8b9ce24169966cb8fadef1ef4ada7dab29afe287803db354aa69263055d7e3e70cd1
 MISC ChangeLog 5963 SHA256 573e60ab5a7e80832735b2912da7ea11e520a2ec076833765457cb5fced4240c SHA512 e130778b21aef6ea98b45102efa2673c55a0f98b24e8a09935540dc3d4615c6ef9388ca92d9f5117eed7a12e4cd0e40b188f07642ab0d3b4cfdec029c285f77d WHIRLPOOL f019d17f2cc5804abe79725efc79d9354096bed1fe32e423c1b4af5a35a2be60c42a3fcf13cebb094044fa78e0abd4f2f90d1e09054fe62e7a90f278c96c08ea
 MISC metadata.xml 503 SHA256 df5167eb58798ee657f0c55f2776e7e44d96bd9fe2e1c71783dcf6cd1c65296f SHA512 1085a87e3f4e0dfc5c11e3b767f78e64225f6266a04be6271bbd8aeeb6bb16948ab26d0cec79773d1568dea23acf57a85acb84cf7c6dac314144c2f0087c7d1c WHIRLPOOL 6359fe487c224a3fb58df9e6cdbcf5703c751567521ae23a6f965905ca9e7a47b4b6689fa3e542fb196def6b55d8ae02bf14a51604bad95712eeaafb4f8c090c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEa2C8ACgkQ1ycZbhPLE2D3sQCfVrB24RUF8c2J4uAQaqvMuMXt
-XNcAoLBUcduPNUD0GYTWpLeHRp+WGSP4
-=5YL7
+iQIcBAEBCAAGBQJRHK+sAAoJEOSiRoyO7jvoxl0P/0bkjRc+F7TOPMsDgMgqkI44
+wwsvJqFVyXLwcFbBpLy1Ki/3izJmDYWKkGiGjYZJmNB8j9UWVzF3lAWMdex8ZMDD
+wveiyyQWO3u4uYGGGXBJEMLXWJ9q0rBH+SSa/fu7mDEOtyjm4uG9FJ5hGQEMDsD5
+Xd0awMRm5/jqyKaaDf99RtkOseBlgZ7tq7tNl94ZnRok0j7Z7PfUhydWlrvlBfIi
+hlSo3vPCC7qx6GsEx2UEcApP9HlJJqSkV31Vo4cx+zCbAla2c1lZzyyn4NE9ra9/
+qiTr5QcMqwGJt/9R+40MSyobmgJ5J01Lvuouz19zANxy7qKruqSfRBQ2HfEMczYc
+3/dCv1//AtsU15VpdhwfuOlTLy6XBIomY7oCVL2GYQHKV9W50u2PAXL8QjcLRcnw
+Ve/FoV/LqjP7OtM9riSHbKuvn5Ki9qlmeQfkoQuwINXwArp6gOy7z/3Judjfvpp4
++1krGhmgl/RW+7xztg1YrzcwDcztRCWM/Ib9tW1X0FAxB2m9d++2THZiHNkp8xGy
+Y8amkE1hewYchES5OwtpL8Qfzx6vjnYrYi1II9p1BNPeDzmTsfQ+wLthGscZhTSG
+M9MbtAagSsjcYan31NagMul6K3HhlpVhC2cQnkCU7qOoFqTv1rhc5qy4EvERLeBM
+yCPZRoWXbBTDt0vg/BGl
+=bcey
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
new file mode 100644
index 000000000000..c50e051c3d38
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
@@ -0,0 +1,16 @@
+diff -up tbb40_20120408oss/include/tbb/tbb_machine.h\~ tbb40_20120408oss/include/tbb/tbb_machine.h
+--- tbb40_20120408oss/include/tbb/tbb_machine.h~	2012-04-20 09:21:57.000000000 +0200
++++ tbb40_20120408oss/include/tbb/tbb_machine.h	2012-08-28 13:20:42.150456167 +0200
+@@ -373,8 +373,8 @@ void spin_wait_until_eq( const volatile
+ //  - The operation assumes that the architecture consistently uses either little-endian or big-endian:
+ //      it does not support mixed-endian or page-specific bi-endian architectures.
+ // This function is the only use of __TBB_BIG_ENDIAN.
+-#if (__TBB_BIG_ENDIAN!=-1)
+-    #if ( __TBB_USE_GENERIC_PART_WORD_CAS)
++#if ( __TBB_USE_GENERIC_PART_WORD_CAS)
++    #if (__TBB_BIG_ENDIAN==-1)
+         #error generic implementation of part-word CAS was explicitly disabled for this configuration
+     #endif
+ template<typename T>
+
+Diff finished.  Tue Aug 28 13:20:58 2012
diff --git a/dev-cpp/tbb/tbb-4.1.20121003.ebuild b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
index d9b66b590b3c..a09f2125ff5b 100644
--- a/dev-cpp/tbb/tbb-4.1.20121003.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.4 2013/02/06 04:26:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.5 2013/02/14 09:34:20 scarabeus Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -24,7 +24,9 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+	epatch \
+		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
+		"${FILESDIR}"/${PN}-4.1.20121003-ppc.patch
 	# use fully qualified gcc compilers. do not force march/mcpu
 	# not tested with icc
 	# order in sed expressions is important