Dev channel bump. Remove old.

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

5 files changed, 23 insertions, 475 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7026c3c4ddec..88acc1f6c5b1 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.709 2012/09/08 23:45:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.710 2012/09/12 11:44:02 phajdan.jr Exp $
+
+*chromium-23.0.1262.0 (12 Sep 2012)
+
+  12 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-22.0.1229.26.ebuild, -chromium-23.0.1251.2.ebuild,
+  +chromium-23.0.1262.0.ebuild, chromium-9999-r1.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-22.0.1229.39 (08 Sep 2012)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 499a3662883b..f54757dc241e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,25 +22,23 @@ AUX chromium-zlib-r0.patch 511 SHA256 ec2795bfc47c516401fd2c9648caa3b06e64794392
 AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 SHA512 26cdfd05da7f33ba94cd710ae52a1b345cdea4928500af791cff10ca8f9f44036497d9520f690d4d40be5774e77cf9be77f21233b7f804b1dee7d81b8382a9fa WHIRLPOOL 162deb65f97efca4db35dae64e46e0cd21d02a3dd1ae0ec6fa2f9ee7660fbeeb771a1afa3d07cb0d904cd8d7c16ff4b462bc6be3cf9a4143833e909ab89ac5fd
 AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07
 DIST chromium-21.0.1180.89.tar.bz2 192638239 SHA256 16cca8d90a3369840f79a6f06d11756515fc8a4c3595060778dcab21e59235c5 SHA512 c4bba7b145c5bd43cd63f9ddbb20a805c59e10f16f5ad61e813529c59e56e8c53d161bc50d4d6aa563289b41add51deb8c1f1654522f54d445e64e64b042059d WHIRLPOOL 9646e728637eea4ede8fc9668bdd13f955025647c8e35b7976dc17cf9d53c58fa16e7d2e4d71571a2454a7ca37e52fa1926ae0c57343378b21a7e13616b774e0
-DIST chromium-22.0.1229.26.tar.bz2 209917396 SHA256 7b85a2ceea48d97d985cfb70cd925defbd410b1b625b2cff354bb3b546aed52e SHA512 66e6286648601a1e838ddafe2f6342b80a4fcdd44f5ae3474702e7a15f9a90c453397977d8aaca60093b5dfe81a084c75ad940035f6ad9df99460196e8c5fb26 WHIRLPOOL d4ba5989554955b90edfb698bfe9d61c25ed1f987eb0065a5e0ca7cbf306d6ee3f2dfcddad43415b6f444c1c4fdd818f2998d976c2b7a2fa0e375bbbfead088b
 DIST chromium-22.0.1229.36.tar.bz2 210127731 SHA256 beca86d7895c0e48ad42143ea472583510493b98dcf8a2dd97605152cb4d1f48 SHA512 420838fcdca6d0e2f86b55a8c0f34be18c9ab8871c79f6686932917a011527f0339921701258bc10080e5eb02e8b0681a4f84ac4ebb49bb67b74fe666a0cccfc WHIRLPOOL ad994a5773d1fbf3460e670629d5b46b90efcaa1adb19104713250a2d5a63cd44f3958dc69499f6fdd705015a0359bade18ed0d70bda2f765724255dceb8ef5d
 DIST chromium-22.0.1229.39.tar.bz2 210122348 SHA256 cd7dc850c01720e598535b8f2c342d07848abeb0c903630cfcada73c69fa1e6c SHA512 ae35234c86533034b244ad78162fcc5ad678fb30b7db01f3f03672c27ff80c42e10d3c64f6233bb624d316f297425a1f36916af05222565291818c23be20e50d WHIRLPOOL 3bfefe17a7a31e9446d327d585ab9060fbce39ec09fd6aceeee2b19af751a73f14c244fb9fa4b94839892ef6c268729d19401d97fb33e70bf3518715bb8583da
