Version bump for dev channel release. Remove old.

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

8 files changed, 193 insertions, 402 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 79f2c9a20d2f..c4d551a13195 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.110 2010/06/04 07:46:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.111 2010/06/10 15:54:22 phajdan.jr Exp $
+
+*chromium-6.0.427.0 (10 Jun 2010)
+
+  10 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-disable-vp8-r1.patch, -chromium-5.0.375.55.ebuild,
+  -chromium-6.0.408.1.ebuild, +files/chromium-gyp-fixes-r1.patch,
+  -chromium-6.0.401.1.ebuild, +chromium-6.0.427.0.ebuild,
+  chromium-9999.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-5.0.375.70 (04 Jun 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 02832caccaab..66f28136bedf 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,16 +1,14 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
+AUX chromium-disable-vp8-r1.patch 1204 RMD160 22264b89adf908149e5405c316e4666c4eda4ad8 SHA1 7e104772a645f50449432d4c970d52ffc3555c8a SHA256 ebb9031cd447aca0f3d7f9a2b4081f64dd8244ffd90564ecab06724e1dda63e8
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
+AUX chromium-gyp-fixes-r1.patch 1122 RMD160 8f37f016c9ca937ac0b02d4af533ddd0bb21b340 SHA1 d481f92313ad2aee0b00e2fda3698057e7de4c7e SHA256 22cd04c272d07cef36b1b3e639fad78486dc85dfd21c6cf542dbf4ebea0c2fe5
 AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9
 AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-DIST chromium-5.0.375.55.tar.bz2 163068281 RMD160 da44a6f2ed91c6b39a8505cb12e66d5ae6c70271 SHA1 ddb409638b977f579383e2ccc031bab9c3c0889c SHA256 49f35847f8dd63d229a5916f8fd0c60a9931d07a3cc989866c855739619bd154
 DIST chromium-5.0.375.70.tar.bz2 163191937 RMD160 cb43307d095dc7ba146762b2a997ba32c5c12907 SHA1 96234ce716e5124f8c8ada92ed9a8cbe6183c5ed SHA256 dd2e440b1a230b1adcc8941d825155e5aeaf887fe67702697a845bd459455902
-DIST chromium-6.0.401.1.tar.bz2 170937577 RMD160 7d4218faf521e0c7d08719f8e9d8685939cc94ea SHA1 ceeb841185872adc0b62cbac9e8e595e7ebf634a SHA256 44cdf122a4b4d9a09e771cdcb74cc3d54dd1f6cf5773d5988e0653eb8fc404db
-DIST chromium-6.0.408.1.tar.bz2 171427450 RMD160 53940a407744860e2c16bf5f468ea5b2dc523d5d SHA1 1df3bfa36a78d9f3d0295839511c253fbc4c4526 SHA256 31c93349f79df3a501d7a1a2dc650dcf949c05a32b95d20c01aaf70d2e8f77df
-EBUILD chromium-5.0.375.55.ebuild 5529 RMD160 f12a3171a5fbf2261f97728e7d35ad204d332294 SHA1 a375bdfa41a3c069964aa1fa080249b665249982 SHA256 87da193be1363badb9ca4d52d20b21599943800b3717808b0ddfc91a8c64e822
+DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e181e2f45a16 SHA1 65897ae8d05e04e821333fca05d77cbe0b08771f SHA256 e5ab816d0b39511d6718c2f76c3436c4db3664c06496fe413273a70864d4f3d8
 EBUILD chromium-5.0.375.70.ebuild 5529 RMD160 e5cbdbe070e33581572c5a90d6ba85e3d919018e SHA1 78213d44017915d6b185a38c640212b6c9c05842 SHA256 f170292a528ac0edc08971efe8bad1517f46223c0b88adb03efd70b99cf5c572
-EBUILD chromium-6.0.401.1.ebuild 5263 RMD160 4a58c94f482757a42e4d11d8a4c4f6c34f49d194 SHA1 c2e2521e6c06e3ecd70cebbcf8ccebfc8ffaf5a3 SHA256 54de518788f9bd04e7a3cc63d7840a074dca33e6d889fef4e4b4b255036b431c
-EBUILD chromium-6.0.408.1.ebuild 5014 RMD160 8401919f4e64dee18965d8ab3fc7a4c48e2368ab SHA1 a8b05a36e8ee74837f108177ac5aff4c663aebd4 SHA256 29cf2c643d7aee5ae9136f0705923ab243d89b935f66dde21d8e925910cb0ef4
-EBUILD chromium-9999.ebuild 6772 RMD160 eb54d7f001653be6d892facd980f8e9fc412a3a4 SHA1 c20b929adefde13a2ccdb5d1e26f4e303dc1a9da SHA256 40a1575e3fd82c70e09837edf0e9ce2c779bbf19c72ebd2c73732f9b75902bf7
-MISC ChangeLog 24894 RMD160 4ec64afc80873b9dccd2b73ed206e0188b1c1132 SHA1 db22e98f16c3f9621be6a9fb406c87ca1a594096 SHA256 fdb65118a30896b447d5176bc6bb0f8306f5dcf5442fed9833ada6ee370b71a1
+EBUILD chromium-6.0.427.0.ebuild 5847 RMD160 87cec997b32b6ee52a33be99cabda4d01a557f96 SHA1 804065f5a569412b228b42b126b62696f55d7493 SHA256 bbe1c2cb74970a80f92e2f1757218b69bd3bd3da509a87b27164b934308ccc99
+EBUILD chromium-9999.ebuild 7628 RMD160 d60f8e551e4960ed633fb606622b2328ed903884 SHA1 7393d9b91f4f62867a9230530e16788961032723 SHA256 10b54b6f67dd55bbc374cbf8d40bcd4e11aa9af7320cd341df5a885fba917b9b
+MISC ChangeLog 25254 RMD160 505aef3164251a285d4561f3efbb2450887996b8 SHA1 5482c2dbcd5d068ecb86e1345a28a124c04dc80a SHA256 61e1088a7635cb16bb2980d55a3183b84d5235c322cb4ef5916e3793dd37bdda
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.55.ebuild b/www-client/chromium/chromium-5.0.375.55.ebuild
deleted file mode 100644
index bad48f63f492..000000000000
--- a/www-client/chromium/chromium-5.0.375.55.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.55.ebuild,v 1.4 2010/06/02 18:52:09 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	media-video/ffmpeg[threads]
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-	plugins-symlink? (
-		!www-plugins/gecko-mediaplayer[gnome]
-	)"
-
-src_prepare() {
-	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
-
-	# Allow supporting more media types.
-	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-
-	# Fix build failure with libpng-1.4, bug 310959.
-	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
-	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
-{
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
-}
-EOF
-	export HOME="${S}"
-
-	# Configuration options (system libraries)
-	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	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="${myconf} -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		|| die "compilation failed"
-}
-
-src_install() {
-	# Chromium does not have "install" target in the build system.
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
-
-	exeinto ${CHROMIUM_HOME}
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-
-	# Plugins symlink, optional wrt bug #301911
-	if use plugins-symlink; then
-		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-	fi
-
-	# Icon and desktop entry
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-	# Gnome default application entry
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-6.0.401.1.ebuild b/www-client/chromium/chromium-6.0.401.1.ebuild
deleted file mode 100644
index b3b7e94263b3..000000000000
--- a/www-client/chromium/chromium-6.0.401.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.401.1.ebuild,v 1.2 2010/05/26 06:35:24 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	media-video/ffmpeg[threads]
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-	plugins-symlink? (
-		!www-plugins/gecko-mediaplayer[gnome]
-	)"
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is
-	# fixed.
-	append-cflags -D__STDC_CONSTANT_MACROS
-
-	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
-	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
-{
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
-}
-EOF
-	export HOME="${S}"
-
-	# Configuration options (system libraries and disable forced SSE2)
-	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	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="${myconf} -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		|| die "compilation failed"
-}
-
-src_install() {
-	# Chromium does not have "install" target in the build system.
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
-
-	exeinto ${CHROMIUM_HOME}
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-
-	# Plugins symlink, optional wrt bug #301911
-	if use plugins-symlink; then
-		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-	fi
-
-	# Icon and desktop entry
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-	# Gnome default application entry
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-6.0.408.1.ebuild b/www-client/chromium/chromium-6.0.427.0.ebuild
index a3bbcc1961db..1607a4632019 100644
--- a/www-client/chromium/chromium-6.0.408.1.ebuild
+++ b/www-client/chromium/chromium-6.0.427.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.408.1.ebuild,v 1.2 2010/05/26 06:35:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.427.0.ebuild,v 1.1 2010/06/10 15:54:22 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -28,7 +28,6 @@ RDEPEND="app-arch/bzip2
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gperf-3.0.3
@@ -45,26 +44,63 @@ RDEPEND+="
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
+remove_bundled_lib() {
+	einfo "Removing bundled library $1 ..."
+	local out
+	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+		|| die "failed to remove bundled library $1"
+	if [[ -z $out ]]; then
+		die "no files matched when removing bundled library $1"
+	fi
+}
+
+src_prepare() {
+	# Disable VP8 until we have a recent enough system-provided ffmpeg.
+	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
+
+	# Fix gyp files to correctly support system-provided libraries.
+	epatch "${FILESDIR}"/${PN}-gyp-fixes-r1.patch
+
+	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/libevent"
+	remove_bundled_lib "third_party/libjpeg"
+	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/libxml"
+	remove_bundled_lib "third_party/libxslt"
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+}
+
 src_configure() {
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is
-	# fixed.
+	# Workaround for bug #318969.
+	# TODO: remove when http://crbug.com/43778 is fixed.
 	append-flags -D__STDC_CONSTANT_MACROS
 
-	# Workaround for bug #320145. TODO(phajdan.jr): rather use a gyp define.
-	append-flags -DUSE_SSE=0
-
-	# Configuration options (system libraries and disable forced SSE2)
-	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	# Make it possible to build chromium on non-sse2 systems.
+	local myconf="-Ddisable_sse2=1"
+
+	# Use system-provided libraries.
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl when we have a recent enough system NSS.
+	myconf="${myconf}
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libxml=1
+		-Duse_system_zlib=1"
+
+	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
+	myconf="${myconf} -Dproprietary_codecs=1"
+
+	# Enable sandbox.
+	myconf="${myconf}
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
 	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
 	# and the performance gain isn't worth it.
@@ -83,6 +119,7 @@ src_configure() {
 	elif [[ $myarch = x86 ]] ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	elif [[ $myarch = arm ]] ; then
+		append-flags -fno-tree-sink
 		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
@@ -111,7 +148,6 @@ src_compile() {
 }
 
 src_install() {
-	# Chromium does not have "install" target in the build system.
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 	dodir ${CHROMIUM_HOME}
@@ -143,13 +179,14 @@ src_install() {
 	# Use system plugins by default.
 	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
-	# Icon and desktop entry
+	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
 	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
 		|| die "desktop file sed failed"
-	# Gnome default application entry
+
+	# Install GNOME default application entry (bug #303100).
 	dodir /usr/share/gnome-control-center/default-apps
 	insinto /usr/share/gnome-control-center/default-apps
 	doins "${FILESDIR}"/chromium.xml
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 6dc1250343ce..f7cd79de8a15 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.54 2010/06/01 20:22:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.55 2010/06/10 15:54:22 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -26,11 +26,10 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-9999[threads]
+	media-video/ffmpeg[threads]
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gperf-3.0.3
@@ -90,25 +89,63 @@ src_unpack() {
 	elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH}_p${CREV} "
 }
 
+remove_bundled_lib() {
+	einfo "Removing bundled library $1 ..."
+	local out
+	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
+		|| die "failed to remove bundled library $1"
+	if [[ -z $out ]]; then
+		die "no files matched when removing bundled library $1"
+	fi
+}
+
+src_prepare() {
+	# Disable VP8 until we have a recent enough system-provided ffmpeg.
+	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
+
+	# Fix gyp files to correctly support system-provided libraries.
+	epatch "${FILESDIR}"/${PN}-gyp-fixes-r1.patch
+
+	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/libevent"
+	remove_bundled_lib "third_party/libjpeg"
+	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/libxml"
+	remove_bundled_lib "third_party/libxslt"
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+}
+
 src_configure() {
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
 
-	# Workaround for bug #318969. Remove when upstream http://crbug.com/43778 is
-	# fixed.
+	# Workaround for bug #318969.
+	# TODO: remove when http://crbug.com/43778 is fixed.
 	append-flags -D__STDC_CONSTANT_MACROS
 
-	# Workaround for bug #320145. TODO(phajdan.jr): rather use a gyp define.
-	append-flags -DUSE_SSE=0
-
-	# Configuration options (system libraries and disable forced SSE2)
-	local myconf="-Ddisable_sse2=1 -Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Dproprietary_codecs=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	# Make it possible to build chromium on non-sse2 systems.
+	local myconf="-Ddisable_sse2=1"
+
+	# Use system-provided libraries.
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl when we have a recent enough system NSS.
+	myconf="${myconf}
+		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libxml=1
+		-Duse_system_zlib=1"
+
+	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
+	myconf="${myconf} -Dproprietary_codecs=1"
+
+	# Enable sandbox.
+	myconf="${myconf}
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
 	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
 	# and the performance gain isn't worth it.
@@ -127,6 +164,7 @@ src_configure() {
 	elif [[ $myarch = x86 ]] ; then
 		myconf="${myconf} -Dtarget_arch=ia32"
 	elif [[ $myarch = arm ]] ; then
+		append-flags -fno-tree-sink
 		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
 	else
 		die "Failed to determine target arch, got '$myarch'."
@@ -155,7 +193,6 @@ src_compile() {
 }
 
 src_install() {
-	# Chromium does not have "install" target in the build system.
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
 	dodir ${CHROMIUM_HOME}
@@ -187,15 +224,15 @@ src_install() {
 	# Use system plugins by default.
 	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
 
-	# Icon and desktop entry
+	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
 	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
 		|| die "desktop file sed failed"
-	# Gnome default application entry
+
+	# Install GNOME default application entry (bug #303100).
 	dodir /usr/share/gnome-control-center/default-apps
 	insinto /usr/share/gnome-control-center/default-apps
 	doins "${FILESDIR}"/chromium.xml
-
 }
diff --git a/www-client/chromium/files/chromium-disable-vp8-r1.patch b/www-client/chromium/files/chromium-disable-vp8-r1.patch
new file mode 100644
index 000000000000..e996afe6a622
--- /dev/null
+++ b/www-client/chromium/files/chromium-disable-vp8-r1.patch
@@ -0,0 +1,33 @@
+--- media/filters/ffmpeg_demuxer.cc.orig	2010-06-10 12:28:10.000000000 +0200
++++ media/filters/ffmpeg_demuxer.cc	2010-06-10 12:29:13.000000000 +0200
+@@ -413,9 +413,8 @@
+     CodecType codec_type = codec_context->codec_type;
+     if (codec_type == CODEC_TYPE_AUDIO || codec_type == CODEC_TYPE_VIDEO) {
+       AVStream* stream = format_context_->streams[i];
+-      // WebM is currently strictly VP8 and Vorbis.
+-      if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VP8 &&
+-        stream->codec->codec_id != CODEC_ID_VORBIS)) {
++      // WebM is currently strictly Vorbis.
++      if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VORBIS)) {
+         packet_streams_.push_back(NULL);
+         continue;
+       }
+--- net/base/mime_util.cc.orig	2010-06-10 12:30:13.000000000 +0200
++++ net/base/mime_util.cc	2010-06-10 12:30:38.000000000 +0200
+@@ -227,7 +227,6 @@
+ #endif
+   "theora",
+   "vorbis",
+-  "vp8"
+ };
+ 
+ // Note: does not include javascript types list (see supported_javascript_types)
+@@ -297,7 +296,7 @@
+ };
+ 
+ static const MediaFormatStrict format_codec_mappings[] = {
+-  { "video/webm", "vorbis,vp8,vp8.0" },
++  { "video/webm", "vorbis" },
+   { "audio/webm", "vorbis" }
+ };
+ 
diff --git a/www-client/chromium/files/chromium-gyp-fixes-r1.patch b/www-client/chromium/files/chromium-gyp-fixes-r1.patch
new file mode 100644
index 000000000000..885e8ed0f09c
--- /dev/null
+++ b/www-client/chromium/files/chromium-gyp-fixes-r1.patch
@@ -0,0 +1,28 @@
+--- chrome/chrome.gyp.orig	2010-06-10 10:25:49.000000000 +0200
++++ chrome/chrome.gyp	2010-06-10 10:26:52.000000000 +0200
+@@ -462,6 +462,7 @@
+         ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+           'dependencies': [
+             '../build/linux/system.gyp:gtk',
++            '../third_party/libevent/libevent.gyp:libevent',
+           ],
+         }],
+       ],
+--- net/net.gyp.orig	2010-06-10 11:42:35.000000000 +0200
++++ net/net.gyp	2010-06-10 11:43:21.000000000 +0200
+@@ -179,6 +179,7 @@
+               '../build/linux/system.gyp:gconf',
+               '../build/linux/system.gyp:gdk',
+               '../build/linux/system.gyp:nss',
++              '../third_party/libevent/libevent.gyp:libevent',
+             ],
+           },
+           {  # else: OS is not in the above list
+@@ -560,6 +561,7 @@
+               '../build/linux/system.gyp:gconf',
+               '../build/linux/system.gyp:gdk',
+               '../build/linux/system.gyp:nss',
++              '../third_party/libevent/libevent.gyp:libevent',
+             ],
+           },
+           {  # else: OS is not in the above list