Fix detection of x86 HOST_OS when configuring ffmpeg, bug 491466. Thanks to megabaks for the the solution.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 36 insertions, 22 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 53c1c5e17a55..91ed0862efe3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.987 2013/11/16 08:38:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.988 2013/11/17 17:36:38 floppym Exp $
+
+  17 Nov 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/chromium-build_ffmpeg-r0.patch, chromium-32.0.1700.14.ebuild,
+  chromium-33.0.1707.0.ebuild:
+  Fix detection of x86 HOST_OS when configuring ffmpeg, bug 491466. Thanks to
+  megabaks for the the solution.
 
   16 Nov 2013; Agostino Sarubbo <ago@gentoo.org> -chromium-31.0.1650.48.ebuild:
   Remove old
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ef10b072c181..5f4ab0aba6d5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX chromium-blink-crash-r0.patch 533 SHA256 79a174c3ff58dd4e4b340a498f0f59b915a3fe6605b82002d6dbaf7145bd3ef8 SHA512 51db3e10d36dd40f7cb446784769802f5aac6c5ba1cbc17d50a2b13d958d4c6ce81afeb094211988fafc7df1946e18e65c7fab9430dad718b14f078cdc2119c4 WHIRLPOOL 9b5eff70013f5c54197d569bee23a228037dd8c66476665ea39b80fdd5da778fac90bd9c181fe4a260cbab0993a9f67e3dce40f5ab80c713d5a892dbcd049d65
 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec
+AUX chromium-build_ffmpeg-r0.patch 396 SHA256 ae87f3810b78514ecf1c6a443f82934fe34373987a1968d686df61795d1832d0 SHA512 3bf84ff137f8187c1e527100b37d914f8ea98db9b41053ae2a75a4b2a960699619926192afd2aaa729df8124498042216b09765125e4dfec53f9d98586630758 WHIRLPOOL 08242c63e6c250656f8b45bebd3d58bf50287ccc709871304d7697dec56ad6135f33fef95fb4ba42b035d6b962e7b3591a1ec7507e74d117bf8a3a5cde1cfa37
 AUX chromium-chromedriver-r0.patch 583 SHA256 83335c81bfe71023c5d577dff2b9314f6ba33dadb30cb949e7a687a74c4e5add SHA512 9496a1c9a979b7f19823a6dfac5deec36c67895de212311a752ebf549c3390a28285c11a9b0b1c9e65feee841d09c600984ae1b49f502545ed833834d855a36b WHIRLPOOL 1c4e41b1ed4685f7f6f4d465365a4cd5e7e9bd8558664808e437b4500aaea2cbdb79e7367f2efadaeb5f87415fb840a16fbbf004976e25227ed5fd0e6ef9e232
 AUX chromium-gnome-keyring-r0.patch 881 SHA256 60bc75e6308d7348d1749e491a04918cc551e1bfdd2e204805bf956a91b33514 SHA512 ded33638266733a4a9dfe99ebae2ba4e4469fd8e275cd22e468aa75bade517641baf76e52cf6bfeb88bb40220a60ddeef519db32745486484d87d85ed0648fb4 WHIRLPOOL e028d271af1a9aca776711c70e2d716ca481430bd3aab18c3c05b7edf9d776204eda7f1bf71a0a3cfca22f5714604fa1608ee4119d3fe41bb48b70724877e333
 AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3fa517fe1a698b35e21692d1 SHA512 72a668dbd5b343a34a1938c2a6f1147d14a149b9a4a981487e9ca8fa6d912791a6c11e29178c3abe1e691c0e1bf6e435a390eb89aa63bda72d592ab3b0a55b1c WHIRLPOOL 7f04535d674498e2f2d572b6feb5ee4a183ffcf9671f308947e5c4a7370399bc8388d53705f7ca23dd6038bb12c81af0fe0b8b1f3cb7d90465b255e4d3c8b7d9