-DIST chromium-23.0.1251.2.tar.bz2 216054936 SHA256 621e114aaebd9baf0a1228d14cb406209b4addbc3797f8ec5e518bb7f023f1d9 SHA512 7aa8c8eba2e0a483250bc2b1561bbf89a8d4f5eac5ddd18a05abba2c068991a1a93e615d87d673c681110dd93f5347885024b9432eb9f3bc1844a040842e9175 WHIRLPOOL 08259fee2a4951d6e31e88aca4eee9eee7fdf1f35160d4d33a15ab0b98f1fa4ba9a89773cc519f9c419d281df04d4561e7af5c3e75550a7bbdf24a96f6eba979
 DIST chromium-23.0.1255.0.tar.bz2 214978942 SHA256 ef04f056e1abd5491a7ac324c92f583b3a266a8a3cbe59da6f5059636b297a8a SHA512 3b3aa589ca5372a11ddadab27d7dc12de7699a0a849c6db8b0f74e29670de0493b33feeae0216bf916844519396c6207f52359513dc12fb55b73054d4413fe17 WHIRLPOOL 6c97a28c5113c0bfea2e1be5c63bebe43fef744479960738ee2a515da2f7dd8b1e7e43e759af2773b1f0f882ba7765110077876767d5630f43602583250e43c0
+DIST chromium-23.0.1262.0.tar.bz2 215892826 SHA256 064adce9d9ee46522effda08ee9349e36e3b55c15a046de40c1ea7b7c58e58a7 SHA512 511218126d1dfce26f2fba7e4ba66fdb91fdda45ca0f9fd36340443e4c0d3a860c1353fa7bf82fcecbb8e85c3dcf9595a129770e7b9bca0f4f694a0f97d45f12 WHIRLPOOL 1b2557a7ec12027f025afc60efab0999b5537451fde3a12afbc8b4d20ba15e604f0ea6b8e072959f3128695dcecc77010f6884fbf2f2d12ca6dae1e606bcce63
 EBUILD chromium-21.0.1180.89.ebuild 14033 SHA256 c60b9c171e497a89fb8fb5f4f689a02bae782d3d5192b9d65ebf65c6d0d32d25 SHA512 73a335bf332f1147861f7477ac55880b49ae5256a78279d05bdb1b71b1e73cc58752d6492cba63e414ca31a721e78d7fbf53437f3cdb8d1440369178934c2832 WHIRLPOOL e7bbb111cf651d684a123d78d2883848cc515d36ff39d968d91f1123fed2525193021224011f3bddb2e0b7cb99fa395dd691fe36ba800de3d9b87fe8380e4d6c
-EBUILD chromium-22.0.1229.26.ebuild 13948 SHA256 f8e5b08e74d7806b4ac3069a7a91a4a28df9857040b3cdc6b26ef3474bc74111 SHA512 2e3832f6483f261ec1ac1d42304e7f98afac715ae9aabcc7fe78e386395d9ef55ed3c714a26048d37ed0a6560c60ee51ac0cd40e5033f2494d9c6d9d863fcb50 WHIRLPOOL 74478c0e7cfa1cd646591bf42fe27ed0133245265907dd1f3d450019e6fbe0648e24a9a6d9470c51a2376f5af1b55b9302c56a09d6c2a35e0d16188328377999
 EBUILD chromium-22.0.1229.36.ebuild 13919 SHA256 2d117247bb3a00c239ac7ea0a2c926432107b8e137fe0e611bd80ca4d8debe73 SHA512 5a11427df0d17083b898eea7cbeb431754e26e8e75f4e7ec6672a178dc32c3720c67c324ac5acf915b85cd09b7bc85c4993d68d9d0241fd861c469492f49286f WHIRLPOOL 282e1d78952a29576d2e2348c28f7cf71f7f1f0918c3b4cf7b69f64a4335dab3f936f71e5923ab51aa92f30f1cc7a41718e7ca6ce8621a8382bf81f2f6074ac1
 EBUILD chromium-22.0.1229.39.ebuild 13919 SHA256 b4441e6ed59524374b1e2e15045e15ece5b28838b6cc80a48084810bf65a095d SHA512 ff517806282ea5a0a3569c07408bcea2242b3f08b9c4baa49571324ff05fc301857f2af54469e7ce2550d523e5e088803be9aeaacb0543557c4742a9068169ea WHIRLPOOL 13637d895c06180dc11598e751181af98f51110b16ec4e34f77ac28041f778628539f8360bd1a997f4065ca29fa7a8e872c71f9f0595b05b46387bb6fa123a12
