Backport fixes for bug #372561 and bug #366413. Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

3 files changed, 26 insertions, 10 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5f8e08aab38c..06f08c72de81 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.397 2011/07/17 00:25:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.398 2011/07/17 23:06:55 phajdan.jr Exp $
+
+*chromium-13.0.782.41-r1 (17 Jul 2011)
+
+  17 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-13.0.782.32.ebuild, +chromium-13.0.782.41-r1.ebuild:
+  Backport fixes for bug #372561 and bug #366413. Remove old.
 
 *chromium-14.0.814.0 (17 Jul 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 039fe464b2b7..a983b24edb3d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,22 +16,21 @@ AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1c
 AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
 DIST chromium-12.0.742.112.tar.bz2 151384207 RMD160 13d9092d79a324852b60e42979218f989000cad1 SHA1 181be3b00386d70e7cc8db88c4e782960a8d4e30 SHA256 b19ea97a7def45c9052ead5ad9f171a3ea1df29c17a5d237e0b78bdfdcefdfb2
-DIST chromium-13.0.782.32.tar.bz2 154629346 RMD160 772976bc9eb98986b0840a2c326ec72dde97a598 SHA1 8ba5f9a276e7890fb9dea1539eee0376f72a32e7 SHA256 9c6391df0b8a207066bc6f7b82b7e014ed5e7e24f989a0dcb8112dd2f6019368
 DIST chromium-13.0.782.41.tar.bz2 155160413 RMD160 1af03144ed095c86690d315ed6fe5d242e537530 SHA1 bf6c6e583e35a10ad2d7d2ccd37fa581f701573f SHA256 ab0bd105a6ff4dd4eee80f9834710dab4ec419d143539161c3b5905a12fce65a
 DIST chromium-14.0.803.0.tar.bz2 203144509 RMD160 00e2886eff6616f3c39ee7aef7cd91fa776d967e SHA1 25f9b65e83d5f97d58baea0eb02cb249591c3f8e SHA256 97dd46cb3ad2f7890d7bf7256e9d694304e90f99b1c25ba134e7ea3e50f98722
 DIST chromium-14.0.814.0.tar.bz2 201797447 RMD160 1faf919cfdb4f52ef386db55bdfaa6c0bb8100eb SHA1 223f7ac1015779c60edab89816c3a6b3967c9880 SHA256 4432bd0fec023ca701adce135c71f4248b3b1f83e41730fe110725cfcf8225f6
 EBUILD chromium-12.0.742.112.ebuild 12017 RMD160 b65af3dc698ef3b6f1ecec4eccf1865a697f19bc SHA1 53efd7ac54cae6976a3d0b248656aa7ab57599a3 SHA256 42057d8383c146334cd356b1f4516d8ca0755d96b42a6d08eb71507abc94876f
-EBUILD chromium-13.0.782.32.ebuild 12842 RMD160 38a8c6713bb5118f73fda007165c9b50cd33881d SHA1 22a65c6dc551bcb49ff3a51463d9462eae39d88c SHA256 fa85b76a4c0346b8e9a53e2f4dfb6e2f64ee1ffa9cc2fa83f62f9fc1e5461513
+EBUILD chromium-13.0.782.41-r1.ebuild 13184 RMD160 aa6a0c316ff16299d8f4cad02d465c77d346f415 SHA1 2c7cf5049dbdd0d7378863c7c473e7c11c3aedd4 SHA256 0d45d57a8fa5bdd472ffe6672fc9be74c276319b25e549841af9ddf9343f5fa8
 EBUILD chromium-13.0.782.41.ebuild 12842 RMD160 55136b89a360354745f64401e94c61fffd502d0e SHA1 724b13eb96dae4a202fc74dc9b14860124c0a61d SHA256 39e9130ecb2bc1d8d2c4d67138bdd2dc037b464e0189c06ad90bd47f50d90b48
 EBUILD chromium-14.0.803.0.ebuild 12643 RMD160 cd4df3f84a2224db0dfac59dbf1cc3f2b810cb0d SHA1 d226426dd90852d94ba9410c47517da0b3768e98 SHA256 a8daf44320ccfe514ed4ccd0d56132de1759028c3736a3e85baa62a54d1e2c5e
 EBUILD chromium-14.0.814.0.ebuild 12982 RMD160 61303da10a5f46f3635a7a74de32b25aa511e740 SHA1 f1c692366e66772d10d569016b43389e9daecd18 SHA256 6a68f81b87875701d685704cff85aa3a8143ca0634d7ad9250e6e384fec511d5
 EBUILD chromium-9999-r1.ebuild 15015 RMD160 55cdd2c19bdb5cc4f769f060823cf2d67993493a SHA1 1cf723e4a27c07da825e0faef301a12892640dbb SHA256 f8dd2b4bf5702badf9cd8495c504d8a17fc8f53ed5ac0f166afe3cc35eb505d0
-MISC ChangeLog 88385 RMD160 93a4644dfe2f2375d263833d53d8bcf548f311c7 SHA1 d5553a50ddee59d96c14818a4d2d5817ca102e6c SHA256 4adbd875a57af217b3803d49518ff8c9144ffb0d4f31292cf4d968e87c928b5d
+MISC ChangeLog 88608 RMD160 5059b916c8ca1b39588ffe1598021021d914e296 SHA1 65cb320875a7f53cb10029368de78f9468376f5a SHA256 b882c794a9520404fd3494a5b562c7f3e29fcef3651d5c93d9b24afb3b492352
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4iLAQACgkQuUQtlDBCeQLxrACfRvvVkuK23klmHNaqjxDTJTlY
-eYoAnjFlIUgvVl6yDcEMCMlSrUgXZJhF
-=3QaU
+iEYEAREKAAYFAk4jaxoACgkQuUQtlDBCeQJFeACcCN/dFAObQGZRZhduNpdtFiiy
+RZUAnjqc0Ubc6OT267bz1MTS0rezIGOs
+=qvlW
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-13.0.782.32.ebuild b/www-client/chromium/chromium-13.0.782.41-r1.ebuild
index f08703233f20..7c1a314944db 100644
--- a/www-client/chromium/chromium-13.0.782.32.ebuild
+++ b/www-client/chromium/chromium-13.0.782.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.32.ebuild,v 1.2 2011/06/28 08:50:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.41-r1.ebuild,v 1.1 2011/07/17 23:06:55 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -285,8 +285,18 @@ src_install() {
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 
+	# Install Native Client files on platforms that support it.
 	insinto "${CHROMIUM_HOME}"
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	case "$(tc-arch)" in
+		amd64)
+			doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
+			doins out/Release/libppGoogleNaClPluginChrome.so || die
+		;;
+		x86)
+			doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
+			doins out/Release/libppGoogleNaClPluginChrome.so || die
+		;;
+	esac
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 
@@ -367,7 +377,8 @@ src_install() {
 	local mime_types="text/html;text/xml;application/xhtml+xml;"
 	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser" "MimeType=${mime_types}"
+		"Network;WebBrowser"
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).