live ebuild now slotted, installable alongside releases. removed failing patches. man page fix in 9999 and dev channel.

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

7 files changed, 82 insertions, 388 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4fbaef8ca909..dd570e7204ce 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.293 2011/03/01 11:14:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.294 2011/03/01 13:52:49 wired Exp $
+
+*chromium-9999-r1 (01 Mar 2011)
+*chromium-11.0.672.2-r3 (01 Mar 2011)
+
+  01 Mar 2011; Alex Alexander <wired@gentoo.org>
+  -chromium-11.0.672.2-r1.ebuild, -chromium-11.0.672.2-r2.ebuild,
+  +chromium-11.0.672.2-r3.ebuild, -chromium-9999.ebuild,
+  +chromium-9999-r1.ebuild, +files/chromium-browser.xml,
+  files/chromium-launcher-r1.sh:
+  live ebuild now slotted, installable alongside releases. removed failing
+  patches. man page fix in 9999 and dev channel.
 
   01 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
   chromium-9.0.597.107.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a1b3782bf996..11c1e3d157a8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
-AUX chromium-launcher-r1.sh 656 RMD160 844dbdbdf3d8de7808c98d555ff3e52b19fc53c4 SHA1 4deae901ad3c352b2c10eb0ccf034b7b9e494580 SHA256 1b4ac043ffa4c698fba3c2521d26cb6f7dcd12f073ff4b551ca4781dbbe703fc
+AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
 AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
 AUX chromium-system-flac-r0.patch 453 RMD160 5313955501e3d9c985169f5ab45c9c8dae4e1099 SHA1 9c25e31570277b134540a77352ab0910e4a8cfeb SHA256 973e538be539b13b17d99f812ce1bfa6bfdd524d182e5186b89148fbafda175f
 AUX chromium-system-speex-r0.patch 472 RMD160 8a8d573ae2ee08828d2376547a1755cc640875d9 SHA1 815ceb8513bbf20355c6c83dbfae2f7d3bfa4cd8 SHA256 967486edb2f7c0503bb2b373944ce8c5ce050e0f39da65d245f8695b6e8436f6
@@ -25,28 +26,27 @@ DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248
 DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95fefd278cd42 SHA1 ea129fd68d78e84a573e25aef94a1f8697a22476 SHA256 48f7d849d3bfec40d6f7e5c76a964a36e9203127bafcb8068bcd63817c706d5f
 EBUILD chromium-10.0.648.114.ebuild 10031 RMD160 b29572b822da7cec0dac5a73b8d32926816cd9f8 SHA1 38cfe7ee7e24901f2e19df70a302d156770358f3 SHA256 bd271c9215cf615c4753aad60a32abce3ebc1e6036d5d2a1638d7d30df44df23
 EBUILD chromium-10.0.648.82.ebuild 10037 RMD160 e88e2ee92669c5b8e0304eed35925f37bad781c1 SHA1 9d93878122e190a693dbf0d5c4ce62d95052a237 SHA256 5647ce435a464d3f876d4bacce3a8e7c7406ae18fa095f6b26b1440e365941c7
