Version bump for beta channel release. Remove broken src_test.

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

3 files changed, 315 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b839a781f130..2468e31bfd1f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.250 2011/01/03 14:57:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.251 2011/01/05 09:17:18 phajdan.jr Exp $
+
+*chromium-9.0.597.42 (05 Jan 2011)
+
+  05 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-9.0.597.42.ebuild:
+  Version bump for beta channel release. Remove broken src_test.
 
   03 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   +files/chromium-gecko-mediaplayer-r1.patch, chromium-9999.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 52537ab3b136..66502a166f38 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,10 +15,12 @@ AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a9
 DIST chromium-10.0.612.1.tar.bz2 143485277 RMD160 396eaeb7d25ddb9b372be52d93a1de65ab646edf SHA1 96085dfee33727ff121d955dc093f3e293a7d1dc SHA256 dc1e0ccf1e56f5111acfb0686283bd2e8557a94513c9087a00910408f8fe89e4
 DIST chromium-8.0.552.224.tar.bz2 135345394 RMD160 e7bed4bc0b4d851e83bfc351ceca9af4ae739dad SHA1 4544ec2f753893e9a5426e4bad353bad8fd25f8a SHA256 c10b5f7cbafbc430ba25f6cdc00af5c86c6216b280101df2036a89474b75a848
 DIST chromium-9.0.597.19.tar.bz2 141604890 RMD160 9333fe36501215c2c3f717525216ec1f04ffd8b7 SHA1 01086ba4d186893b0a909be5f4c19c6dbf599baf SHA256 b3a1ae7aed12f8ab4d46ac9571259e1666e2abdd24c0a5d08638ea1b94d3c681
+DIST chromium-9.0.597.42.tar.bz2 141940551 RMD160 1593d272a1fc78a10448265f622484ee538411b9 SHA1 8a665100be2c58f8dd96b10697f521ff685f0b68 SHA256 0b6b0145e0d1c13276fbad97898224575d3c92e4876016c0524a147418e4019f
 EBUILD chromium-10.0.612.1-r1.ebuild 10784 RMD160 f3d9fc79812392c738a993b32e76def2d1029a1b SHA1 fd1c45b979cda406b39c1a136fc258309fcbe842 SHA256 172c86c8f646e078e95e8cfb964ca5bef9effac2e11684ccf74e282defeabc06
 EBUILD chromium-10.0.612.1.ebuild 10091 RMD160 8cdc4423dd2987d986273916201ee116e3d63fe8 SHA1 94cb48b5bbd461d1671918a6abb7a69ad80e0c57 SHA256 7f9e7a4782f03321ec941d2ed5e1d7cbf31c5e0957031518e52d98658d425bc6
 EBUILD chromium-8.0.552.224.ebuild 8606 RMD160 da7aba06f58b5f00f49fa2b5377be60f986ea7b4 SHA1 3c7127b56601c7db9684d561fffed18ed1246fd4 SHA256 5b4ca0dcf464bd316fd5d8ea36f10a2553748d0df821eed8a026a03c5f0e943f
 EBUILD chromium-9.0.597.19.ebuild 9757 RMD160 9cd2c3cccf511a487cdf37cc3cd6f1e7beea1d52 SHA1 7168fe29e7321cf84df4a912f794d1ac77065b6b SHA256 0bdcaaf83a5c3134359ad64f2fcaf362ac5b94d1de7147ba4b71e71b9e153a27
+EBUILD chromium-9.0.597.42.ebuild 9305 RMD160 09dd28e781b3459268d91374d3f6ec6732adcbdb SHA1 d401db7c4894882f525d97e5e8fb886af026d98f SHA256 e9affe32ce04b92053cd1ae6767a0669c18d83527f0f0cac23ea311116081bd8
 EBUILD chromium-9999.ebuild 12438 RMD160 28b53cfe10aebfaca1d6f7adda9f5da5410e88da SHA1 2ea031e9c1e04a2edbe771a82666fee1af810fc6 SHA256 149f894af993ba5b6f4e00dee555afe20c40cffdaffbcc36f25f308499a5db22
-MISC ChangeLog 55501 RMD160 72fcf554b8ec195a370df395f7597adacd55636b SHA1 cfba75ea4d4235be29b0650db87209a29b148bf2 SHA256 96827fc5bbd8352d181a47918b71b5dfe2317d753668ef4aba48d852f93bba93
+MISC ChangeLog 55689 RMD160 9a78bc85bc66ef0fef19f0fd294ee0f6367b7308 SHA1 23397f7c4d0885b0ed975e663689e45186fb274e SHA256 77f495016f404e70f5815bd4a2f25e005eacb09060c74dcf9b5c4ef0186fd318
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-9.0.597.42.ebuild b/www-client/chromium/chromium-9.0.597.42.ebuild
new file mode 100644
index 000000000000..2d2660c6afc7
--- /dev/null
+++ b/www-client/chromium/chromium-9.0.597.42.ebuild
@@ -0,0 +1,305 @@
+# 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-9.0.597.42.ebuild,v 1.1 2011/01/05 09:17:18 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils flag-o-matic multilib pax-utils portability python \
+	toolchain-funcs versionator
+
+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 system-v8"
+
+RDEPEND="app-arch/bzip2
+	system-sqlite? (
+		>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
+	)
+	system-v8? ( >=dev-lang/v8-2.5.9.1 )
+	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
+	virtual/jpeg
+	media-libs/libpng
+	media-libs/libvpx
+	>=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"
+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
+	"${@}"
+}
+
+get_installed_v8_version() {
+	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
+}
+
+remove_bundled_lib() {
+	local out
+	out="$(find $1 -type f \! -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
+}
+
+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
+}
+
+src_prepare() {
+	# Enable optional support for gecko-mediaplayer.
+	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
+
+	# Make sure we don't use bundled libvpx headers.
+	epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch
+
+	# Small fixes to make tests compile, to be upstreamed.
+	epatch "${FILESDIR}"/${PN}-tests-r0.patch
+
+	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/codesighs"
+	remove_bundled_lib "third_party/icu"
+	remove_bundled_lib "third_party/jemalloc"
+	remove_bundled_lib "third_party/lcov"
+	remove_bundled_lib "third_party/libevent"
+	remove_bundled_lib "third_party/libjpeg"
+	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/libvpx"
+	remove_bundled_lib "third_party/libxml"
+	remove_bundled_lib "third_party/libxslt"
+	remove_bundled_lib "third_party/lzma_sdk"
+	remove_bundled_lib "third_party/molokocacao"
+	remove_bundled_lib "third_party/ocmock"
+	remove_bundled_lib "third_party/yasm"
+	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+
+	local v8_bundled="$(v8-extract-version v8/src/version.cc)"
+	if use system-v8; then
+		local v8_installed="$(get_installed_v8_version)"
+		einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+		version_is_at_least "${v8_bundled}" "${v8_installed}" || die
+	else
+		einfo "Bundled V8 version: ${v8_bundled}"
+	fi
+
+	if use system-sqlite; then
+		remove_bundled_lib "third_party/sqlite/src"
+		remove_bundled_lib "third_party/sqlite/preprocessed"
+	fi
+
+	if use system-v8; then
+		# Provide our own gyp file that links with the system v8.
+		# TODO: move this upstream.
+		cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
+
+		remove_bundled_lib "v8"
+
+		# 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
+	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_vpx=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 host-is-pax; then
+		# Prevent the build from failing (bug #301880). The performance
+		# difference is very small.
+		myconf+=" -Dv8_use_snapshot=0"
+	fi
+
+	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
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	doexe out/Release/xdg-settings || die
+	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 out/Release/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
+}