Version bump for dev channel release.

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

5 files changed, 357 insertions, 28 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index dd570e7204ce..ea00f886c71d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.294 2011/03/01 13:52:49 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.295 2011/03/01 14:41:18 phajdan.jr Exp $
+
+*chromium-11.0.686.0 (01 Mar 2011)
+
+  01 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-icu-r0.patch, +chromium-11.0.686.0.ebuild,
+  chromium-9999-r1.ebuild:
+  Version bump for dev channel release.
 
 *chromium-9999-r1 (01 Mar 2011)
 *chromium-11.0.672.2-r3 (01 Mar 2011)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 11c1e3d157a8..6935f352acad 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 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-icu-r0.patch 930 RMD160 0b668ac333e4a89cd0bb34e81a0e16d3e9483784 SHA1 029413b1af70a6de7ff451b96bd3c5738dce67e7 SHA256 c777dc24ffdef210a2ed0bd94242f032e9227fbc9c3b78472e47f0d058f09339
 AUX chromium-system-speex-r0.patch 472 RMD160 8a8d573ae2ee08828d2376547a1755cc640875d9 SHA1 815ceb8513bbf20355c6c83dbfae2f7d3bfa4cd8 SHA256 967486edb2f7c0503bb2b373944ce8c5ce050e0f39da65d245f8695b6e8436f6
 AUX chromium-system-vpx-r1.patch 2171 RMD160 7b5e5e624084a0a63c15e7e783676a9365ad211f SHA1 68142ca461ec721f8134af2e9cf45ff18093da10 SHA256 684a88573c33bb5c987f7e08611b4a3a019eac9ea9ec14fe60f79141e75763c5
 AUX chromium-system-vpx-r2.patch 2207 RMD160 7b33f474c4bcd498dfc3e7ce803b9f6c4505b3b0 SHA1 a28a1629937c686aa4ad3b1ea16479d9b11d3789 SHA256 b33e0e66a257837ba3e10d68ad44434e5f0bb75a143ff095379097722c14d211
@@ -21,32 +19,17 @@ AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a9
 DIST chromium-10.0.648.114.tar.bz2 143575680 RMD160 ead3f76fbeb52d20040d40568d91d5a79ec0338d SHA1 b9e791d35ec7fd69870aeb51f274736ecd352ff3 SHA256 ced4b65225d6cde105901db6702029d3ca11b8eff1ea03fb289d1898682cd4f3
 DIST chromium-10.0.648.82.tar.bz2 144519973 RMD160 91560d901c81a2ba23bba24bdf2a17011fc6c1c6 SHA1 02c61847f3a765cf54e1d67d019fe84ed04d577d SHA256 6dd79f9571f37fce63e3a2e17fe219898f0fb3b2b5ebea665fb5744bbfe41ffd
 DIST chromium-11.0.672.2.tar.bz2 143663792 RMD160 963fe31fa7496dce30c523950fcaf214d7e9ef0b SHA1 fedd1d98b05cea6bd25df597ab460f27eb9320ea SHA256 d58a58812a9277c3320fde86b9f53d2783a47818da7c77d906d52be3064d2be0
+DIST chromium-11.0.686.0.tar.bz2 143222426 RMD160 681442606cb1dcf1033b05bc6f63ada7a2db39bf SHA1 67611be2032858018040f6102362b845d529b82a SHA256 5329b82caaf27042c1c4d129e2f6f75d199785bfa610e37339a4fc5bec2cf237
 DIST chromium-9.0.597.107.tar.bz2 141198237 RMD160 7eec80b363fcc47b460e9a54c21940d309cc079d SHA1 4ebc93e202f87f724effb174459c3f5c2a10c9cd SHA256 1fde635017cd278e09242478de3469166dd89f93c95ce67acf8dfc67dddf8159
 DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248c780f8cb0c SHA1 4a870da41ae25781e4806ec2c95703282fccc4d8 SHA256 7194d999a03bb54813cc49f978dd88f5b08cdd40cee4dcbe4ff5639c0ca3e8d5
 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-r3.ebuild 10621 RMD160 7a937e82573ed549b9dba0375b90725ee5b6f3f5 SHA1 1c0435f19687e3c3cc12b70b59481ef40729f831 SHA256 c51e1c42c5052e19fb58d27d7e52df7bc4e466a0a58939e9e07dad7688bd7def
