Version bump for stable channel release. Provide a target for stabilization (-r0) with lower cups dependency. There are some problems both with older and newer cups, but we need to stabilize this version of chromium quickly due to security bug #335750.

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

4 files changed, 243 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0b09807cbdd0..cd9be57fad88 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,17 @@
 # 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.174 2010/09/14 14:08:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.175 2010/09/15 01:34:46 phajdan.jr Exp $
+
+*chromium-6.0.472.59-r1 (15 Sep 2010)
+*chromium-6.0.472.59 (15 Sep 2010)
+
+  15 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-6.0.472.55.ebuild, +chromium-6.0.472.59.ebuild,
+  +chromium-6.0.472.59-r1.ebuild:
+  Version bump for stable channel release. Provide a target for
+  stabilization (-r0) with lower cups dependency. There are some problems
+  both with older and newer cups, but we need to stabilize this version of
+  chromium quickly due to security bug #335750.
 
 *chromium-7.0.517.5 (14 Sep 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8e1e8a2b302a..4c1bed85d57e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,13 +12,14 @@ AUX chromium-yuv-crash-r0.patch 2043 RMD160 df3fd74f22c412b60915634e8fbc5a68e87e
 AUX chromium-yuv-crash-r1.patch 2165 RMD160 913447ead01a2bbf07b3698ee2f776fb027c7ecc SHA1 ab3a4170e1b55be4c4b797d209b62e3b8165142a SHA256 d38b8956a428fe6e87b46400ea9fa39be87b1a1cd8f42cf63649ff806fd0afe6
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.127.tar.bz2 163270882 RMD160 c1ebb4c214299de291067e6afd430207da1ca5c7 SHA1 a680d73fa6812660403c8127461d138b4617e2ef SHA256 b74cb0671d3a930bcccb177f072b5c6e4e51be46166b52e99a692bdeaffbc494
-DIST chromium-6.0.472.55.tar.bz2 123969066 RMD160 9dca59cd3021200d80bdc561e319d24d51079d90 SHA1 7db6fa20d484e21c747bd19d09905ef868a788aa SHA256 dcef8a7ccfc18d1de280e27cda57f94fb7c01f942bfa5564e7c3533945973e7e
+DIST chromium-6.0.472.59.tar.bz2 123988791 RMD160 90ea863301b6f65d9559749ff77287cfbc39f3f0 SHA1 6f46e63f24d7540ea86b066ee55351fe775a1f0f SHA256 90473e06242ba52c2e73f2a9729ad830e2baac0af1b2823e3b25ef0c83031999
 DIST chromium-7.0.503.1.tar.bz2 127233310 RMD160 4d99a7fb8a30e4c97b972f2685f759da5d23b1af SHA1 f7613b4a078ca0ed8924173d994700b6cbdb2210 SHA256 17acda2dd849d1dee5f575847880b4d2b1ff21dfe6f0ae5c3ec00d30e23afc09
 DIST chromium-7.0.517.5.tar.bz2 231754066 RMD160 bf509acf62b8bc17ce52d28bfd8f84f9a0458d2f SHA1 66cebd7354b32e6b23d7ecf6b5bd8bc6a819b86b SHA256 c81651852b6fe6e70004e7e52ee287b2913a0a4ef8794bfbce2a67e0886df6f4
 EBUILD chromium-5.0.375.127.ebuild 5388 RMD160 8fbd9d9c5fd250c34264b0d1df47dae7032f6d73 SHA1 da2b6074d41cb77cc3714f7347268d036bfc2aa3 SHA256 a0d5a008691c43c773825310bb52872cbefe57e76e5cc986055e290d1a0029cb
-EBUILD chromium-6.0.472.55.ebuild 6914 RMD160 67ee5fd12eec5cd1a9758ad714a4188e060ec67b SHA1 ce009a39f7f5975d2c8bf6b2646940b21dd09d9c SHA256 a49e89b4512ee9ff94bb81f2219846cfbedbe7202aea280f96f04e205bf09647
+EBUILD chromium-6.0.472.59-r1.ebuild 6917 RMD160 abf00e9b1c778758f671f549b2bceb02ca5f94ea SHA1 4ce94a4d7b51bb0bc752abb22c11f5e6612b959b SHA256 b1840eaee55d9fb7e7fd8d63e0287938d4b639fbf9c9fc47b8e9ea44d60e91e9
+EBUILD chromium-6.0.472.59.ebuild 6915 RMD160 c04bbc7220d98ae587b3637ce14664dcf46a4c2d SHA1 3cc3e801eb2dd13938f7bec896fa9512ba0cd72f SHA256 6b741c25bb699291b19a1511ac0f69067f591f47b5fb9cadec86230cfd2cc2c2
 EBUILD chromium-7.0.503.1-r1.ebuild 6652 RMD160 738f3510cda8926a65e5730e3a48d86bf91edf13 SHA1 a37e00e2068e5f9cdc58a4cafbbe82b6ff12f1b8 SHA256 466b49a9610841e9e6d56b0afd4598205a3bd8606f76a9c3e94ca3f82d2576c6
 EBUILD chromium-7.0.517.5.ebuild 6634 RMD160 a1644de208689e249b6d070a36625ded6a03f72d SHA1 929d9405865c35d674b199b45905e9558c194a49 SHA256 18282f118aeaade09e24c7b6111eb642310b733a0da01166fa6a8d25e0847455
 EBUILD chromium-9999.ebuild 8391 RMD160 989c626b39c7fafebfa5e6e0abebe71f284c87e0 SHA1 13a1606fb5e10c5e5a10304ba44626b2cc1f6176 SHA256 b917787bd50e1e8419adfabf008924eb17af95909a817ad1ccb9d73dc0644753
-MISC ChangeLog 38507 RMD160 917c60ae55965d2a8d2406ddf67d9d9e4274240b SHA1 b189a1264d40e2beec392a805df6b5682d268f9c SHA256 d1ea0c62f63c34d850c04238a324b67515c37dc31204f282e979f917ebee6657
+MISC ChangeLog 38992 RMD160 133096d9dbe672a0b57d31262da556aa604f69e3 SHA1 6aecf95eee8a9c7156f3c8096c86b9243b889cc2 SHA256 99f882cda0a5b2b0848f94a1e27a46ce2e951fbecaebcc1479fdf295f90b1d3c
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-6.0.472.55.ebuild b/www-client/chromium/chromium-6.0.472.59-r1.ebuild
index 7d25337748e6..7053549c643d 100644
--- a/www-client/chromium/chromium-6.0.472.55.ebuild
+++ b/www-client/chromium/chromium-6.0.472.59-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-6.0.472.55.ebuild,v 1.1 2010/09/08 00:36:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.59-r1.ebuild,v 1.1 2010/09/15 01:34:46 phajdan.jr Exp $
 
 EAPI="2"
 
diff --git a/www-client/chromium/chromium-6.0.472.59.ebuild b/www-client/chromium/chromium-6.0.472.59.ebuild
new file mode 100644
index 000000000000..5fc7e5f95276
--- /dev/null
+++ b/www-client/chromium/chromium-6.0.472.59.ebuild
@@ -0,0 +1,226 @@
+# 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-6.0.472.59.ebuild,v 1.1 2010/09/15 01:34:46 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-keyring sse2"
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/libevent-1.4.13
+	>=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.3.11 )
+	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
+	>=gnome-base/gnome-keyring-2.28.2
+	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"
+
+get_chromium_home() {
+	echo "/usr/$(get_libdir)/chromium-browser"
+}
+
+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
+}
+
+src_prepare() {
+	# Fix compilation, bug #332131.
+	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
+
+	# Add Gentoo plugin paths.
+	epatch "${FILESDIR}"/${PN}-plugins-path-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/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/lzma_sdk"
+	remove_bundled_lib "third_party/molokocacao"
+	remove_bundled_lib "third_party/ocmock"
+	remove_bundled_lib "third_party/py"
+	remove_bundled_lib "third_party/pyftpdlib"
+	remove_bundled_lib "third_party/simplejson"
+	remove_bundled_lib "third_party/tlslite"
+	# TODO: also remove third_party/libxml and third_party/libxslt when
+	# http://crbug.com/29333 is fixed.
+	# TODO: also remove third_party/zlib. For now the compilation fails if we
+	# remove it (minizip-related).
+}
+
+src_configure() {
+	local myconf=""
+
+	# Make it possible to build chromium on non-sse2 systems.
+	if use sse2; then
+		myconf="${myconf} -Ddisable_sse2=0"
+	else
+		myconf="${myconf} -Ddisable_sse2=1"
+	fi
+
+	# Use system-provided libraries.
+	# TODO: use_system_ffmpeg (http://crbug.com/50678).
+	# TODO: use_system_libxml (http://crbug.com/29333).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl when we have a recent enough system NSS.
+	myconf="${myconf}
+		-Duse_system_bzip2=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_zlib=1"
+
+	# The dependency on cups is optional, see bug #324105.
+	if use cups; then
+		myconf="${myconf} -Duse_cups=1"
+	else
+		myconf="${myconf} -Duse_cups=0"
+	fi
+
+	if use "gnome-keyring"; then
+		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
+	else
+		# TODO: we should also disable code trying to dlopen
+		# gnome-keyring in that case.
+		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
+	fi
+
+	# Enable sandbox.
+	myconf="${myconf}
+		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=$(get_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
+		# TODO: check this again after
+		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
+		append-flags -fno-tree-sink
+
+		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
+
+	# 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="${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() {
+	dodir "$(get_chromium_home)"
+
+	exeinto "$(get_chromium_home)"
+	pax-mark m out/Release/chrome
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto "$(get_chromium_home)"
+	doins out/Release/chrome.pak || die "installing chrome.pak failed"
+	doins out/Release/resources.pak || die "installing resources.pak failed"
+
+	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
+
+	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
+	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
+	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 "desktop file sed failed"
+
+	# Install GNOME default application entry (bug #303100).
+	dodir /usr/share/gnome-control-center/default-apps
+	insinto /usr/share/gnome-control-center/default-apps
+	doins "${FILESDIR}"/chromium.xml
+}