-EBUILD chromium-23.0.1251.2.ebuild 14722 SHA256 f60d66882812be5bb4d1a8b8df54600a6401e5de38dcae48371b81a840cc8863 SHA512 7aa4efbbc679c90f6395b0e387343bfa806a75367a5765490d7e119bb5dced4017e45e8851c04529c55773e4a4c89fb61ff7e46db9441d8cfea99dfe7399c0ee WHIRLPOOL 96c9212ffed7900169b4c05368e41d9ea16ce28556602b95a9f43de16be68342cb3dd6d64e938008eff3c15d916adf17e40746be360e5919a4a0a458f0ae99e6
 EBUILD chromium-23.0.1255.0.ebuild 14689 SHA256 2b9423759ae885683572dddb988880787e3f0cb9c5c113db938f6901c4900b32 SHA512 a2c815c0b1a4f1d96a7f5da07e1c341b095cf56fd6b8bdafb439b83de64dab6628833667cda2cd1705e161655eb276224e001bf4aa7860084b86191cd108b875 WHIRLPOOL d5c3f32d321bbe72cfb8d54a2942d1e28d9303a43694bbf0d88a0c64209374ca172020e1cd9c235ee01d5d32d549bf1c23906e36811eefd560b547e537e27a63
-EBUILD chromium-9999-r1.ebuild 15885 SHA256 75b46aa4ca29a63182e4b637544d634920be0a74f9c6d52555e087173700f594 SHA512 f8dad31d692d30f6364d2658427cd861ff825dbf1237fa5dc125dce6594862d1de600eb70ffad96824f0a63119c6fa733187451452a64b14d4f7b0bd0d58ee58 WHIRLPOOL 8244bb687a99afe32ee97219ce8d2f8f2e4c9832f3445293cbe74c2794f581aa33c768c5ddd4c0b72d24005c725afa5e430435d85cd54728dfe43baf2b22ef78
-MISC ChangeLog 36174 SHA256 41e0d3338e7d176904b614fe06dba9df269be6091a44cc01d392daf9d08c0b89 SHA512 5ac90495026cfafbed83d198f2efd1df5bc8582dcedda4e2b62178718340187569766222be0c55ffca782100797a057eaec7bf8a28256fcbe368bd6a2a66996c WHIRLPOOL c880346daa9b9569479cda7dca159e5167f89c55d27d45334e21afee7d84a3985b68b1507abbf53feb4b2beda040ea5317beaafdb013d26f1bcb8ae47883664c
+EBUILD chromium-23.0.1262.0.ebuild 14689 SHA256 b72c9a086219fc7f9eba69f8d840fa0dc90a519c5667c5076d39ff755e17dc1b SHA512 fb38817f6ea6053b6e73e90625c00b63fd1a63ef581dd67e75c938149332e6c1affd1270d1e7a4797536acff5ff61789596ded2ee4d5f18dcb883b8ca1171de4 WHIRLPOOL d18d814f5afcebe23360af7eee8025b696792f41cd0e777af851bb37866ff57ed41bb204d46d7d53a01a27f7cdc011f84abbaae7ebf39bfa0ee0db6bff4b1de0
+EBUILD chromium-9999-r1.ebuild 15852 SHA256 8b6ec60e07aa9b420ddd8895b430efd5c5d64aee1f314213f83fe62120bae712 SHA512 c6d3ef231d88a2be8bda1ea20fb03782722568df39bd9afbe3137796e41e6db8b5acf0b208178c0971f923ae8ef1672065aa1f8e75f979c5eb6e52fbf7a4849f WHIRLPOOL d3b34f32feaad836d1f3c5b4ca37686c2a3b68f602e5f0c8aaf72b83214a3064e5c50d5cd4b8b21109b76c37f915ea1f38176eea25abded0db6794a37aa5ef99
+MISC ChangeLog 36422 SHA256 5474a4ac6549f33a3a04ba11bbfd30e317d75474ea0973a421b88f9daacc3edc SHA512 96d6f39eff474e5ead45f0acaa2f563eec240656d70c4058bb41bfb6bc3214fbfcc84432bd457dbb8d32b039411f6f36111ad04bc260627ae48777a72e4dc219 WHIRLPOOL 97153854c88e689d4416e30496414978c96005ccb6ba29407f185080edd8f333050a66a1712a7669e077623400764d56eb4895a6b36f758ab1fb1d3a2453d969
 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)
 