@@ -25,26 +26,16 @@ DIST chromium-32.0.1700.6.tar.xz 176963440 SHA256 cbd1bfc5bc1bc3f3f8d57828097bd7
 DIST chromium-33.0.1707.0-lite.tar.xz 154007504 SHA256 3dafd652ddc1c49f5d0594fe72502e8d5772b6065e53b100f2b2d126313f17f0 SHA512 b0b4e793e0752946543a09313d43f008ea43527f96d7527f8beaf2073227fcee2758ecc32d476017cf752aaabe8e653d7ebdb55a3ecd4458793e2d6c312ee3f4 WHIRLPOOL f1c647a07039e0a5bdf2b886348298ebbadaf7900c8bde2543677af0ffc617f3ff99cd10a98aa2fddba990bcfbaab372b70c16ef06f83bea3a153f1079291518
 DIST chromium-33.0.1707.0-testdata.tar.xz 112156276 SHA256 f36782ffd0c56dcc00f316b8267471e40afa72a37be1fa306a7ee20f5b9b4485 SHA512 dffe4cd94a32de09774abfdb3d46da401446416f0846a3498043951ffb7cc7f7279b11be67d2f300c109f3f7337a5c61f2558b4639e9a19b78a54bd375629e83 WHIRLPOOL d6d404a91c7a5118a8f61fe29c9677655cb411b27df38a8b7d450160161adfc39fffb1ff0755b8d3347147d3e30016f9bad8a2857b908d4d176bb1e3e1bdedb1
 EBUILD chromium-31.0.1650.57.ebuild 17190 SHA256 b7c0d8f2a1777c61e17b19478687eeada111019542ebfa49fac6b586745304cd SHA512 93d559a47f41a5477e6f7997c085d7b7f37ccdb09472dc6c594e1b30d3eb7ffc66cb5c24f23449661cb8c955a77a0907f3b929a5e81c14f5457ca13373a2486c WHIRLPOOL 8fac2cbede89d2499a2826a7515b2844cc0726b878fc28fc503af60136cb111ddbc6682fc9bf54a2adfc1c6a38fee31434264326f537ecc044942cea94e73741
-EBUILD chromium-32.0.1700.14.ebuild 18224 SHA256 597cb13c069e4f7b53ec29953852a1ad3baf0cd2bd7566ad1c4346e662fe80dc SHA512 7535da597686662bf18cd7e8e4502e705f106ffb0465b5ca755436dbd62b1cf9aa4778780e3917cc9c788c491e8aff5225e0f52e258a0d9ae1203182091ab964 WHIRLPOOL e52a3ad33ddb435ae199ceb9c8fc74798f553a3335b8a9b98b6965c52be2fb626bc6fa75e1cfa78f208237fb9ba91d366d1f4708fe821e4175b493817856d168
+EBUILD chromium-32.0.1700.14.ebuild 18274 SHA256 d378995c718f4a7fc1d63d36d8c626e551700767d337f0286a6426fe66a13d6f SHA512 7db7451380e7a912251e711e8cabfc886381a604ba66fb3ae3481c412d4594f2d7913a93dd13afdcec9c887aa1ca9988fa6b68240c81c9f5f81d280dfcca941b WHIRLPOOL a2864f142599682c1ed67bcf1d82c40b7bd288451c4ae6ad7dca2918cf6397f2511c4dbd483b6e80e733dee870ccb18dded57559386584271082c56a94bbdd41
 EBUILD chromium-32.0.1700.6.ebuild 17891 SHA256 85d0063e184f892121e29c9b146b4f68b388e465c662297a8415e30e0cc8ab35 SHA512 05f41f85fe667d8419d4b87488947d918beb5c86254f676c95c935d7966e54c31135ad4266f1cd3b11c3d64805f0e75b9dc1d1615998097b5d4f306897cfcddd WHIRLPOOL dc6d482246775534b6f4018b9ba511e97c1c789256d8bd3f26711f0049b0fd44996736c356f657817ccc677c6a21703ae8f3aad41f0e130a0329c8b244a2a209
