Build with system flac, bug #352093 by Mike Gilbert <floppymaster@gmail.com>.

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

6 files changed, 392 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1c4d9b8c58dd..7c1b86f17a8d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.265 2011/01/21 07:51:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.266 2011/01/22 16:18:21 phajdan.jr Exp $
+
+*chromium-10.0.642.2-r1 (22 Jan 2011)
+
+  22 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-flac-r0.patch, +chromium-10.0.642.2-r1.ebuild,
+  chromium-9999.ebuild, +files/flac.gyp:
+  Build with system flac, bug #352093 by Mike Gilbert
+  <floppymaster@gmail.com>.
 
 *chromium-10.0.642.2 (21 Jan 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ec68788aaeed..72cf74930b28 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,7 @@ AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929
 AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
 AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
 AUX chromium-locale-glib-r1.patch 14823 RMD160 78159c294e953941b35346fc3b228ccbdd988b0d SHA1 b6de887cc67e3db01edb22ccd2eec3048f34df87 SHA256 71b1c2c3cd7382938e1cb4097428ded1dd019b8ef6be3ed6e882647e8e65b2f6
+AUX chromium-system-flac-r0.patch 453 RMD160 5313955501e3d9c985169f5ab45c9c8dae4e1099 SHA1 9c25e31570277b134540a77352ab0910e4a8cfeb SHA256 973e538be539b13b17d99f812ce1bfa6bfdd524d182e5186b89148fbafda175f
 AUX chromium-system-icu-r1.patch 735 RMD160 d3fabb98c3de79afd87f4dad2fd842eac31b0167 SHA1 6f2d38dcd26dbd948237a3a6185e2dfff753fb5a SHA256 f37bcb4938d7600a1c56fd6494fa8680ff19749a3a50df82b5c88b8c996e2185
 AUX chromium-system-icu-r2.patch 1082 RMD160 7b908b8b34c0beaa969aa6c3bc4d0349ca8a7616 SHA1 17e9c7704164ac224e227e535bd4031670994590 SHA256 1bbdec893ed6d158981e33a2f661a47733ceaec3b686025ba5f233f3fe031264
 AUX chromium-system-speex-r0.patch 472 RMD160 8a8d573ae2ee08828d2376547a1755cc640875d9 SHA1 815ceb8513bbf20355c6c83dbfae2f7d3bfa4cd8 SHA256 967486edb2f7c0503bb2b373944ce8c5ce050e0f39da65d245f8695b6e8436f6
@@ -11,6 +12,7 @@ AUX chromium-system-xdg-utils-r0.patch 2313 RMD160 3e68d4860b04c30749d319642002d
 AUX chromium-tests-r0.patch 555 RMD160 6f26a053196f15924e939d1d84b959ccae68eb8d SHA1 be5c142e2a36dcc5eb7be1a619528be41cb1c293 SHA256 a7f1fd8b31491401420705d89e38f0e4811a92066ede1d6019275c46360d6711
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda
+AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c21ca8375ce9b753577df1df6a9cb78 SHA256 a4f24205b691e21d6208876a7f56859b9c3fc22eb39ec29fb2d0e3d067894932
 AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
 DIST chromium-10.0.634.0.tar.bz2 141319140 RMD160 97ccdf87416356e3a209635b3a5b7365a7a80ed0 SHA1 d0797f5d5464069b6995ba9d8eca72ac243ac958 SHA256 2f4b8874ad2414bd0f1c69d9307151e8321e60854572b19c580709e80a7ec2a3
@@ -19,10 +21,11 @@ DIST chromium-8.0.552.237.tar.bz2 135425078 RMD160 9d95b45a2a509b407a5c43ae3b4b6
 DIST chromium-9.0.597.45.tar.bz2 141958182 RMD160 d2d006d61ea704252cdaa198a7624bd674ead942 SHA1 d011dec2ce9c3c88a417ded3400870eb79e947da SHA256 08a3282e0a69033848a1acc6f091528b5fceb31b3804cd4ba377e31b6fea7336
 DIST chromium-9.0.597.67.tar.bz2 142248742 RMD160 b8fa1f1202adbced7b9cd855456dca7fbaefcefd SHA1 10123fd2fe1c8be1aa8c9374e6529bab2c825b1e SHA256 7943f3d4721493cf8b042886b2bcd19a31dec5a3f2337acaa515fe3e2467ae32
 EBUILD chromium-10.0.634.0-r1.ebuild 10449 RMD160 062f9f694d94e76f22d379b7e5032eb5ed5423f8 SHA1 a18a7c80d46de4fc3e43c9f8878e9d90af9c67ca SHA256 6d689c9d33c8bc68636e968981c63b4ee08b7c73d8d150d0bcf49b9b330a6772
+EBUILD chromium-10.0.642.2-r1.ebuild 10390 RMD160 84ed5e976254bca07b10a982739a4e161329365b SHA1 dd5a63c49a5174480b5b4fa21499df886c809bd0 SHA256 035e8685cf13e357239518517fefb043bb6bc10a700e683c89f909ed3da10291
 EBUILD chromium-10.0.642.2.ebuild 10144 RMD160 4a126802d0e7ecc4f350c7beceec5631d913eca6 SHA1 1fe7082e06494df3f2cabd19a1d6d2072a36adaf SHA256 9e27165096c75940f016fb56f5ff44e0b2cfb1efab3470c9ebff886b929486eb
 EBUILD chromium-8.0.552.237.ebuild 8634 RMD160 eebed932e6c888ca9a9484e829d2512b2e864552 SHA1 78fce537dac9b8a20a1c4bc2377db4327a83d497 SHA256 f9e16d58a299288182b9085b2a421d8553b263f48de17f1a073e661ae952c577
 EBUILD chromium-9.0.597.45.ebuild 9331 RMD160 94cf9be0bc7573c3562e8c3ee94b530166cc2d37 SHA1 02cb871867be04d36a2ff3ea96d460fbb6dce078 SHA256 5674eed9c18601cd79d9893c9ea9a6e683d8345eaf36d9ececfe75dee860f11c
 EBUILD chromium-9.0.597.67.ebuild 9331 RMD160 50fb39147b28b355a6203a06989b792608461e13 SHA1 db760536477fdc94ae8eac56c0b767f252710b9f SHA256 4eca16e8b8cd47d10f54e70e22f2614cd0c504b28568aaba0a0cb6418121088b
-EBUILD chromium-9999.ebuild 11485 RMD160 0c4fbb2b2840647da7864d30b0af92719e795d26 SHA1 de2f91cfe0f68c8f2f31091f83932496d19cfe37 SHA256 5d1dc65265e463763f16cae36cda8988d7bd430fea3e49f590506a412cd737eb
-MISC ChangeLog 58760 RMD160 30cdc1b5cc058c1592dd114dee444149545b63f1 SHA1 67f995133360d90fcb45119b336ec5a0d86878e8 SHA256 de3e3ecbabefdb7afeb49cd88f12092cff7913dda224b2ad85f0d2929e703a93
+EBUILD chromium-9999.ebuild 11728 RMD160 be60d455a72ac1d55ef8766efb2c5771941dbcfb SHA1 77a1883b249cdad69fe68ad288d1fd41f6ee4cf1 SHA256 d2dc4225b96810e11c0ae9cc4d8529aeb51d5c5cb9730fadaab2e1ab6ff8e527
+MISC ChangeLog 59050 RMD160 5751b82b384f4e604eea22a3805a8ea0e12f67b7 SHA1 3e2843b03c061442a133f310040110b3acf43a8b SHA256 8f3353a1a7e5d18a044e80f1557a192ee7482bf389d8a0d87047f29fa782d565
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.642.2-r1.ebuild b/www-client/chromium/chromium-10.0.642.2-r1.ebuild
new file mode 100644
index 000000000000..2d18a2ab7b6a
--- /dev/null
+++ b/www-client/chromium/chromium-10.0.642.2-r1.ebuild
@@ -0,0 +1,334 @@
+# 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-10.0.642.2-r1.ebuild,v 1.1 2011/01/22 16:18:21 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+V8_DEPEND="3.0.7"
+
+inherit 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://build.chromium.org/buildbot/official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
+
+RDEPEND="app-arch/bzip2
+	system-sqlite? (
+		>=dev-db/sqlite-3.7.2[fts3,icu,secure-delete,threadsafe]
+	)
+	>=dev-lang/v8-${V8_DEPEND}
+	dev-libs/dbus-glib
+	>=dev-libs/icu-4.4.1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2
+	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/oxygen-molecule
+		x11-themes/tango-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 xdg-utils.
+	epatch "${FILESDIR}"/${PN}-system-xdg-utils-r0.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/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
+
+	# 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
+
+	if use system-sqlite; then
+		# Remove bundled sqlite, preserving the shim header.
+		find third_party/sqlite -type f \! -iname '*.gyp*' \
+			\! -path 'third_party/sqlite/sqlite3.h' \
+			-delete || die
+	fi
+
+	# 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 (need to consult upstream).
+	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"
+
+	if use system-sqlite; then
+		myconf+=" -Duse_system_sqlite=1"
+	fi
+
+	# 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="
+
+	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"
+	doexe "${FILESDIR}"/chromium-launcher.sh || 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.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 ${PN}-browser.png || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
+	make_desktop_entry chromium "Chromium" ${PN}-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
+}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index a47846e29daa..91b5bda39674 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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.127 2011/01/21 07:51:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.128 2011/01/22 16:18:21 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -33,6 +33,7 @@ RDEPEND="app-arch/bzip2
 	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