+EBUILD chromium-11.0.686.0.ebuild 9983 RMD160 a48e08d0e614da764073a0ec97ce1daf7f12bfa5 SHA1 c9a14b99dc8397ffbc69995c48795687f6e67c94 SHA256 bb77cf5e4d3e05389cc96b4325a45fd671927545cc90629f445cacb52691ffc1
 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-r1.ebuild 12645 RMD160 c78eeddf66a3bc693cbd9a8d89d441cc663493e8 SHA1 bda1cf5823d578bc34e9ca3ca1722ad4e762b178 SHA256 4c2b3516333634a597b806e70faf89c9be1d8e6331e946e21a0935c271f709a2
-MISC ChangeLog 65219 RMD160 31089fcc67f0e1e47b6a5244416e986ea316cf0f SHA1 7038be3617043968d8466a55989e066ea84e0c34 SHA256 377c909e4e8a6ebd2adec61e502bd082cafb28dc1cec10b16e3ac867c2cbce64
+EBUILD chromium-9999-r1.ebuild 12541 RMD160 83ea6b55722c84fcd20d0f39c2c60d4b7e12f611 SHA1 e04a66096c509eb87a5f708264653ed7080c8dea SHA256 799a8129c3da8d01cab2de6579a3a763b68d9c8845ab7c46242623c51f205168
+MISC ChangeLog 65451 RMD160 553f8e15cf8abc0f6ef32ac7130e5f1dc0fe75c7 SHA1 8792bd21678d1f2c0d576a64bd4bc10a3d683287 SHA256 7db8a7005c7caad9db0026809e847bd74d3cf53e2c06393a03e671c066527ad2
 MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-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.686.0.ebuild b/www-client/chromium/chromium-11.0.686.0.ebuild
new file mode 100644
index 000000000000..e53716ddc6ef
--- /dev/null
+++ b/www-client/chromium/chromium-11.0.686.0.ebuild
@@ -0,0 +1,320 @@
+# 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.686.0.ebuild,v 1.1 2011/03/01 14:41:18 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+V8_DEPEND="3.1.6.1"
+
+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 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
+	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"
+
+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() {
+	# Make sure we don't use bundled libvpx headers.
+	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
+
+	# Make sure we don't use bundled ICU headers.
+	epatch "${FILESDIR}"/${PN}-system-icu-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
+
+	# 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_flac=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"
+
+	# 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
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || 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
+
+	newman out/Release/chrome.1 chromium.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-browser.xml || die
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 82bdb2fdcb4d..af8c05904064 100644
--- a/www-client/chromium/chromium-9999-r1.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-r1.ebuild,v 1.1 2011/03/01 13:52:49 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.2 2011/03/01 14:41:18 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -175,10 +175,6 @@ src_prepare() {
 		\! -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
-
 	# Remove bundled v8.
 	find v8 -type f \! -iname '*.gyp*' -delete || die
 
@@ -213,6 +209,7 @@ src_configure() {
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	myconf+="
 		-Duse_system_bzip2=1
+		-Duse_system_flac=1
 		-Duse_system_ffmpeg=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
new file mode 100644
index 000000000000..df5b2fb4797c
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-icu-r0.patch
@@ -0,0 +1,22 @@
+Index: chrome/browser/autofill/autofill_country.cc
+diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc
+index a0f1bc8fcfe4a8f90f9845a101dc90959176600a..f39c6511f0e39f55bf972015c35e6919f8cd7266 100644
+--- a/chrome/browser/autofill/autofill_country.cc
++++ b/chrome/browser/autofill/autofill_country.cc
+@@ -13,12 +13,12 @@
+ #include "base/utf_string_conversions.h"
+ #include "chrome/browser/browser_process.h"
+ #include "grit/generated_resources.h"
+-#include "third_party/icu/public/common/unicode/locid.h"
+-#include "third_party/icu/public/common/unicode/uloc.h"
+-#include "third_party/icu/public/i18n/unicode/coll.h"
+-#include "third_party/icu/public/i18n/unicode/ucol.h"
+ #include "ui/base/l10n/l10n_util_collator.h"
+ #include "ui/base/l10n/l10n_util.h"
++#include "unicode/coll.h"
++#include "unicode/locid.h"
++#include "unicode/ucol.h"
++#include "unicode/uloc.h"
+ 
+ namespace {
+