restored chromium symlink, to avoid confusion and frustration. chromium-browser is still the default.

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

4 files changed, 370 insertions, 4 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 4e2a53c8d09e..b94dd71e7845 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.289 2011/02/24 10:34:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.290 2011/02/25 10:37:57 wired Exp $
+
+*chromium-11.0.672.2-r2 (25 Feb 2011)
+
+  25 Feb 2011; Alex Alexander <wired@gentoo.org>
+  +chromium-11.0.672.2-r2.ebuild, chromium-9999.ebuild:
+  restored chromium symlink, to avoid confusion and frustration.
+  chromium-browser is still the default.
 
 *chromium-10.0.648.114 (24 Feb 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6a49227ec97b..408f6407cbea 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -22,9 +25,27 @@ DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95f
 EBUILD chromium-10.0.648.114.ebuild 10038 RMD160 06b059657f5d9f69622d9e3d3406252c87ebd2ca SHA1 91bebb9a42c9f958d0080743075f3fbedc0ce81e SHA256 e38a033e0179b622f62ab6b37705c51f14ebd4bc46fe513ab76a5543e0883f4e
 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 10653 RMD160 e0098dd7168936c117a88c42c4fd989790724e76 SHA1 c6e6d8ad6edd11f4f7c530506980b8695c904822 SHA256 f589cb3759b268bcd53e4b853d5ed3210eaed8dad9328b962b82cae70ec537fd
 EBUILD chromium-11.0.672.2.ebuild 10313 RMD160 99cb427b4aa0212b8844297dadab71902126f79f SHA1 b41bbfb6577841d7c044455137b95ca687fee050 SHA256 e342753b873a7407f786af30863158d32a00bfd47935203fb66eb8cd725319f7
 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 11983 RMD160 66958ec6c6cc06636c8f4ad3cae9acd9a514a901 SHA1 04706d5472eeb4d934ec1452d8c0721211c3cccd SHA256 0a79db7b597948d366b955c9ea4f843ee5a3325067c093a05ec34ea890fc0967
-MISC ChangeLog 63966 RMD160 23c2c688ea37a300936f5a36eb24c0da0e8eda61 SHA1 1022d0186cc7b15c9b1b66794fb074df2064601e SHA256 2cf1e23cc4e68bdb2d069995a3c3311a385b378e6b21ebd308666908a23fad23
+EBUILD chromium-9999.ebuild 12097 RMD160 234c5581371dde891acf951d9780c464f1d54b88 SHA1 c27b8889fdb09a5b9edcd17a6f687674b9a28d3a SHA256 45b4428e9934f419258f164a90d83e9410fbae54c0a48c5e401236978cc5667c
+MISC ChangeLog 64212 RMD160 3dcaf819224160e0d6b2c967691fa06ba688e1b8 SHA1 5759e396409ff5fc3ac9a4b044744104ef9fb370 SHA256 1a306d9ad6e80762c137532876031fb0ffe77e0580a8af2f0645d943bd22b935
 MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNZ4aXAAoJEDZF8K7rm0r6R8wQAJINwxmEAGdUOc7Hb3t/T+Nb
+TOFsHULVBb68aagifxqJW0vZTuTYL9NyCRoMqge3nVUizhkCsBJVhALEa3XIHHvq
+L/JKd/eJr9RdBuJoRV5vID0LyNuB03+WYnH0ktOVJ5BjTATPeNdFyBgHDJK7Z+GY
+teKI4tvCIw7GIz3Bzg9zY6ZyA/7ZwhqMhrT9urxc6Cgwqts7NYzGSQbShM+ZjhPZ
+16xrH2dcdBFR1omE5bAZrH1rct0dSTiSkoxNvaJ2qiCAzUQfcr8PGYCF/qpTy8tx
+K1P6+9GidgSi2fk5hUrxJVcTAuxrNIpWpKkG5Vhrz03A6nkRYfHhFlnZQbkfXoHL
+Xbx11GLHN478eHcs0ZR5we6wLAH5cH0GMT1dkIRXI5bfyFZRe3i0rCNoBl0Upoox
+A2LahflwvDzsg+bep1NdI+/EjnfCu1s3QE74jOks0mjqfkhMcDLXfcfeT7aX99TL
+jI3WWKtRFlpG0Uq6mj+e4mrQw8D2ojYv084Gv4/ZeL+Ntd+PsafMQ/PU6ds6tTOh
+waqlPymfeRQ9+y/KZi+aqQ64TG8OrfJlOCI9OGg+YMg/Ia+PrWeCDAjItWYIVm4d
+WbuC5M0Udb80gA8nH23ksUp+aiOuJvisRb6140qP69a0DtRO6V01cnvOWzFb93E3
+J5BYhjefvspVwYZeRvKU
+=fXgt
+-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-11.0.672.2-r2.ebuild b/www-client/chromium/chromium-11.0.672.2-r2.ebuild
new file mode 100644
index 000000000000..d74019950cea
--- /dev/null
+++ b/www-client/chromium/chromium-11.0.672.2-r2.ebuild
@@ -0,0 +1,336 @@
+# 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.1 2011/02/25 10:37:57 wired 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
+	# 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
+
+	# 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-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 8a802a990793..419f4796034f 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.135 2011/02/22 18:24:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.136 2011/02/25 10:37:57 wired Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -333,6 +333,8 @@ src_install() {
 	# 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