@@ -150,6 +151,9 @@ 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 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/*' \
@@ -158,7 +162,7 @@ src_prepare() {
 		\! -path 'third_party/cld/*' \
 		\! -path 'third_party/expat/*' \
 		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/*' \
+		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/gpsd/*' \
 		\! -path 'third_party/harfbuzz/*' \
 		\! -path 'third_party/hunspell/*' \
@@ -180,6 +184,10 @@ 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
 
diff --git a/www-client/chromium/files/chromium-system-flac-r0.patch b/www-client/chromium/files/chromium-system-flac-r0.patch
new file mode 100644
index 000000000000..a7bc9bbaff5c
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-flac-r0.patch
@@ -0,0 +1,13 @@
+--- third_party/flac/flac.h.orig	2011-01-22 14:23:20.000000000 +0000
++++ third_party/flac/flac.h	2011-01-22 14:24:34.000000000 +0000
+@@ -9,6 +9,10 @@
+ // This is a shim header to include the right flac headers.
+ // Use this instead of referencing the flac headers directly.
+ 
++#if defined(USE_SYSTEM_FLAC)
++#include <FLAC/stream_encoder.h>
++#else
+ #include "third_party/flac/include/FLAC/stream_encoder.h"
++#endif
+ 
+ #endif  // THIRD_PARTY_FLAC_FLAC_H_
diff --git a/www-client/chromium/files/flac.gyp b/www-client/chromium/files/flac.gyp
new file mode 100644
index 000000000000..3abd34865ada
--- /dev/null
+++ b/www-client/chromium/files/flac.gyp
@@ -0,0 +1,21 @@
+{
+  'targets': [
+    {
+      'target_name': 'libflac',
+      'type': 'settings',
+      'direct_dependent_settings': {
+        'defines': [
+          'USE_SYSTEM_FLAC',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(pkg-config --libs-only-L --libs-only-other flac)',
+        ],
+        'libraries': [
+          '<!@(pkg-config --libs-only-l flac)',
+        ],
+      },
+    },
+  ],
+}