Version bump for beta channel release.

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

3 files changed, 196 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8ac53fe79b1b..9cbb2bce48cc 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.60 2010/02/25 09:06:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.61 2010/02/27 15:50:21 phajdan.jr Exp $
+
+*chromium-5.0.307.11 (27 Feb 2010)
+
+  27 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-5.0.307.11.ebuild:
+  Version bump for beta channel release.
 
 *chromium-5.0.335.0 (25 Feb 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index adbd5cc9eb62..eda177477d1c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,14 +4,16 @@ AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
+DIST chromium-5.0.307.11.tar.bz2 153145874 RMD160 2e8820fae4bd2ca0b6e7c4c3f0d10eb0b4bcc2d3 SHA1 33b5a62501af3645076f3d48dba76356d4736471 SHA256 4578711c2359b9d6751c6fcecb541d0fb63c5bcde2a82346040d218c8de5a4ea
 DIST chromium-5.0.307.7.tar.bz2 145158495 RMD160 b68ca5dbee16de30b4bd15b695eda60410258c12 SHA1 8bb917e5935080a45d9b6e22e2a5866a40777df7 SHA256 b7219454ff85459fd1d58555e06907726e02c5a956c95974c7af66bddf20b6c6
 DIST chromium-5.0.307.9.tar.bz2 145145238 RMD160 9184b6f8f863c28beec0bac499ec447fcfa0a247 SHA1 7b332148ca72d3c789dc9339e428f9b3674a24ba SHA256 afaf8a84dbd30362b5d7b1a04aa53c98a0c78bad8459a0e56258dbeef861606c
 DIST chromium-5.0.322.2.tar.bz2 147189476 RMD160 3f4cb014d6c0c75b0318aa83c3b7ce6cb74297ad SHA1 cd19087d3abd4919bd93552c06dc8d8ed5666f33 SHA256 fa61a980ea021bc83c6c88970b833d5b4b15a72b7d377ed16b4240cbbd28306b
 DIST chromium-5.0.335.0.tar.bz2 155199608 RMD160 d3b81ad020973b899858396198b9d12d863fdd84 SHA1 da85491bd8eb42765567e0c08950e277b284c82e SHA256 5d9bd386abbfa18740a27fcd668ad0424e0a48ab0df4097c2d640c2cb09d0dda
+EBUILD chromium-5.0.307.11.ebuild 5925 RMD160 20be5054caac1bec3cabcc4ca8fccb01b3e49128 SHA1 8d09a70af5f38e6f97d513660df492603ab1a8e6 SHA256 58ed9d3e3ceb1622868bf81bc717b089650cfa4867fa7b09f87ed2c3b3a461cd
 EBUILD chromium-5.0.307.7.ebuild 5786 RMD160 eb13f7869f316d923031521d813cd90889b29a0a SHA1 eff5b132de524a900615c002f4eef4666513ac39 SHA256 99f62591873eaccbd6988f0bae9e4dc84c2f86e2c2cb19a1b730ae2d2e2ed302
 EBUILD chromium-5.0.307.9.ebuild 5924 RMD160 9224ac0227fe0c1363c2dbe48c8e490cd8b5652d SHA1 47b83b8671a7a8d390006d920f8c77ae4aa9b7ba SHA256 80d9ef52210c0c003c436a51618c372eaa364878da2074bdd36927a6d97e6505
 EBUILD chromium-5.0.322.2.ebuild 5977 RMD160 c6f23a55f31b59083c12a6455ae94e84cd111f05 SHA1 1a1aa28c36877021d956d02d7d26826584d60c8a SHA256 2918f727578a9175fad8ca608481c8a6f7d47ddd58332f9232157771d775a1e1
 EBUILD chromium-5.0.335.0.ebuild 5980 RMD160 628a58bdadeb588d98a0eb006a601d3b2fbc42b2 SHA1 b0a454c02b46b74de400df3f2503bb9423278649 SHA256 85faac62c648a62074b46deef30ee4de0dae52e3105c8a040270968565226c4b
 EBUILD chromium-9999.ebuild 7689 RMD160 b088bcfd18550de1bfca11b80bb1dafd3ad97361 SHA1 c5f1ca2d09320273eb6b06ba4feaa3b699a9fe0c SHA256 c7efbd458504c5d57fb9ac41823e522f618981ce4b83c5752d11c40fb3e59791
-MISC ChangeLog 13750 RMD160 cd11c04a351ec4f83179e0660fbd309cd4f643f7 SHA1 3d6f5e8a85abf9274a53363152812a4d12c41db6 SHA256 39e83e7e23c3b0ff6de0dc9a22489194c906c1172b26763b8e702c18204711bb
+MISC ChangeLog 13914 RMD160 9db9d19f4a5ccd1ad6ff2b3966df65324648168a SHA1 c50df8f369c75be36e0d63ff0b11ceaa780f6379 SHA256 7931052d95be543202d7ec02f8b6ffe62ce445e7720bf4f915e0306272bb0bde
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.307.11.ebuild b/www-client/chromium/chromium-5.0.307.11.ebuild
new file mode 100644
index 000000000000..2f3eb21e79d5
--- /dev/null
+++ b/www-client/chromium/chromium-5.0.307.11.ebuild
@@ -0,0 +1,186 @@
+# 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.307.11.ebuild,v 1.1 2010/02/27 15:50:21 phajdan.jr Exp $
+
+EAPI="2"
+inherit eutils flag-o-matic multilib portability toolchain-funcs
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ffmpeg +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
+	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-libs/libXScrnSaver
+	x11-misc/xdg-utils
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)"
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23
+	sys-devel/flex"
+
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+
+	elog "${PN} might crash occasionally. To get more useful backtraces"
+	elog "and submit better bug reports, please read"
+	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
+}
+
+src_prepare() {
+	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
+	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
+		|| die "kde proxy sed failed"
+	# Changing this in ~/include.gypi does not work
+	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
+	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
+	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+	# Prevent the make build from filling entire disk space on some systems,
+	# bug 297273.
+	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
+
+	# Disable prefixing to allow linking against system zlib
+	sed -e '/^#include "mozzconf.h"$/d' \
+		-i third_party/zlib/zconf.h \
+		|| die "zlib sed failed"
+}
+
+src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	# CFLAGS/LDFLAGS
+	mkdir -p "${S}"/.gyp
+	cat << EOF > "${S}"/.gyp/include.gypi
+{
+	'target_defaults': {
+		'cflags': [ '${CFLAGS// /','}' ],
+		'ldflags': [ '${LDFLAGS// /','}' ],
+	},
+}
+EOF
+	export HOME="${S}"
+
+	# Configuration options (system libraries)
+	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=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"
+
+	if use amd64 ; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+
+	if use x86 ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
+	if use arm; then
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+		append-flags -fno-tree-sink
+	fi
+
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	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}
+	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
+
+	if use ffmpeg; then
+		# 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}
+	fi
+
+	# 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
+
+}