-EBUILD chromium-11.0.672.2-r1.ebuild 10539 RMD160 8cb2b99caa8a59f3a8411e49da0d14229f809321 SHA1 7ed8118282ba93aa5673adaab3455d59730c998e SHA256 d686c5233a0693c64799150507dd22eca36eb7ce7335c27da45f2f1e95764d1f
-EBUILD chromium-11.0.672.2-r2.ebuild 10651 RMD160 0c0fa4be4ea93eddc0613c721d4c6f9a90041a63 SHA1 331452d5775fd0ff988c72aec45da31468b7b094 SHA256 9853e399adfe3bd0c66adf71ed25dcd5da2bb8491b9ce337e3a255982d87f85f
+EBUILD chromium-11.0.672.2-r3.ebuild 10621 RMD160 7a937e82573ed549b9dba0375b90725ee5b6f3f5 SHA1 1c0435f19687e3c3cc12b70b59481ef40729f831 SHA256 c51e1c42c5052e19fb58d27d7e52df7bc4e466a0a58939e9e07dad7688bd7def
 EBUILD chromium-9.0.597.107.ebuild 9099 RMD160 0e4edc4e0cb859ea41538bb01ddfea488daef881 SHA1 5b794909b7d5e4289ceba5d8be7ba92d53e75ed4 SHA256 fa7d8dd1b01610ec98e0ddc57aa3cc160d4878b83825f928fada3b2b222aa215
 EBUILD chromium-9.0.597.94.ebuild 9115 RMD160 2256e35af13b40686d634b586e091f60337942b5 SHA1 020d7ad4422ac6c6368a6bbda4046c774164007e SHA256 3d772bd92e13f79112a67196743dff420ad2bcaac1371c7dfcb448d2e87ba234
 EBUILD chromium-9.0.597.98.ebuild 9108 RMD160 6941b2d97130441aa454d4b75d281ef1b06eb843 SHA1 0881ab232a67e4645946acd4f75d31c3333f65c1 SHA256 dca284a5cd96af522542ce0eb493f23ab80097f28d0c0fc9292e5262c00478e5
-EBUILD chromium-9999.ebuild 12095 RMD160 01d11e34ba93dcab1c84c6672417a6df4cd11816 SHA1 1a2d10f6b5b077efadc742406f13762dc954e010 SHA256 afd15f3ae6c48acb439ff6d7cb163641be4762286de746358d53aa6de0302028
-MISC ChangeLog 64764 RMD160 881b36546a88f4a5f5443e22185f2c3bafc4c7b9 SHA1 1a4e4451335f8a2296422cac73f29e01da871dd0 SHA256 41f6d5d3ceeff362c5af856ca3383ec34440dfe5de6672e7e875ba7647268d61
+EBUILD chromium-9999-r1.ebuild 12645 RMD160 c78eeddf66a3bc693cbd9a8d89d441cc663493e8 SHA1 bda1cf5823d578bc34e9ca3ca1722ad4e762b178 SHA256 4c2b3516333634a597b806e70faf89c9be1d8e6331e946e21a0935c271f709a2
+MISC ChangeLog 65219 RMD160 31089fcc67f0e1e47b6a5244416e986ea316cf0f SHA1 7038be3617043968d8466a55989e066ea84e0c34 SHA256 377c909e4e8a6ebd2adec61e502bd082cafb28dc1cec10b16e3ac867c2cbce64
 MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNbNTlAAoJEPqDWhW0r/LCU9wP/3x14mMbXz29CFZDzDvPotUs
