Version bump for beta channel release. Move kernel checks to pkg_setup.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 26 insertions, 20 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d779dac610cf..c99bbb474086 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.490 2011/11/08 16:16:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.491 2011/11/09 02:59:23 floppym Exp $
+
+*chromium-16.0.912.32 (09 Nov 2011)
+
+  09 Nov 2011; Mike Gilbert <floppym@gentoo.org> +chromium-16.0.912.32.ebuild,
+  -chromium-16.0.912.15.ebuild:
+  Version bump for beta channel release. Move kernel checks to pkg_setup.
 
 *chromium-17.0.932.0 (08 Nov 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7eb2faa72032..081d4bc99594 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
@@ -12,23 +12,23 @@ AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SH
 AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059
 DIST chromium-15.0.874.102.tar.bz2 151371123 RMD160 dfca6a43e773666334c5a40d50fc86c5ee3c335b SHA1 961392fbde1f99a40b860454565e8be3b752a3cf SHA256 63c94003a2152d9b7ec51e9126d6848c3d1ec7088ba6879f47f4b594b00ad878
 DIST chromium-15.0.874.106.tar.bz2 151367039 RMD160 853dc23730a821d51e32e19fd9fc2173dbd2d038 SHA1 424a6b76a93dfdf1cf2fb153041ecdf9f9533c2c SHA256 07d216782b20513d3550e6a2388d31784740264ba6977d66617058687885becf
-DIST chromium-16.0.912.15.tar.bz2 154090158 RMD160 f630f6602fe18f873edc8a5c957ff720d81814c7 SHA1 67f973ac0088d40803ebd8c47fff432e2adcf818 SHA256 c95b7edf5eea8ad5fa0d9a648a1d3eb63f290e91c9508bb3f6be4186f2e8bc02
 DIST chromium-16.0.912.21.tar.bz2 154072311 RMD160 d212ca36c9aabd622276e53777b93316f900c175 SHA1 809a1a6e0d2c8b036b8f7eb97c3fdf18e8af68cd SHA256 09417a33e9e620331f93c5e0904e3dbd8c4ca76a2766556702533b38aa4bd577
+DIST chromium-16.0.912.32.tar.bz2 154126364 RMD160 be1928af8c0095f76a58a618f66b3b06f7e1ca6e SHA1 8d1fe0ab8bf8fa2d6332ef4ad0c2a3f255367f0c SHA256 e2cdff16e68a6b60e54c3f519e8af3256497192fe6d98400369906c915d06713
 DIST chromium-17.0.928.0.tar.bz2 150539755 RMD160 306d46186a497c81461f539500f3c88e67fc5c85 SHA1 129b14bcd60121f32d5264e224535a867384a524 SHA256 471e7b96aa37aba4121f34db2a77de87fa3a6774e1376cc42ce7403cdb2f59ea
 DIST chromium-17.0.932.0.tar.bz2 156649015 RMD160 5ad608f601cec211343595b68f34ccc8dbe181b7 SHA1 d7414b0666aaf55cfa096e739bf539c4de3cf392 SHA256 61dabec8f17559de3b2ee6a537265850ccfaa8c36eb41e9cc4f135461e3f5b78
 EBUILD chromium-15.0.874.102.ebuild 14144 RMD160 9f257a04b01b597205249c2d92f56e7b7e8015e5 SHA1 e5d57b87eba007c47c94006035a0c9f71f108329 SHA256 1ec0d0831d223c130291c8936fd053ed7d8b4ff68fd473fdde5e36a81a99596f
 EBUILD chromium-15.0.874.106.ebuild 14143 RMD160 ef3a52d44e4777aee44e2b835b234189fd381f00 SHA1 c0b6f25b143c90bc59f6a150371bdd6f8ce2b095 SHA256 e3ad615781dfa2b208054a6627378df0fc16f919c594823dc9f44d4fbee10665
-EBUILD chromium-16.0.912.15.ebuild 16406 RMD160 1edb3649f00e9dd74e7d3c8d69e449844946f16f SHA1 e708bb9cd8ed67fc9f061ce46d3187b7e6916bae SHA256 49926bbb586016d8c2dbc7c6304d213037a24df1314913cf79cd9e9d59af9436
 EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90abd0b1512 SHA1 713ae33ba1e0353bb629984d2a954daccd6eef85 SHA256 b4051a317e5743363c2730a27a645dc9892d8c37a8719cc9112f41ee9aee5aba
+EBUILD chromium-16.0.912.32.ebuild 16494 RMD160 bff276cf1ad0dd0a2a3b37c92bcb37dc25cb90c8 SHA1 91ca2d243de24c408b4cdfe7e4807995a9ecf5de SHA256 1aec387bb34f04d5c0fb4daced568b5dfe2e3e2233932396d541a73fbc946d6f
 EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92
 EBUILD chromium-17.0.932.0.ebuild 16536 RMD160 1233fe43bbb7e29b77073be5016e27e79639c942 SHA1 633e9e0ebeb0087e93ccaef477c5cbe8bbdb2573 SHA256 edfad2a40f2945121e7c6a347994ffb9892484024d6dec5c70e1563210043da5
 EBUILD chromium-9999-r1.ebuild 18564 RMD160 6e4b002c6152d9941d95bfc16b893b474500679e SHA1 8cc134e42cba79b14bbf10b764d90ab47e8adc42 SHA256 38b803d9d70930b03779b7a3b381194f1b6768cf9f0d52bce15b6349c00060d8
-MISC ChangeLog 107653 RMD160 d8e973ec691d99aa39d60e1b4c3c786a5a94830c SHA1 b665fd118371e6407ef00c6408f20ed121acf93f SHA256 a3a3962abee8435d4023367ee6a2e6522e7f689ff8cfba2c69c6343d9eedba5e
+MISC ChangeLog 107873 RMD160 ffc6e10b64d5076800672a03df60560b8f6a37d8 SHA1 0e3fccfed9381d474aac0ddb09811fe87e352bc9 SHA256 066daeb18f0d777cf892223ada372e55416f6e6b80030a97e6e8e366e80bae4a
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk65Vf8ACgkQuUQtlDBCeQLTXACghn7RLvflOTcjk0h8QZk1Kacs
-aOAAn1o8cWqXxPIxZH7w15i6vl4gFBjk
-=DnA4
+iF4EAREIAAYFAk657JMACgkQC77qH+pIQ6Rk6wD/aSIaBOwp5x3uyDtzRBByVJ/U
+Uc+UwjTkC8By1A4syxwBAL+TaYEQvQVGln4HX0Ez9v0sjFMPiZNU1Zkd+z7BfvY9
+=9cQ9
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-16.0.912.15.ebuild b/www-client/chromium/chromium-16.0.912.32.ebuild
index 29a2b036f9f3..822b27c67ec2 100644
--- a/www-client/chromium/chromium-16.0.912.15.ebuild
+++ b/www-client/chromium/chromium-16.0.912.32.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-16.0.912.15.ebuild,v 1.3 2011/11/08 00:37:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.32.ebuild,v 1.1 2011/11/09 02:59:23 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -98,17 +98,6 @@ get_installed_v8_version() {
 	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
 }
 
-pkg_pretend() {
-	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
-		# Fail if the kernel doesn't support features needed for sandboxing,
-		# bug #363907.
-		ERROR_PID_NS="PID_NS is required for sandbox to work"
-		ERROR_NET_NS="NET_NS is required for sandbox to work"
-		CONFIG_CHECK="~PID_NS ~NET_NS"
-		check_extra_config
-	fi
-}
-
 if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium-pkg_die";
 fi
@@ -160,6 +149,15 @@ pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 
+	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
+		# Fail if the kernel doesn't support features needed for sandboxing,
+		# bug #363907.
+		ERROR_PID_NS="PID_NS is required for sandbox to work"
+		ERROR_NET_NS="NET_NS is required for sandbox to work"
+		CONFIG_CHECK="~PID_NS ~NET_NS"
+		check_extra_config
+	fi
+
 	if use bindist; then
 		elog "bindist enabled: H.264 video support will be disabled."
 	else
@@ -374,10 +372,12 @@ src_install() {
 	insinto "${CHROMIUM_HOME}"
 	case "$(tc-arch)" in
 		amd64)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
 			doins out/Release/nacl_irt_x86_64.nexe || die
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;
 		x86)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
 			doins out/Release/nacl_irt_x86_32.nexe || die
 			doins out/Release/libppGoogleNaClPluginChrome.so || die
 		;;