Version bump for beta channel release.

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

3 files changed, 230 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0b4ea4cd9bae..58f2a41e9dbf 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.197 2010/10/07 15:20:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.198 2010/10/08 12:11:06 phajdan.jr Exp $
+
+*chromium-7.0.517.36 (08 Oct 2010)
+
+  08 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-7.0.517.36.ebuild:
+  Version bump for beta channel release.
 
   07 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Remove patch applied upstream (system sqlite support).
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7ac125caeb82..c86b9236abf5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,13 +9,15 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a
 DIST chromium-6.0.472.62.tar.bz2 123969547 RMD160 874411802d0aa4d7ed83967f2c6873682b764ba6 SHA1 960bdac068b9265fbc9cff41a773f9c0740d09bb SHA256 518400874f0b801a8a7954d3f90b2060c620979bab219237dc1fc56d8dcafeb6
 DIST chromium-6.0.472.63.tar.bz2 123990097 RMD160 7931846fd581f76ba2039f82b64156a100614d44 SHA1 82045b1685706edc7be9182b99f2bcedb4b06da9 SHA256 029bb4f4a706fcb83e80c20b960415cd1fb01e5c634d72f0271e79c60bdec228
 DIST chromium-7.0.517.24.tar.bz2 132373901 RMD160 c2251d3bf0ef8df0c16fb35e9b645e9049dd137c SHA1 39616cf5e224b2b742600f3f237b43a37ac5275f SHA256 5b7d0d0c577841d0d54799de377338813d118ceb3781135ed426a3eed6173c72
+DIST chromium-7.0.517.36.tar.bz2 132903248 RMD160 df508769cdd50a061531f8d7387c03e7ad85ef04 SHA1 9fad31d9204e5530faad17a649c97e9ee56d2cbe SHA256 93e8d2982dc14eba6f1c6e5c851679ebbd562769443ce228eaa29f2e84d02248
 DIST chromium-7.0.536.2.tar.bz2 133853858 RMD160 4868dc4883eee054e2c7a088b41800665a3d88b9 SHA1 c9702dc88b5f3834696134c8ece4d136667558fd SHA256 25603f5ed54c5b1c4443d54e75a054736080aa1a9669a560f1249693f0d1095e
 DIST chromium-7.0.544.0.tar.bz2 148954341 RMD160 1a5dd420c42cf35f5982d35746a6b563c3f919c8 SHA1 03e3380da1a6e7bcbdfb71576334bd2100369d04 SHA256 a4d1753c44ba8bf898fb3ce7e52389333453c55b7e244c9f702088ff0a693672
 EBUILD chromium-6.0.472.62.ebuild 6869 RMD160 4f789a1c899d639aed4f69a831dcd932ec690903 SHA1 07c983a01ba282fe0f9684c3a264de81e4623a16 SHA256 14d395f2840efe6d81b5f4225284af9084087c4ac429fcdbb0ddd05a3a0f9ffd
 EBUILD chromium-6.0.472.63.ebuild 6875 RMD160 868088280a7e82a3016c6feee15c61ea8e4b3237 SHA1 9f2a03a0592b51530595f35f24eea41b48a3a275 SHA256 54b9433c933f4faa90e1057baa29dd461e639931d2cacdb963996ed28f7e995c
 EBUILD chromium-7.0.517.24.ebuild 6611 RMD160 6a276a416a19c3a78a33112c25c87aed7bdd4a0b SHA1 508ad38752f50ce75efafea8e18fef052a8ba978 SHA256 7f941e6775455807469bf28cb1a3069a270e098c2f1ed248c084f47521d6a2c2