-iF4EAREIAAYFAlBL2KEACgkQC77qH+pIQ6TzfAEAkgICovclcDbOtyAeaIQ8ZapA
-DZECrZuMGVe4XsA1oSoBAMbHiEaV8z7qq3sbuYYQlks00xZnOnLaZVrCiCTAR35+
-=lo8Z
+iEYEAREIAAYFAlBQdksACgkQuUQtlDBCeQJLGACfVlqCzCy3oQaKMUtznlfCB3in
+YnEAnjkLHQ3x/fsq+JLrqcxm4/5v0G+a
+=fq8F
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-22.0.1229.26.ebuild b/www-client/chromium/chromium-22.0.1229.26.ebuild
deleted file mode 100644
index 2c88cd394b6a..000000000000
--- a/www-client/chromium/chromium-22.0.1229.26.ebuild
+++ /dev/null
@@ -1,449 +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.26.ebuild,v 1.1 2012/08/30 22:04:12 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-0.149
-	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/libwebp-0.2.0_rc1
-	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/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
-	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_libwebp=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)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1"
-
-	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
-		local filter="--gtest_filter=$(IFS=:; echo "-${*}")"
-		einfo "${cmd}" "${filter}"
-		LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}"
-	}
-
-	local excluded_base_unittests=(
-		"ICUStringConversionsTest.*" # bug #350347
-		"MessagePumpLibeventTest.*" # bug #398591
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-
-	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
-
-	local excluded_net_unittests=(
-		"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/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-23.0.1251.2.ebuild b/www-client/chromium/chromium-23.0.1262.0.ebuild
index 6cebdd0d000b..31b9237810cb 100644
--- a/www-client/chromium/chromium-23.0.1251.2.ebuild
+++ b/www-client/chromium/chromium-23.0.1262.0.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-23.0.1251.2.ebuild,v 1.1 2012/09/01 08:40:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1262.0.ebuild,v 1.1 2012/09/12 11:44:02 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -42,10 +42,8 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
-	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
-	sys-libs/zlib
 	virtual/libusb:1
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
@@ -64,9 +62,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
 	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
+	test? ( dev-python/pyftpdlib )"
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
@@ -109,8 +105,8 @@ src_prepare() {
 	fi
 
 	# 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
+	# 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"
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 75b839d5b42a..7602e678f65b 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-9999-r1.ebuild,v 1.133 2012/09/01 08:40:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.134 2012/09/12 11:44:02 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -42,10 +42,8 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
-	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
-	sys-libs/zlib
 	virtual/libusb:1
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
@@ -64,9 +62,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
 	virtual/pkgconfig
-	test? (
-		dev-python/pyftpdlib
-	)"
+	test? ( dev-python/pyftpdlib )"
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
@@ -167,8 +163,8 @@ src_prepare() {
 	fi
 
 	# 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
+	# sed -i '1i#define OF(x) x' \
+	#	third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
 	epatch_user