-EBUILD chromium-33.0.1707.0.ebuild 18256 SHA256 229079d38983d6caa53f641cc8afaf73d48466b692efc904b0c1519c9c57cbf3 SHA512 d6bb57c2ae35fc72692d14d47f3c3b6eb5abd4dfd9c2902e57bd3344e107a6bbd9a071b899143fee4a1285c5f08e617a9fcc0ade8dbcb4a5959db841b7085364 WHIRLPOOL 012994cddcf2c079fc5c66f9fdee9d8959d50b6dc95e788a4c8b3573b9cef03f61ded566e78a887daaafdebdba0397ce421b1678fc38bffbaaa8aaedb3265d39
-MISC ChangeLog 89846 SHA256 0b3859a81f24ddd0f86451940c3ff24aadc9e70fc9c0f285d2c24683ad8abafb SHA512 5ff2dd5bdfc60456f720228a691b8997df57e871db5cc89a3eccc407d383de02532bc299d90c67a802327be7c26599c63b830fed4291ba2da5005741fa2989da WHIRLPOOL 9f4f0d1980a8ff8b16c4011a13983f715ad15671a91a8ba29f2362ea42998e992106785e21985bac293fe51a5ea8850ebbb8d418c755ffaf03f3932a9eba38d0
+EBUILD chromium-33.0.1707.0.ebuild 18306 SHA256 9ed9b87566184676750e6e84fa19edc32a2b7a2814ad38f4235a0286eeadd28a SHA512 e6c9586268162b3c9ef9eb2c9a5a9b4b2e14d2859703618ea354e1a3f144f5d8066c5aec9846225583b0be412e590a2b4eb62c793cbb210b1fddd94436c8bd9f WHIRLPOOL 3432e6f2522a98b282049f0fb00b52c4e3bdc60e22d8af930341dedd6db198bc997f035777078bfecc9e49cf8b216e3240409088047789e483da57f6e357a58c
+MISC ChangeLog 90113 SHA256 cc4c74de9bd511b16687d77a9226cf4677ffefe78503391041b1bd421829fd30 SHA512 c556e50cfeed32d675319366d30c8db3cae5a1f9d244488daa5ab69ddd574f0c9a7a900d9d8e6af0aecdfc35a1195acab3d92aaa5c32924444612eaed65b6947 WHIRLPOOL 48d950b3b8f7aea7896dae476c58a9338a42ef534f9046eaaaca2ed2439939c24be45543287812b956558ef36e54831715c6fac467d1468820708317c8908220
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 622 SHA256 0cc15c6cfce29d9372d650e883075630c844e262bb354a64c96d7e51580d25c9 SHA512 957d3b569ce2259d250681d91edf31d7dcea412d84c79017413866691d3b6fe27076f7d0d7c14f41421254438064d15c90d84940a3c6aa9c307c4db4277eadd1 WHIRLPOOL d621daeca803c0aa06b7abff6207a16cb9122c7ae6f7b02b57be88dd551ef4410fd20d592ea8ee7062bbef54ce09079dacd51e514febdebb16da24d8fb55f823
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJShz0BAAoJELp701BxlEWfV/YP/1r7tTKrH7gAvHMb+0jZKoru
-KWtBXh0JSmMvO0EQ3wDGkYnXVlZCxgYJlFaiA5CAPzyrGbcrK4YG6iHveqNhAzEK
-RT57h+ScA8RCQ4oRhEkfsJD1JlQciGBAuYzdnFQwiEdtTCRRaLVZtuH3p8BW+gYk
-N9xzAUj8RWj62lwzmkLhMwsfzKberRCwHTZRh6lVrmPUr8BO3L3YkPmrRDg/W3O5
-hXIqx7anhVJxvsxA9i8mORmn/TVq0NNgscq6nSraEU6NG2swqBaS1aNnXcgyaFG+
-Vb4wEvTtYLvJ39KJx4CC8YFzQEa16i+J4nIN3tVI2cUkXZkMrP6dX/+3ygZZkjQ+
-aj2OdW8Mc6/7Eof/ByU+9nbaDCVUwkQHz58ViluIaPvpnhZuq5j68odBKCPGrqmF
-R+TJGzPyDrH/96lsmsJM1dqJryqUF16xCvpMPJXxiNpZQ9x/Jg4jimGiCgSLChVz
-tWemMnlba0Dy0MgwkhN+fhijATxB4zMei5QxgkzUbW32mHmBeJ7KrqhNyNzKzVNW
-bDM/2DoXx6oQ5DxnAx2Ry7dWfMb0hx/M/x9BM54+dOYA03pFjsYWFtC6BC7EW1RA
-a9qbkXG3nNhANRvl0sY7Ga9qUkIUGq11SklvKc4p5MsqnAUwUdKMIMr9WQTpLb9S
-aD6aUQzL0hBPUuUAcCol
-=PRfO
+iF4EAREIAAYFAlKI/qgACgkQC77qH+pIQ6QyBgEAmm2oLgShzlyHbiayv6/HGKeq
+k9ogBgeMN0QqONVJCeMA/0VhaPor3hkKGh6Z9qAAoHwnuA8lAUN2yVArrqt3zg0Y
+=avzW
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-32.0.1700.14.ebuild b/www-client/chromium/chromium-32.0.1700.14.ebuild
index 9fe13bcc94ae..3523b030a36b 100644
--- a/www-client/chromium/chromium-32.0.1700.14.ebuild
+++ b/www-client/chromium/chromium-32.0.1700.14.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/www-client/chromium/chromium-32.0.1700.14.ebuild,v 1.2 2013/11/16 06:03:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.14.ebuild,v 1.3 2013/11/17 17:36:38 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -154,6 +154,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r2.patch"
 	epatch "${FILESDIR}/${PN}-blink-crash-r0.patch"