-bDv47e+2M/wa6ZIlSEAmn4rSGopPr92vlrOhy7HSGWwU0SZ0cLBANzzwXNVNQPAG
-ueCBsCVupSCgxUMMmTKYgcKZ+c2VR4JCRguxjHn8hTp5VYFMFUpNdNzElGDR7Ocy
-5cAmz1Ov1SVp8i4jSYw2z4feaKCR0j+HQiH3BeqAeiP0f2432kNEP4SCYFwJeHdt
-BbQiNwY6BO6RzlPEJ2GhlIrBBPjWPsLOcAusZmNpuXskAIsm2EmIs6ctY6gL/yin
-qkd3GUUH2OTjelemLk0fW2OFHe+Sb7wVPnk58lysfU7hnVg0emZDvsgaD2f/Kf7M
-0Jw4X8uZ/9lDWt+VP2otX/2GEuXxTSWQWGvEp9POGF596gQXFsTZDGfL8iMQH0LO
-uAQyZhlPfRqqSQD0Aqqe1f4nqLrXiebuQoMwMTLtlTZaiSrRPqQgWuo5GQ4Zq3EC
-eMotGwqoGEoQLpR1Km6i1FC24PpIS9lv1EN+kEnKkbEtwWt13oJpECpMzP+5RZG+
-r0aBlVKWdpzsEpxdJsh1UT3q90ZGnFqYNEx0VrJm0NC7EjhwmqUrpzxbFeMB/GBV
-CR2tPHFXo30WQzzI0kunfQDSxiDVRdUDn5yUxB7pdzdsMYk22Lxy+ZWz87P5P/cM
-sNIHn4ekx7bNHnSfu4H/
-=lmBG
+iQIcBAEBCAAGBQJNbPpXAAoJEDZF8K7rm0r6sqIP/RaHw/8frUQvqhql+gNDyVWU
+eZ/GrqQXJtLgBKBlGowVQToQsal2sgQskd1TneXLQgbTj0ReYF5cZvHkFLaM3Tu6
+Wrhf+xahUZKjGz65+vm2AOj+5YUCGLcVa9lkVO5cZt7Jk12YfOh878s/BbyL/0mp
+pvunbfLgCK219Klxf+GaZV6HZO81dSMpJVZS2ysrKBV4Qm8PDyS2B2LYtLYk/sea
+H0SCG6XqsnQWoSzwJp7cCAVvrVCM45qaxfHsIlP9lw7RRulYhutckWTXCJP5FyPF
+FeaFxLHAGGXr+DzNA95ixi+ut1uH2chx1ECgSxSoXwpzIdMb304iyJYOqN6an6S+
+K46DtnsozR9sQo+jO+0LjZoJ4cWVx4E/GGkN2g7pY2dW3ZDjGW6kB0cqEFmraPxD
+xfSECSE7gYcnBL37SLWMuq6+S7EMnLZxLUpn+XSJywo94JrBB6w/0NCysSB6lQiQ
+TPWVB3OMhsD93AQ63t+lzlFpoWexWUrW0aKDVNW9QStMAwu2zZJ/O3lU3Ibg6+L7
+IoyeSQBpp/G3Eu1vPBNTbjkhuWcipkl356TuoFtE6BOwtHIo/n+JoTVzosxW/rgE
+0GmFv4jlXlmOhEjHsZtIQzFker14aMTqkHjp+X9OHYu0Ytsgc7P75sIq7zwPEHDT
+6eVpL2OkVFjC/0k8th5o
+=mLW+
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-11.0.672.2-r1.ebuild b/www-client/chromium/chromium-11.0.672.2-r1.ebuild
deleted file mode 100644
index e728d0914b8c..000000000000
--- a/www-client/chromium/chromium-11.0.672.2-r1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r1.ebuild,v 1.2 2011/02/22 18:24:22 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.1.4"
-
-inherit eutils fdo-mime 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://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring"
-
-RDEPEND="app-arch/bzip2
-	>=dev-lang/v8-${V8_DEPEND}
-	dev-libs/dbus-glib
-	>=dev-libs/icu-4.4.1
-	>=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
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/libvpx
-	media-libs/speex
-	>=media-video/ffmpeg-0.6_p25767[threads]
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/chromium-tools-0.1.4
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-misc/xdg-utils
-	virtual/ttf-fonts
-	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# 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
-
-	# Prevent user problems like bug #299777.
-	if ! grep -q /dev/shm <<< $(get_mounts); then
-		ewarn "You don't have tmpfs mounted at /dev/shm."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
-		ewarn "and run 'mount /dev/shm'."
-	fi
-	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-		ewarn "/dev/shm does not have correct permissions."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please run 'chmod 1777 /dev/shm'."
-	fi
-
-	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
-	fi
-	eshopts_pop
-}
-
-src_prepare() {
-	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r1.patch
-
-	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
-
-	# Make sure we don't use bundled FLAC.
-	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
-
-	# 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/expat/*' \
-		\! -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/iccjpeg/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libwebp/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	# Provide our own gyp file to use system flac.
-	# TODO: move this upstream.
-	cp "${FILESDIR}/flac.gyp" "third_party/flac" || die
-
-	# Check for the maintainer to ensure that the dependencies
-	# are up-to-date.
-	local v8_bundled="$(v8-extract-version v8/src/version.cc)"
-	if [ "${V8_DEPEND}" != "${v8_bundled}" ]; then
-		die "update v8 dependency to ${v8_bundled}"
-	fi
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# Disable experimental extensions incompatible with system-provided V8,
-	# bug #354343.
-	cp "${FILESDIR}/experimental.gyp" "v8/src/extensions/experimental" || die
-	sed -e 's/ENABLE_JAVASCRIPT_I18N_API=1/ENABLE_JAVASCRIPT_I18N_API=0/g' \
-		-i build/features_override.gypi || 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"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_vpx=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf+=" -Duse_cups=1"
-	else
-		myconf+=" -Duse_cups=0"
-	fi
-
-	# Make GConf dependency optional, http://crbug.com/13322.
-	if use gnome; then
-		myconf+=" -Duse_gconf=1"
-	else
-		myconf+=" -Duse_gconf=0"
-	fi
-
-	if use "gnome-keyring"; then
-		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
-	else
-		# TODO: we should also disable code trying to dlopen
-		# gnome-keyring in that case.
-		myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
-	fi
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if use gecko-mediaplayer; then
-		# Disable hardcoded blacklist for gecko-mediaplayer.
-		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
-		# the browser to hang. We can handle the situation via dependencies,
-		# thus making it possible to use gecko-mediaplayer.
-		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-	fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	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 a build error with -Os, bug #352457.
-	replace-flags "-Os" "-O2"
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-	if use test; then
-		emake base_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/base_unittests
-	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 #350347.
-	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*' || die
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die
-
-	# 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 || die
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium-browser.1 || die
-
-	# 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}" || die
-	dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
-
-	# Install icon and desktop entry.
-	newicon chrome/app/theme/chromium/product_logo_48.png \
-		chromium-browser.png || die
-	make_desktop_entry chromium-browser "Chromium" chromium-browser \
-		"Network;WebBrowser" "MimeType=text/html;text/xml;application/xhtml+xml;"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/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
-		doins "${FILESDIR}"/chromium.xml || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/chromium/chromium-11.0.672.2-r2.ebuild b/www-client/chromium/chromium-11.0.672.2-r3.ebuild
index 06de8ccca442..f89a1614c5b3 100644
--- a/www-client/chromium/chromium-11.0.672.2-r2.ebuild
+++ b/www-client/chromium/chromium-11.0.672.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r2.ebuild,v 1.2 2011/03/01 07:23:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r3.ebuild,v 1.1 2011/03/01 13:52:49 wired Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -306,8 +306,7 @@ src_install() {
 	doins -r out/Release/locales || die
 	doins -r out/Release/resources || die
 
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
+	newman out/Release/chrome.1 chromium.1 || die
 	newman out/Release/chrome.1 chromium-browser.1 || die
 
 	# Chromium looks for these in its folder
@@ -327,7 +326,7 @@ src_install() {
 	if use gnome; then
 		dodir /usr/share/gnome-control-center/default-apps || die
 		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml || die
+		doins "${FILESDIR}"/chromium-browser.xml || die
 	fi
 }
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 17b5524d3286..82bdb2fdcb4d 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.137 2011/03/01 07:23:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.1 2011/03/01 13:52:49 wired Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,9 +15,9 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/tools/depot_tools"
 EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="live"
 KEYWORDS=""
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring"
+IUSE="cups gnome gnome-keyring"
 
 RDEPEND="app-arch/bzip2
 	dev-lang/v8
@@ -49,13 +49,13 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2"
 RDEPEND+="
+	!=www-client/chromium-9999
 	|| (
 		x11-themes/gnome-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
 	x11-misc/xdg-utils
-	virtual/ttf-fonts
-	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
+	virtual/ttf-fonts"
 
 src_unpack() {
 	subversion_src_unpack
@@ -107,7 +107,8 @@ egyp() {
 }
 
 pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	SUFFIX="-${SLOT}"
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${SUFFIX}"
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
@@ -140,15 +141,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r1.patch
-
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
 
-	# Make sure we don't use bundled FLAC.
-	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
-
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -257,14 +252,6 @@ src_configure() {
 		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
 		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
-	if use gecko-mediaplayer; then
-		# Disable hardcoded blacklist for gecko-mediaplayer.
-		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
-		# the browser to hang. We can handle the situation via dependencies,
-		# thus making it possible to use gecko-mediaplayer.
-		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-	fi
-
 	# Our system ffmpeg should support more codecs than the bundled one
 	# for Chromium.
 	myconf+=" -Dproprietary_codecs=1"
@@ -329,12 +316,18 @@ src_install() {
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 	newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die
+	sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \
+		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	sed "s:chromium.desktop:chromium${SUFFIX}.desktop:g" \
+		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${SUFFIX}:" \
+		-i "${D}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
 
 	# 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 || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${SUFFIX} || die
 	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${SUFFIX} || die
 
 	insinto "${CHROMIUM_HOME}"
 	doins out/Release/chrome.pak || die
@@ -343,9 +336,8 @@ src_install() {
 	doins -r out/Release/locales || die
 	doins -r out/Release/resources || die
 
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium-browser.1 || die
+	newman out/Release/chrome.1 chromium${SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${SUFFIX}.1 || die
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
@@ -355,8 +347,8 @@ src_install() {
 
 	# Install icon and desktop entry.
 	newicon chrome/app/theme/chromium/product_logo_48.png \
-		chromium-browser.png || die
-	make_desktop_entry chromium-browser "Chromium" chromium-browser \
+		chromium-browser${SUFFIX}.png || die
+	make_desktop_entry chromium-browser${SUFFIX} "Chromium ${SLOT}" chromium-browser${SUFFIX} \
 		"Network;WebBrowser" "MimeType=text/html;text/xml;application/xhtml+xml;"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
 
@@ -364,10 +356,23 @@ src_install() {
 	if use gnome; then
 		dodir /usr/share/gnome-control-center/default-apps || die
 		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml || die
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${SUFFIX}.xml || die
+		sed "s:chromium-browser:chromium-browser${SUFFIX}:g" -i \
+			"${D}"/usr/share/gnome-control-center/default-apps/chromium-browser${SUFFIX}.xml
 	fi
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
+
+	elog
+	elog "The live ebuild of chromium is now in its own slot."
+	elog "This means that you can have it installed alongside a versioned"
+	elog "release and it has its own configuration folder, located at"
+	elog "	\${HOME}/.config/chromium-live"
+	elog "If you want to use any existing, old configuration, you'll have to"
+	elog "rename the old config directory *before* launching chromium-live:"
+	elog "	mv \${HOME}/.config/chromium \${HOME}/.config/chromium-live"
+	elog "To run, execute chromium-live or chromium-browser-live."
+	elog
 }
diff --git a/www-client/chromium/files/chromium-browser.xml b/www-client/chromium/files/chromium-browser.xml
new file mode 100644
index 000000000000..2c95a5584b33
--- /dev/null
+++ b/www-client/chromium/files/chromium-browser.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
+<default-apps>
+  <web-browsers>
+    <web-browser>
+      <name>Chromium</name>
+      <executable>chromium-browser</executable>
+      <command>chromium-browser %s</command>
+      <icon-name>chromium-browser</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+    </web-browser>
+  </web-browsers>
+</default-apps>
diff --git a/www-client/chromium/files/chromium-launcher-r1.sh b/www-client/chromium/files/chromium-launcher-r1.sh
index dbbca9d0a6b8..761e56148d98 100644
--- a/www-client/chromium/files/chromium-launcher-r1.sh
+++ b/www-client/chromium/files/chromium-launcher-r1.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -22,4 +22,4 @@ esac
 # Set the .desktop file name
 export CHROME_DESKTOP="chromium-browser-chromium.desktop"
 
-exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"