+EBUILD chromium-7.0.517.36.ebuild 6611 RMD160 11af550adfeb2e2dab6fb5ee2247bf52458ed43c SHA1 72a8bb8d6dd74de4290c3d08d4f0908969694f04 SHA256 dd32a37a19a669afcb5a669405aa004e92a20d5db8b09cd0aac0efac090adbe5
 EBUILD chromium-7.0.536.2-r1.ebuild 6666 RMD160 07963523f25ad06aaddbe2088d717ddf2f52c699 SHA1 2909b16cc555ef5f17ff0d368f9fac2aa56dcdd9 SHA256 176f8ee3145f6664668954f20d7b84bb3047a17a21718c0077504e53ec73fc87
 EBUILD chromium-7.0.544.0.ebuild 6645 RMD160 fc43f37fe3191ed57082a398341faf5f7db075b8 SHA1 5c72edc8be4ba5f9534a1a0f18fba3e162f23703 SHA256 580bdbf4409cf3f51f61c435692abd5740da011a17d3d418d776077a868125da
 EBUILD chromium-9999.ebuild 8226 RMD160 b7609019b298dcd713974ad98347ad344249f34d SHA1 2c1485522882f67309a1b6d88b0b99f7f769e83d SHA256 3d1dd0e8eb2a40015b0c12a3028b42f0bbfffc8e4c94e0446bca4f99e5066329
-MISC ChangeLog 43453 RMD160 ee2f5341026eddb2c86bdb941db073a23f8d3737 SHA1 5263eee1c8eb662f62e7775948bc0bcd4583ff17 SHA256 94b1ccb5f073683180bec55147ccfba4139e9a4c125b197a596274d5c5075601
+MISC ChangeLog 43617 RMD160 86642c42ee5685aeee9f41ec9cb448df1519e17f SHA1 f1648cb1c97080201e27b4ea30c5b64f8a209973 SHA256 54ac2d7783262fd8bc7217925648fad534a8f6c07e7958a3238912b9f595700a
 MISC metadata.xml 406 RMD160 d09b00979942b334a50d93a97fc0c871d9c12533 SHA1 6109fea03404526e0b794b2d3ab7a86cd2db0798 SHA256 1b13e11f0612543177e8def6184c785553183b77b6724d249a7557c64b6ead2a
diff --git a/www-client/chromium/chromium-7.0.517.36.ebuild b/www-client/chromium/chromium-7.0.517.36.ebuild
new file mode 100644
index 000000000000..12ad68a92ed0
--- /dev/null
+++ b/www-client/chromium/chromium-7.0.517.36.ebuild
@@ -0,0 +1,220 @@
+# 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-7.0.517.36.ebuild,v 1.1 2010/10/08 12:11:06 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="cups gnome gnome-keyring"
+
+RDEPEND="app-arch/bzip2
+	>=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-base/gconf-2.24.0
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg:0
+	media-libs/libpng
+	cups? ( >=net-print/cups-1.4.4 )
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-libs/libXScrnSaver"
+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"
+
+remove_bundled_lib() {
+	einfo "Removing bundled library $1 ..."
+	local out
+	out="$(find $1 -mindepth 1 \! -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"
+}
+
+src_prepare() {
+	# Add Gentoo plugin paths.
+	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
+
+	# Make compile-time dependency on gnome-keyring optional, bug #332411.
+	epatch "${FILESDIR}"/${PN}-gnome-keyring-r0.patch
+
+	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/codesighs"
+	remove_bundled_lib "third_party/cros"
+	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/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/pyftpdlib"
+	remove_bundled_lib "third_party/simplejson"
+	remove_bundled_lib "third_party/tlslite"
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+}
+
+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_ffmpeg (http://crbug.com/50678).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl when we have a recent enough system NSS.
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libxml=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
+
+	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"
+
+	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
+	# and the performance gain isn't worth it.
+	myconf+=" -Dv8_use_snapshot=0"
+
+	# Disable tcmalloc memory allocator. It causes problems,
+	# for example bug #320419.
+	myconf+=" -Dlinux_use_tcmalloc=0"
+
+	# 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
+
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	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="
+
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die
+}
+
+src_compile() {
+	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		|| die
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	pax-mark m out/Release/chrome
+	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
+
+	doexe out/Release/ffmpegsumo_nolink || die
+	doexe out/Release/libffmpegsumo.so || 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
+}