Version bump for beta channel release.

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

3 files changed, 187 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d352bc72106a..ffccffe79f5f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.125 2010/06/23 15:19:52 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.126 2010/06/24 07:55:31 phajdan.jr Exp $
+
+*chromium-5.0.375.86 (24 Jun 2010)
+
+  24 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-5.0.375.86.ebuild:
+  Version bump for beta channel release.
 
   23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> chromium-9999.ebuild:
   Install resources.pak, bug #324645 by Mike Gilbert
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 42a93504fa9f..fa2a021f45fe 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,11 +9,13 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
 AUX chromium-optional-cups-r1.patch 647 RMD160 990d9d33e43cb2429eb6019df8a2625f980be64e SHA1 0387d604d1926e56bbdb68a56b6137e542386fb7 SHA256 444179d3c3f2b86006b032f62220353f04f6d740777982c2a871618a3334303e
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.70.tar.bz2 163191937 RMD160 cb43307d095dc7ba146762b2a997ba32c5c12907 SHA1 96234ce716e5124f8c8ada92ed9a8cbe6183c5ed SHA256 dd2e440b1a230b1adcc8941d825155e5aeaf887fe67702697a845bd459455902
+DIST chromium-5.0.375.86.tar.bz2 163295338 RMD160 ccff650d9520bd6dbd7758ec65e288cc649c0cae SHA1 8e95d93903e9c7cd5321c32ed46d3137ef2d99d8 SHA256 c94034cbcc883eec229f259f3d09637317fbbbca4a3d438a339bfc42953c3ec1
 DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269
 DIST chromium-6.0.437.3.tar.bz2 124160001 RMD160 74be10daf0727b76d9ed5e02210796998ccf0069 SHA1 1568aa0e368af02e60ad7746743b332948fbad75 SHA256 88671254bc0a911beefef866ac263a489bf91fca7ad967ad25921ef29b5b8150
 EBUILD chromium-5.0.375.70-r1.ebuild 5611 RMD160 2b6d6f5937ec91de14a996fa79a7932d7dc1cdd1 SHA1 df89526b66d81de5ba386bb413ce668d4bf72be8 SHA256 40188c74dd18e4d9946094e4916010b2cd8d4ee693bc97fb91820e880d8995fa
+EBUILD chromium-5.0.375.86.ebuild 5536 RMD160 26eed2aee0d30f5477355b6085dcfd7cd5a662a3 SHA1 6a18e721d7f527af3c5d17cc9e514e8508608d8f SHA256 34590f85be930917f1257c477012f006455433b3684a21ead4e0d4365de0effc
 EBUILD chromium-6.0.437.1.ebuild 6375 RMD160 be6be6f40fe24ad710314b4ddd10119686e5a69a SHA1 392b75700a9d76e65b9f5f1be4605d99e69e0754 SHA256 2f9b18544c81573161d9f1385c91f1f85c6110ce83f754b294806de44d7ee474
 EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4
 EBUILD chromium-9999.ebuild 7835 RMD160 a37905477b05ac842be39bd28905d42a34b31c32 SHA1 739965bcfb5f1eadd8178e83d527cfdff19655db SHA256 10ebdfba03e49f050c805d931f8e2b89d2d5682b033dea032dd0dbe8500b8d7e
-MISC ChangeLog 28139 RMD160 b377f039eeb5836f4c1ec03e7fe365c4685ac3f5 SHA1 030f8435d0c5400498779e627cc7b772f6397159 SHA256 dfd4a86e42612e6994ba8fa77f8d333e0a94471518e4ac84aa27fac6714ae708
+MISC ChangeLog 28305 RMD160 a0e7d1dcab4b7089347f7de86cb91bf27e48df81 SHA1 5b02e20dd6bfa4a550df320780f16598bfac9fd6 SHA256 09ee80f9fa0def0af492547a8f0f3a4e65d59b99d5dcbff898beb06f1a80ddc8
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.86.ebuild b/www-client/chromium/chromium-5.0.375.86.ebuild
new file mode 100644
index 000000000000..019367e77f4b
--- /dev/null
+++ b/www-client/chromium/chromium-5.0.375.86.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.86.ebuild,v 1.1 2010/06/24 07:55:31 phajdan.jr Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
+
+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 ~arm ~x86"
+IUSE="+plugins-symlink"
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	>=gnome-base/gconf-2.24.0
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg:0
+	media-libs/libpng
+	media-video/ffmpeg[threads]
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-libs/libXScrnSaver"
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=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-apps/xmessage
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+# Incompatible system plugins:
+# www-plugins/gecko-mediaplayer, bug #309231.
+RDEPEND+="
+	plugins-symlink? (
+		!www-plugins/gecko-mediaplayer[gnome]
+	)"
+
+src_prepare() {
+	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
+	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
+
+	# Allow supporting more media types.
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+
+	# Fix build failure with libpng-1.4, bug 310959.
+	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
+}
+
+src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	# Workaround for bug #318969.
+	# TODO: remove when http://crbug.com/43778 is fixed.
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	# Fails to build on arm if we don't do this
+	use arm && append-flags -fno-tree-sink
+
+	# Configuration options (system libraries)
+	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
+	# -Duse_system_sqlite=1 : http://crbug.com/22208
+	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
+
+	# Sandbox paths
+	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
+	# and the performance gain isn't worth it.
+	myconf="${myconf} -Dv8_use_snapshot=0"
+
+	# Disable tcmalloc memory allocator. It causes problems,
+	# for example bug #320419.
+	myconf="${myconf} -Dlinux_use_tcmalloc=0"
+
+	# Disable gpu rendering, it is incompatible with nvidia-drivers,
+	# bug #319331.
+	myconf="${myconf} -Denable_gpu=0"
+
+	# Use target arch detection logic from bug #296917.
+	local myarch="$ABI"
+	[[ $myarch = "" ]] && myarch="$ARCH"
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	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="${myconf} -Dwerror="
+
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
+}
+
+src_compile() {
+	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		rootdir="${S}" \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		|| die "compilation failed"
+}
+
+src_install() {
+	# Chromium does not have "install" target in the build system.
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	dodir ${CHROMIUM_HOME}
+
+	exeinto ${CHROMIUM_HOME}
+	pax-mark m out/Release/chrome
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto ${CHROMIUM_HOME}
+	doins out/Release/chrome.pak
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	# chrome.1 is for chromium --help
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
+
+	# 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}
+	dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+	dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+
+	# Plugins symlink, optional wrt bug #301911
+	if use plugins-symlink; then
+		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	fi
+
+	# Icon and desktop entry
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
+	# Gnome default application entry
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
+}