Dev channel bump. Temporarily use bundled snappy. Fix bug #460404 by ago. Remove old.

Package-Manager: portage-2.1.11.55/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

4 files changed, 34 insertions, 36 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8fc4403e283b..c21f0e0aabde 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.874 2013/05/03 03:41:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.875 2013/05/03 16:54:01 phajdan.jr Exp $
+
+*chromium-28.0.1496.0 (03 May 2013)
+
+  03 May 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-28.0.1485.0.ebuild, +chromium-28.0.1496.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Dev channel bump. Temporarily use bundled snappy. Fix bug #460404 by ago.
+  Remove old.
 
 *chromium-27.0.1453.73 (03 May 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3a5325b55d82..f7610c327703 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -33,24 +33,24 @@ DIST chromium-27.0.1453.65-lite.tar.xz 108385660 SHA256 2bb6e6d25438cb7b04d849d3
 DIST chromium-27.0.1453.65-testdata.tar.xz 138717556 SHA256 7d8b36fe52fd96f3d822832db4df1d5bc723d19a7f7a1acef91c2a99e649910d SHA512 9f4364e685cd91adac775c19ef0a67e22fa54e354af41e734eee53a90e9d538727a1f9de646b9f182089bfcebbc81111446439e645acaa138f1073952b5669c9 WHIRLPOOL 5e2b313975a25d5c7d5338a65e03ee130f7d98a27cf25f28488a74c405a93845abbb300cd2ae289b80d003a059157772d1a95a64479b7346b712efe3996ac372
 DIST chromium-27.0.1453.73-lite.tar.xz 108370752 SHA256 b9ee6a9c6d4e21d2086a00d705997983f4c281903e5920f2d71d91a33d79881b SHA512 9a8c8879d0f831ace86a9028fe94371246b42021fc27f8dc164936aab685b5d90c5582532336fa30c7d893192f71dc043de3ef485d20ccd06f6498a83c9a4646 WHIRLPOOL 67d5aa56b077cb8737c9ac79c112c53b699f96a72129687211a5daa235284251c925b2c4dc28b0a79fa278835e69378dedcc35721d8ef013be4fb87c2000fb60
 DIST chromium-27.0.1453.73-testdata.tar.xz 138707228 SHA256 a6b75a301f6bc1aedf9332206901ad3cd9d57456d55fcf3b707325d1356c3374 SHA512 f77b0bd10eeaa695621edf96e7d88bc50a618f116631b4a7211ed70c9256cfb460a3aaa35358cd6842e7d39eeba8c53457d39cbcb6ad72a3a36c2a943d0c7c26 WHIRLPOOL 3d70576d572875e1856a28505570e2e336ff846c0bf85f32887fe71e2c08c4b701f9fa7bc9de0c10faa4b1ba5e8cfa526ab2af429953a80d8453f4d220687faa
-DIST chromium-28.0.1485.0-lite.tar.xz 107423036 SHA256 ba64463b6ec3a1f1a15efae9eedc641f88d9fcf81de0fec2d03c5ce855d022b1 SHA512 99ccc4e63fe046f2eb6e27133aff37e0fb61b29a583ce9bd879d5de8757b9319c781cb7adaf6ab63542bcc26068130d6cd9e543d27c37e61fe4cb4dc1c154992 WHIRLPOOL a4924a2a30b2eb6a5d1e2a47b0828af5b2f864f8f3f28e80e0e36a1e208799d2382080414772ab94eb79a31b3b11fc1f322635ff50b34778833753fac5bfb172
-DIST chromium-28.0.1485.0-testdata.tar.xz 139968712 SHA256 7ef75e7cf526c1838486a1f4b0b9bcfa03b98d8c9100b6e60bedc162db020084 SHA512 a900aa978e9671b09066ca99462c92f29fea2782a16501f8089285996f923b3700883ec92d9dc924af4e3108ff8af1c6cc769dd930106da8c2d6477da1e774df WHIRLPOOL 8c145cb7dfa49f3b5aca19970a071600655fcaaa6357ce19cecc289de2165239b4cdeba2885e5c035a97b4a0dbbf41ddb7fbb6681a68ebf8dc4de322b976bfa2
 DIST chromium-28.0.1490.2-lite.tar.xz 107572228 SHA256 6bc0ade178f402a57bbe0ffaa4c544a43127ba01d1cd09653459230648bd1138 SHA512 a65907d8d1297509395de29520a4929a4822bebcdd7eb982c425c8cc80edf9069694149a5ed8ab461a42e01f9a0cc860f3330bd5ac95cb95cb2caf0376c0f3f8 WHIRLPOOL 742ebec284cd4dd5380c2eb2987c53366204e5597a6f7a3c00c348eae2adab9a20c1b2b66a1371dee93054a8a3b5788f36e226e1058f461c3577f57004fc7184
 DIST chromium-28.0.1490.2-testdata.tar.xz 139701552 SHA256 a9a49ab0db5e7736a4bc00c88607f2c42e6fc7210d2152908651638850d1194d SHA512 4478e67a85c0864244eb7a930f321be9a9407f51f028012450bf4a46606875c599f6f6e3cd5b08e111ceefc19793fdabe5d13ef4ce8035b0676e50893692ca8e WHIRLPOOL ad4f1504f001a02f322e3b95aa9da580b6442d441c8d07c66af3359aac7cbbe51183193347a289373438187ee2424174e9d202d6424bab82a116a494ef4eabef
+DIST chromium-28.0.1496.0-lite.tar.xz 113325276 SHA256 eca3e685d769498ce8c19d4b565f7be259116df62e1ceaabac48285d85434864 SHA512 93e16d8fc3d61419f8b9f43f284390d892dcda03f62e70bdc46870d0503887aa1ebfab22c3a76ce88af6c13591175c44352ab643f894df9801155828fb49d3fa WHIRLPOOL 739ae58d3e9b6ce512a0b8ce03e62cd08c28e8bdcadb0f081b15477631aed63570ad722b2ed20841d5a18cdaa474cc7389356e7da14daae70f36f4706b4fc588
+DIST chromium-28.0.1496.0-testdata.tar.xz 140539068 SHA256 a281f67272413112bd9ac5c1a0aee475d273a587c41857e6e46362cd426ee036 SHA512 6de4bcf0ddea2fb889156a71e8ec0f3b1af14b55f14c07209def3c616d18f3649f863abe4b0a458b21e432d075f7ac2253011292ff1c980fd14ae74a84f5daa0 WHIRLPOOL 612dc33549cadea923f09002ce94875b893769e0886e71638193a53b4dccab361af472ba884d70edda90258c1a09d745cbcc6a5cc5642743a733d0ea1f27bafe
 EBUILD chromium-26.0.1410.43.ebuild 16049 SHA256 f49f9ed4a82964f84e51f5ce9832e2cdb492a56db24203b466f0303a6df1cbc7 SHA512 e4dbfa9a35657136a9128c9895d37278d801430ee7f2548e2b95792c5485b76a25a229fe2351e01f35378bad1b13bdcb037da18d2349f10bfd2b249fc2b545e4 WHIRLPOOL 7fc8f4fc871c60d02e1b7dba8ca4344a07c5c661e029217c0c2dae9ef4764588e5aa98ff22946d94eeef9fbb53cbf6fac0363b8b268e6e84df151ee8e8ab94ce
 EBUILD chromium-26.0.1410.63.ebuild 16166 SHA256 a01a9e49f044e3dd7194eee0127b267b72581771271bf86f19d8236523069b67 SHA512 415c50c72c5270dc4e80486b4dd328995269e3e48dbb5e74603aed5f2a9cddcf341b52d5fa2a8825c20691146617395c0900c886731f9927683a5dd6763d0a85 WHIRLPOOL 3fa509516c609ea34da827491fa6dfbcd10f7dbdca68fc58331403bf2bc9f80f36db8ec13f6e74a5e7ddc32ee5c795c9a0b31a1760922de08404a95410155dcc
 EBUILD chromium-27.0.1453.65.ebuild 17113 SHA256 ab7323e92da9e5c5d5ccdba05fc6b478365cdb51ea5020d5e1278fd3c138fee4 SHA512 02748b400d2eccc1aa930537af7a35832c4042205141b0ba04230728ee11dae3dd52c3cc2c7c070658baffadd5e35f03da96decec84ec281be2918e424e19fe1 WHIRLPOOL d597e26155d9638d8aa6e482fde89f4f384d8e92ffc6e135dd96045d96ebee700ec34ad80bc94bdcf8e1f106f579a08196ee7a1f0ce953c75e9520e7bc9249b2
 EBUILD chromium-27.0.1453.73.ebuild 17110 SHA256 d95379e469b18d477f6b45ebcb54e03876b65d43b28083bb43a45cf3f11ab792 SHA512 e72fbd92e870c6ae02c95363e5d459d51e3874e5920c119e45b843de944c3f5e47cf527e30bc0e590842810099ee523bc14312c7dfe955e271c7317fb244bacd WHIRLPOOL f2077fc138a7e1b2c3578e57f615f5591e6f459f32d034ce7961deb575307e5cd0ef57faa51febfaf5c8dd60ab68dd4f4d209b9d2c98095ba6532c6948090ead
-EBUILD chromium-28.0.1485.0.ebuild 17077 SHA256 bb99d8da40de0d66944a070358baa25a48c90caa6f469e3cdae35c94e3263df1 SHA512 186bd03583fcd37ae2def9dada92a097bf96080e7cf3957a89e02254691b8bc395896ac18fe6ed0cb538d2cc691bea3434bc34878bafa55ff97bf7bdb6ecc2d1 WHIRLPOOL b12ee3b7f9bd2edc87a01ac4d9a053ecbbad23f9c931377b1e066b291a0d11a3d7458c3014af126fe9c5e9d1caf825a64fcd60310b429a85c2c22649abc73d5d
 EBUILD chromium-28.0.1490.2.ebuild 16943 SHA256 e952f2bb3c0fbdf151457e9084c07f588ea84abb8437d478255b657493c94889 SHA512 bb7883c39cc84aa06d1e14185ed77e1e16028c27822c0498b7ed431e3668fee597e50fbdeebba8c1e6c54d385a64bd2657b620712c53daca101e6deecd319eca WHIRLPOOL 714619163da95303c1c71e730603110b9c0b60ca0d3944241b61cd04aa52cb067a21717a9756d6aebbb9abaa32ebc43beaeced976e4f581cb3046d7b77b091a7
-EBUILD chromium-9999-r1.ebuild 18481 SHA256 e05acb4f87b75737e6d29adf07725c29a8bf207098aad17951799ca52ea4f215 SHA512 567fd157a750644d9df391a3dd6c72e77fdf20ead491acd4ecd60f73b8d151c936c73a966e29d64469d8807637c4989f582abb0d31382a96d5bacacbdab77fa6 WHIRLPOOL 62593c4301be0ee676d7968b240f5861210aa537953d6891a32aacf56efb17384df281db84c4729b3f8992e3427d3082d5d36facae2f1e74476494483c6e0629
-MISC ChangeLog 67209 SHA256 a738852587f1f81bb2bd03ab56db5e69ad45b935d3b36304ac96e6288a0348da SHA512 95d774a4872703d0689bdf48f8e5600671b26b38eb2a2a95819ad56f25716a6d245dcd65b9922ae2111d07fb964666afe222a905873ff048a8deb2ab8620688f WHIRLPOOL 3ac51f1662de3f0cb469dd46fb9e4ccbfcb0c5638bf8983a8d5f73a4190d74eefc89c7c644f8642d1d0c865352f7b1e6497b2e95828382d0436a32a02d940d05
+EBUILD chromium-28.0.1496.0.ebuild 16979 SHA256 346de32635f9d0785a03b5a0095b0168b493508f088954cfa42d35d9b63f7be6 SHA512 5ba12f735aeceeebbe5b716c6a8562b3d52b4d504d8357d2a92b80c91bde81ea880a223c0682fe5d7a058c5e175a1e82388cb3da037e64f2e9abe2728d323f06 WHIRLPOOL 77a30fcfa9fa16e4d8c99cd8c5ec9373d6b2480b65e8409d1678aaadbe91c3d6ef357512348dd3c33ede1e9df739da16dddb17bf97e6a1ce4547d140e3e0e9cc
+EBUILD chromium-9999-r1.ebuild 18517 SHA256 b233532d2ebfebf4ca178b0057d7dad9119ce1da310185dfa41ebc6623fed082 SHA512 3fb56bf7ffdcdd153d751c4f20eec93a10caa37d67cc40167d1588504e1081069201826cf34c97f84aa08832c370dad9c9a98859d0b372f32fee12f60055054c WHIRLPOOL af9899886e2bb482f22cf99905d3e93ea472875e44722fdc105ab8e6dade47a42f9d99c9f7d0cb2e1602038ba7941a204025178541c98b3732c2d5b7fea527cc
+MISC ChangeLog 67484 SHA256 a8531e101ead3f5f424a871e31f56578937a40998c3727c073cd16b5995510c3 SHA512 dab19e2483051e1bd1ffb3b05348ac7d8d3ba17c244e45d6b6e1f4f8cf0401d885cba57907e44cec0e6212a40f6df4d85f4d0418de06c0d403ca4b64829e9b09 WHIRLPOOL 7dfd815b12d4ca4ffea1410e56d74e8de037ad69dfb114906768581e434f7fee6b07d6c675a26a3ef21f76cdf1591f31da0d88a47dea23b19b532597eaa9f2ef
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGDMeAACgkQC77qH+pIQ6QWAAEAxCp01vDx3gHs+Q0bpFqf1wvS
-UninSo5xj9lYQTtw+KoA/RGwu42EZl/MVg+TjLJixMN25h3KHGCijhC2bR6m0ytV
-=6bXg
+iEYEAREIAAYFAlGD668ACgkQuUQtlDBCeQIxFACfVvBZe4fjdCrt5cQ8Ja0e0+QS
+a9YAnReZQ4r2zM/bLwdYWnvi4ZedbOXQ
+=sJUB
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-28.0.1485.0.ebuild b/www-client/chromium/chromium-28.0.1496.0.ebuild
index 2723d55c2df5..f11d09f58fbe 100644
--- a/www-client/chromium/chromium-28.0.1485.0.ebuild
+++ b/www-client/chromium/chromium-28.0.1496.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-28.0.1485.0.ebuild,v 1.1 2013/04/23 00:34:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-28.0.1496.0.ebuild,v 1.1 2013/05/03 16:54:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -70,10 +70,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	x11-libs/libXScrnSaver:=
 	x11-libs/libXtst:=
 	kerberos? ( virtual/krb5 )
-	selinux? (
-		sec-policy/selinux-chromium
-		sys-libs/libselinux:=
-	)"
+	selinux? ( sec-policy/selinux-chromium )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	!arm? (
@@ -110,9 +107,7 @@ pkg_setup() {
 	# Make sure the build system will use the right python, bug #344367.
 	python-any-r1_pkg_setup
 
-	if ! use selinux; then
-		chromium_suid_sandbox_check_kernel_config
-	fi
+	chromium_suid_sandbox_check_kernel_config
 
 	if use bindist && ! use system-ffmpeg; then
 		elog "bindist enabled: H.264 video support will be disabled."
@@ -134,8 +129,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-gpsd-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
 
-	# Fix build with system minizip, to be upstreamed.
-	epatch "${FILESDIR}/${PN}-system-minizip-r0.patch"
+	# Fix build with system libraries, to be upstreamed.
+	epatch "${FILESDIR}/${PN}-shim-headers-r0.patch"
 
 	epatch_user
 
@@ -173,6 +168,7 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/snappy/*' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
@@ -269,8 +265,7 @@ src_configure() {
 		$(gyp_use gps linux_use_libgps)
 		$(gyp_use gps linux_link_libgps)
 		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use selinux selinux)"
+		$(gyp_use pulseaudio)"
 
 	if use system-sqlite; then
 		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
@@ -293,12 +288,10 @@ src_configure() {
 	myconf+="
 		-Dusb_ids_path=/usr/share/misc/usb.ids"
 
-	if ! use selinux; then
-		# Enable SUID sandbox.
-		myconf+="
-			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-	fi
+	# Enable SUID sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
 	# Never use bundled gold binary. Disable gold linker flags for now.
 	myconf+="
@@ -354,6 +347,7 @@ src_configure() {
 	# Tools for building programs to be executed on the build system, bug #410883.
 	tc-export_build_env BUILD_AR BUILD_CC BUILD_CXX
 
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
 	egyp_chromium ${myconf} || die
 }
 
@@ -365,10 +359,7 @@ src_compile() {
 		test_targets+=" ${x}_unittests"
 	done
 
-	local make_targets="chrome chromedriver"
-	if ! use selinux; then
-		make_targets+=" chrome_sandbox"
-	fi
+	local make_targets="chrome chrome_sandbox chromedriver"
 	if use test; then
 		make_targets+=" $test_targets"
 	fi
@@ -460,10 +451,8 @@ src_install() {
 	exeinto "${CHROMIUM_HOME}"
 	doexe out/Release/chrome || die
 
-	if ! use selinux; then
-		doexe out/Release/chrome_sandbox || die
-		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	fi
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 
 	doexe out/Release/chromedriver || die
 
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 1b0ddb3ce944..ccd830ca3f74 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.191 2013/05/01 21:30:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.192 2013/05/03 16:54:01 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -221,6 +221,7 @@ src_prepare() {
 		\! -path 'third_party/sfntly/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/snappy/*' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \