Version bump for dev channel release.

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

4 files changed, 23 insertions, 458 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 34e771a01b87..d6fe55ccebe3 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.695 2012/08/16 18:44:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.696 2012/08/17 19:52:25 floppym Exp $
+
+*chromium-22.0.1229.8 (17 Aug 2012)
+
+  17 Aug 2012; Mike Gilbert <floppym@gentoo.org> +chromium-22.0.1229.8.ebuild,
+  -chromium-22.0.1229.2-r1.ebuild, -chromium-22.0.1229.2.ebuild:
+  Version bump for dev channel release.
 
   16 Aug 2012; Mike Gilbert <floppym@gentoo.org> chromium-22.0.1229.6.ebuild,
   chromium-9999-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index db4d84c5a283..3a550953b817 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -24,23 +24,22 @@ AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298
 DIST chromium-21.0.1180.57.tar.bz2 192416785 SHA256 311ba95249ea994747355596885c9ad583e55bcbe7220a47ea096898e7aeb145 SHA512 7ae15bc00c9c215694cbe7aafeade34f295c669c9945f9e59804f7faf591ff717bb1dccf3c45334924d672366e1e3d7b8e30640f87cf5a016a97f3cb8314e9b1 WHIRLPOOL cfc82517caaccafbc2a208ab46b4e91135aae07e42273e8d0e7af941fecb2e0b3de7b64c96a41ab0f7c7ec7438ec97b61cf5180792960ba466d00329e3a43e54
 DIST chromium-21.0.1180.75.tar.bz2 192591729 SHA256 8ee09c680d254a41fda99713b69f541e50f1e7d555b94c6af517e25a11c8830e SHA512 57a6039d105a6b2a7120cc1f8a267c60873d46f14e826759a58325b9b46e3c96964b2cd9200a4a61b9dc87ee6df59a5072c46dbf190c519790828611e310e0ac WHIRLPOOL 5d242cc313b44f93ff2b7ae4dbc3dc3776c33a1ed539c21c0d387482790f6d1db495fbc21c1fd0ba2c5eb094a549431784330f1d182850bbe62f19b833ea311c
 DIST chromium-21.0.1180.77.tar.bz2 192601532 SHA256 68b4485ed479602c544a7481367dc367d4ad816c65f4ff8a8927e39b10e9dc8d SHA512 4b8ff073e0266c15b44e2df06157a4e4acee12b2dcf6efa093d3b5441c010a09c3a406e0f7b66890a37f8dbd1446da968afa4b7ead07471069128e9c068c9361 WHIRLPOOL 05f183b2bc85a68deedf720a4a7503cd8f801a0695dbaf14dce152264b02cb7d94c7ddb52a02b304c958d5df107e53adbeddf7c58f26a633cfc646c1ec27af93
-DIST chromium-22.0.1229.2.tar.bz2 209929711 SHA256 3236158f708a65f3925575f22595b5dfb7f275e0ade8ce23a28644ec90f61594 SHA512 e92afe61b3c2ed954e026d1aea19d53e8ea7327ae57a56932405ca373ec656be122b1be99edfe6147903f2733f9e5825bfc9b58e933e867a3645c79b280faf5b WHIRLPOOL 1125467066179872b257fa04457c1608ab171bc67df46a9c42e57ec072ae9c6b5fac844236c4b28db21ca760a7ec19248afed1052ad63d824bc0162797571571
 DIST chromium-22.0.1229.6.tar.bz2 209887092 SHA256 48808be08ad1dc3bf8d447038ed47a33490f4885516ae855252e0db76863f479 SHA512 f00ffb2710cdbb62cd45f18b02aa74077ca06b44de9978b6dcb16cc72a04367c0d214a854c905201cf5e2376069819da15bce0ffa9beae4fa96e509400eacd7a WHIRLPOOL 7e192ab9a7c129b089ccb9614d6e610ba5f153f0a5ed9bb62368aabe5574aa37ac65b49ee317057a84c02ec9159db60cc50ddf6b9f228d58609ebed77d00e3f3
+DIST chromium-22.0.1229.8.tar.bz2 209881553 SHA256 804f7459b068714eb45b492f56af452c83359c88b91a7f50f16483b671254a3d SHA512 13d4d2fd4f4fb9709139d27cb031954c86f9e774408feacc8342403b73ce009d59795d01b47af240b4e4300b0bc5122a2bb6474e732f842553edd711a8b828bc WHIRLPOOL c1f1c972d631626162b561bfc4758e5b09e0f7ccdc0ee589bbd7ee28317cbdc92ea2eb6b634228da70dfd3b0cde7cf753863b4f89b9f8598be48b9dcfcb9db1f
 EBUILD chromium-21.0.1180.57.ebuild 13975 SHA256 2e5ec11d48c18a39a415699649ec83a791d9627735dcaab07cfd07c204c7fd96 SHA512 2032ac98eb1940a9d8d91eacb8c901d12a6c50417a71fa4c5814413d9150ccc782f3469b463be3257fdbfa5c04fa0b56fadb74d1e6a62bb72a541524a2504a62 WHIRLPOOL ff69f9e4cc1829363d9ac61e15b4033ff6844225c1d50ed7d0b2417b8df83e78da1c5f46a627cff757d9df324a90ef64b30a316f5aa40edb710f89a38ccaaef3
 EBUILD chromium-21.0.1180.75.ebuild 13966 SHA256 b6e6fdc49a64245f54e90e53edf42e51a736e75147e056cede6f8bd4d5ca4527 SHA512 341d82d3a0382b306c494232362712569bedbf33f7e98c00ea3d4f970b0c940968f4a6cb425059bd682e63b5926b2ec1095524da86c24b61df62f401a55d273f WHIRLPOOL 9bc55a0175c10dcd3d32c345d65f79a39d1c91812783fc33a8f35682505bc8c5476b40cdadd2851d2f5cf65a1bfe4c45b8c23a1ac6a63692e7d536e20d8980e3
 EBUILD chromium-21.0.1180.77-r1.ebuild 14038 SHA256 642b406a8e248bd23ee305ef5b8b9cd69f77bd0027bb65ea8d80b0070e3ad9ef SHA512 8bebadae394d25098571e4a212ddf45316e574e3f2cdd026818ba01d640df5a80176b57d1037ccdb547a0c87be3498f6bb0421d3145c611dfd94f4bf858ba0d3 WHIRLPOOL 273b9383350e58d7cf44ac981f41d3c544006bae69c28ea9d73d92ab3260b9f6957c7051f133ce813745ce318bf9d5668167f9eab518b138263cfe4ede0e2201
 EBUILD chromium-21.0.1180.77.ebuild 13966 SHA256 49eac76a48a64ce5d9db1e2fc46eaf577e5cdc98633a4d8eec2cd6a5336fc6e7 SHA512 3a45c93411409ef83ebe7e56c92b973e66e2882c7955e0acf5678e9c18d1e5675c8991218f77697dd9a06ad248941422a55d6643b61e83d2f0cdac4f47ae00f5 WHIRLPOOL 212224800c0c7c9cb7157f70b0d2194e1bdc6077a63818f0a083af68e4be5085dc33598a6a977cca977aecf408cf89b62fc397e9ba642c90a0078056e1a892da
-EBUILD chromium-22.0.1229.2-r1.ebuild 13935 SHA256 b879969d191306f7df4f0c457aac4db5652958f443266be3e03c18a3085e3955 SHA512 eb139172c60c825b70f9c8c1cb27c899f3c690bf5bcf2843d8ba2e6bd499d86288d526a525698a642386effe2e98c0ea2e90ca14c7b31603f32022253e98b4ff WHIRLPOOL 9b878815caef46bd5af09a81a48487ab297c1db1767977f988f18c4ea75f66a191870a09df32e7e0b1a68995a608e84c8deac4419706da7eb96366a8dc719d9c
-EBUILD chromium-22.0.1229.2.ebuild 13833 SHA256 d4bf762d5c6eddd960bb68d0db07e177f02c953de3adbc040f99bfc00eebf4c9 SHA512 ae27ffa4bd093103c9088afad84185925b90d43125f8c87889aea144af627f3bc06cc45484ac3ab2fddbcb78533af516d1d889f2aedd81981be11ebd529db134 WHIRLPOOL 7040a71be5ce95f88ca5549507aa0f44a152f6c06eeadfc3c82a9dc6b6d03ab2016aa5ed66f550289b61b4189b8616d54a362d8a8473245ae9d7db034bfd715d
 EBUILD chromium-22.0.1229.6.ebuild 13947 SHA256 d9ad9195c5402cdf952e9f64d7255395fceb0c821080619182f3fe56141ff2e4 SHA512 452b2b0f17a8f8c85d8da57f7c4a0d67ff5a13f6faea47e9135221ad16c706e4b648bd85d0960b54b0c1d5f4e31b88b0879bba64f2cac3dc4659b9b5ffd5cc4c WHIRLPOOL d488113e634d9070fcb292b90d737d9fb643d0fb146e015b7f9fabf915dea635244f02bd22908d9b24d06e7c6d708794ae181779e9b934796d6da1b5fdeb835a
+EBUILD chromium-22.0.1229.8.ebuild 13947 SHA256 ed76474f0f987027f5dc3c257134b677efacf319ec0e3a51ccbc86a5c57e73f9 SHA512 ee0c8eb3447d686c7f1f12ab597ddf89167a0619c7d5b201ca0cb6ce282a02d209f88e5f81df89dd5727212ff3eccb61b51a79c37aa21925ae2f9399f5014ba2 WHIRLPOOL bb55adae9bde338db2c16e5c30a3784b04fc8635cecbdafda541afec1d87239e53b8de79d4bee4f8ac8acc2a3fe617d4a3796e5c30ed26fd8812ec234737e3d0
 EBUILD chromium-9999-r1.ebuild 15513 SHA256 3c3ed178bb9f873fcf306176387aba0e26651d3c1560e0cd77cd1ebfc269087e SHA512 7b827dbfca858777ef7ea5676fd26f583e65814110632e73c3fe6071109e95ee3e8486043dca293129447c88f5d3286b4c49f69a12ccd6fa58e87411d0501e45 WHIRLPOOL 3ae890906964546ed3e27469bfb5bad63b442917120bf833b89162d99dc0a2941ff0aa72b2cad54e8725497a4133b4e1488ddcfe4cd4470fd0a78efd13516599