+	epatch "${FILESDIR}/${PN}-build_ffmpeg-r0.patch"
 
 	epatch_user
 
@@ -399,7 +400,7 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.sh linux ${target_arch} `pwd` config-only || die
+	chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die
 	chromium/scripts/copy_config.sh || die
 	popd > /dev/null || die
 
diff --git a/www-client/chromium/chromium-33.0.1707.0.ebuild b/www-client/chromium/chromium-33.0.1707.0.ebuild
index 14c9ff837132..7943a925c386 100644
--- a/www-client/chromium/chromium-33.0.1707.0.ebuild
+++ b/www-client/chromium/chromium-33.0.1707.0.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/www-client/chromium/chromium-33.0.1707.0.ebuild,v 1.3 2013/11/16 06:03:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1707.0.ebuild,v 1.4 2013/11/17 17:36:38 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -154,6 +154,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r2.patch"
 	epatch "${FILESDIR}/${PN}-gnome-keyring-r0.patch"
+	epatch "${FILESDIR}/${PN}-build_ffmpeg-r0.patch"
 
 	epatch_user
 
@@ -400,7 +401,7 @@ src_configure() {
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.sh linux ${target_arch} `pwd` config-only || die
+	chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die
 	chromium/scripts/copy_config.sh || die
 	popd > /dev/null || die
 
diff --git a/www-client/chromium/files/chromium-build_ffmpeg-r0.patch b/www-client/chromium/files/chromium-build_ffmpeg-r0.patch
new file mode 100644
index 000000000000..b22606d8ed0f
--- /dev/null
+++ b/www-client/chromium/files/chromium-build_ffmpeg-r0.patch
@@ -0,0 +1,15 @@
+Fix HOST_OS detection in build_ffpeg.sh
+
+https://bugs.gentoo.org/show_bug.cgi?id=491466
+
+--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh
+@@ -75,7 +75,7 @@
+ LIBAVUTIL_VERSION_MAJOR=52
+ 
+ case $(uname -sm) in
+-  Linux\ i386)
++  Linux\ i?86)
+     HOST_OS=linux
+     HOST_ARCH=ia32
+     JOBS=$(grep processor /proc/cpuinfo | wc -l)