-MISC ChangeLog 33370 SHA256 67fdad6445792e671cf5fb10e4ac2c16a95caeb70fd40541a431d49136805dd0 SHA512 4fe07afa098b4e93956a228e3cf90ae7f1cf82671a9b40c192783b00f2cc674c93372de2795bd7f031b0595e56e8644e4b4e0c86c28f25e28a813ddf2d8528df WHIRLPOOL 9dbc04742857168aaf8de4fc242608a439bd98ab61df67087e9f770da9e73bcf412c1619674e54b8f41ae09f428469fa5e7cf3feee85464702db01a5f8df9fdd
+MISC ChangeLog 33592 SHA256 2c0115256723cb36b195b24cbb7f04feaf51eaa9f58375d9cd5a4712538f7b15 SHA512 c3eb524939ab1364043371102dc81f8e62811db9981aad38206cd77722c0be8b47c28ad48db388a09c9a75b6508139e5e89d9f5503e90f5e1073e7322bdf4b97 WHIRLPOOL 4533c335380c9320533ff2bd86ab0f4ce42ec7c31e3735553cae342490beed21b0c21aad23a1102470acbf68f464ffd87aa5264b40f9703c07b72f0f2cc3defa
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAtP6oACgkQC77qH+pIQ6R/dwD9F/g/4BcFEFtUxkW8oB2YgIHB
-+1NC0ym1peOEzTwQYYEA/i8MTLRjRcZOur/1d9Vb1EhoxZ6pdUooeEGD0lGc6zfk
-=4+DO
+iF4EAREIAAYFAlAuoP8ACgkQC77qH+pIQ6TnHQEAjjh3/qrcBt1VgoKtEyb9TJ94
+6oD6RiY/D3GawfiTmKsBAJrh0w6Yu/bNk+kPytgXGzZ4uTulUApq173lGTMgVAg+
+=IYCv
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1229.2.ebuild b/www-client/chromium/chromium-22.0.1229.2.ebuild
deleted file mode 100644
index 006761b6bdc4..000000000000
--- a/www-client/chromium/chromium-22.0.1229.2.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.2.ebuild,v 1.1 2012/08/10 03:30:56 floppym Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
-
-RDEPEND="app-arch/bzip2
-	cups? (
-		dev-libs/libgcrypt
-		>=net-print/cups-1.3.11
-	)
-	>=dev-lang/v8-3.11.10.6
-	dev-libs/dbus-glib
-	dev-libs/elfutils
-	dev-libs/expat
-	>=dev-libs/icu-49.1.1-r1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	>=media-libs/libjpeg-turbo-1.2.0-r1
-	media-libs/libpng
-	media-libs/speex
-	pulseaudio? ( media-sound/pulseaudio )
-	sys-fs/udev
-	sys-libs/zlib
-	virtual/libusb:1
-	x11-libs/gtk+:2
-	x11-libs/libXinerama
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p9093
-	dev-lang/perl
-	dev-lang/yasm
-	dev-python/ply
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	if ! use selinux; then
-		chromium_suid_sandbox_check_kernel_config
-	fi
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
-
-	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
-	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
-
-	# Fix build without NaCl glibc toolchain.
-	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/hyphen/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jsoncpp/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libusb/libusb.h' \
-		\! -path 'third_party/libva/*' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/libwebp/*' \
-		\! -path 'third_party/libxml/chromium/*' \
-		\! -path 'third_party/libXNVCtrl/*' \
-		\! -path 'third_party/libyuv/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/qcms/*' \
-		\! -path 'third_party/re2/*' \
-		\! -path 'third_party/scons-2.0.1/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/trace-viewer/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/v8-i18n/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webgl_conformance/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	local v8_bundled="$(chromium_bundled_v8_version)"
-	local v8_installed="$(chromium_installed_v8_version)"
-	einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable tcmalloc, it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" -Dlinux_use_tcmalloc=0"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	myconf+=" -Ddisable_glibc=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_vpx
-	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
-	#       needs to become part of webp release)
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libusb=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use selinux selinux)"
-
-	if ! use selinux; then
-		# Enable SUID sandbox.
-		myconf+="
-			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	myconf+="
-		-Dlinux_use_gold_binary=0
-		-Dlinux_use_gold_flags=0"
-
-	if ! use bindist; then
-		# Enable H.624 support in bundled ffmpeg.
-		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
-	fi
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-	fi
-
-	egyp_chromium ${myconf} || die
-}
-
-src_compile() {
-	local test_targets
-	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
-	local make_targets="chrome chromedriver"
-	if ! use selinux; then
-		make_targets+=" chrome_sandbox"
-	fi
-	if use test; then
-		make_targets+=$test_targets
-	fi
-
-	# See bug #410883 for more info about the .host mess.
-	emake ${make_targets} BUILDTYPE=Release V=1 \
-		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
-		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
-		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
-		AR.host="$(tc-getAR)" || die
-
-	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	runtest() {
-		local cmd=$1
-		shift
-		einfo "${cmd}" "$@"
-		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "$@"
-	}
-
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	runtest out/Release/base_unittests \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
-
-	runtest out/Release/cacheinvalidation_unittests
-	runtest out/Release/crypto_unittests
-	runtest out/Release/googleurl_unittests
-	runtest out/Release/gpu_unittests
-	runtest out/Release/media_unittests
-
-	# NetUtilTest: bug #361885.
-	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	runtest out/Release/net_unittests \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned:URLFetcher*'
-
-	runtest out/Release/printing_unittests
-	runtest out/Release/sql_unittests
-}
-
-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/chromedriver || die
-
-	doexe out/Release/nacl_helper{,_bootstrap} || die
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/nacl_irt_*.nexe || die
-	doins out/Release/libppGoogleNaClPluginChrome.so || die
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-	fi
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-22.0.1229.2-r1.ebuild b/www-client/chromium/chromium-22.0.1229.8.ebuild
index e885405f10a7..018ae378c719 100644
--- a/www-client/chromium/chromium-22.0.1229.2-r1.ebuild
+++ b/www-client/chromium/chromium-22.0.1229.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.2-r1.ebuild,v 1.3 2012/08/16 09:58:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.8.ebuild,v 1.1 2012/08/17 19:52:25 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -337,10 +337,10 @@ src_test() {
 	}
 
 	local excluded_base_unittests=(
-		ICUStringConversionsTest.* # bug #350347
-		MessagePumpLibeventTest.* # bug #398591
+		"ICUStringConversionsTest.*" # bug #350347
+		"MessagePumpLibeventTest.*" # bug #398591
 	)
-	runtest out/Release/base_unittests ${excluded_base_unittests[*]}
+	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
 
 	runtest out/Release/cacheinvalidation_unittests
 	runtest out/Release/crypto_unittests
@@ -349,13 +349,13 @@ src_test() {
 	runtest out/Release/media_unittests
 
 	local excluded_net_unittests=(
-		NetUtilTest.IDNToUnicode* # bug 361885
-		NetUtilTest.FormatUrl* # see above
-		DnsConfigServiceTest.GetSystemConfig # bug #394883
-		CertDatabaseNSSTest.ImportServerCert_SelfSigned # bug #399269
-		URLFetcher* # bug #425764
+		"NetUtilTest.IDNToUnicode*" # bug 361885
+		"NetUtilTest.FormatUrl*" # see above
+		"DnsConfigServiceTest.GetSystemConfig" # bug #394883
+		"CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269
+		"URLFetcher*" # bug #425764
 	)
-	runtest out/Release/net_unittests ${excluded_net_unittests[*]}
+	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
 
 	runtest out/Release/printing_unittests
 	runtest out/Release/sql_unittests