Version bump for stable channel release.

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

3 files changed, 342 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 124546270cef..d2f9e6814168 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.336 2011/04/13 15:13:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.337 2011/04/14 19:48:45 phajdan.jr Exp $
+
+*chromium-10.0.648.205 (14 Apr 2011)
+
+  14 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-10.0.648.205.ebuild:
+  Version bump for stable channel release.
 
 *chromium-12.0.733.0 (13 Apr 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 49341c57ce7d..f8acc06060bf 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -25,22 +25,24 @@ AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c
 AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
 DIST chromium-10.0.648.204.tar.bz2 144184850 RMD160 7e75ec9bf4936a26599b0f1bdf7d777de43c0a86 SHA1 3ce5f3c356b09d524c6a9c2e8b75726b51dac84e SHA256 e7341301bc4049cb73bbb1f6c4cd120e39f61e563ac3c7e14c4cd0beb838d33d
+DIST chromium-10.0.648.205.tar.bz2 144190502 RMD160 ec18dcf162da28f5b00e3a5e68b373ec891104b2 SHA1 d27ad25011bf8ea9ce611a88648e9b014a9c64f0 SHA256 1a27158d45fcb9af84848879752e20af6e27715379e86b37a8881bdb4fbc7b55
 DIST chromium-11.0.696.34.tar.bz2 145096313 RMD160 f4d87286b641bc4fe10f677fadf9a0c7c04e9b60 SHA1 0c64ad7cdc3283746463ae22cf34487d6b51f83f SHA256 854f34d9cf2a10370a91c0dcd38bd48240f7bd55b9ff46333794e6bdf0cbdcff
 DIST chromium-11.0.696.43.tar.bz2 145069006 RMD160 c069b275e2170b7770820f1a93358913452f7a7e SHA1 8e6ab382f0efed2156bd477a73874a1d5d4b59af SHA256 e550d3fff04908ff85d838e66d524ed08cbe8a8dc5052ab7dd51900dccfa7e2d
 DIST chromium-12.0.725.0.tar.bz2 146640582 RMD160 baca180d7846e1a9147e59f181e6b271848a8adb SHA1 17d5cad46c98c975da6b459c7defaba4714dd02a SHA256 764602b41e518bdab0605cd0f65e7ad26f58012eee66062b02c74df23e706fc6
 DIST chromium-12.0.733.0.tar.bz2 146733153 RMD160 f60a84153ace0cafd26c4d2eea4680792a1a08f5 SHA1 64c7efa4e8ddc700b4236bd1847a8674919c8b72 SHA256 e340597905337f87b111fd619a311b11e495d067de1f86270cd35fd96db532d2
 EBUILD chromium-10.0.648.204.ebuild 10397 RMD160 92dcad8bf138c02316e666e9a28116760722d816 SHA1 2b9459b7cac93a7bc3a22beeae122f674c700848 SHA256 aa437ff0db6ac907c37adaec158b1d93d5818a83d9fa58fb7ad81d12e2b73136
+EBUILD chromium-10.0.648.205.ebuild 10399 RMD160 67b5c3810d1a2848fe855765daab8f1c8b178143 SHA1 e3cd0cba274982276396671133935df9d0e5c2f0 SHA256 96b82a7c6f9a92da73cebb5daa7d33882cedd34f96f128e7a2bf963a4f99e712
 EBUILD chromium-11.0.696.34.ebuild 10289 RMD160 e4226c0e1b07da69cfe26df1ed09b77e17fa6ad3 SHA1 3ca8dd21148bb5a9ece470f722b94af47159c97e SHA256 85ebe5a96f4bf5c05338888ad578607f4c75d8f534d839d901beacdb946ba355
 EBUILD chromium-11.0.696.43.ebuild 10289 RMD160 4b46fa981e534083ae7a8e4d5a64cf20778f5e9c SHA1 8c5c5c59e456856e1cd219dc958393c20384d91c SHA256 0446669f6a8b209593ab0c5c397b6f6dd98c20a57b268f31c9f8a2aad7b24f69
 EBUILD chromium-12.0.725.0.ebuild 11170 RMD160 77613660374d0e9f067baab76f718d12f42a45fd SHA1 583d6dfb6e24c805b13965484ceab39c3b73a858 SHA256 00c8f7c855b1289333f6dff6e86ea22179b65ee52803bde020f67433b0143289
 EBUILD chromium-12.0.733.0.ebuild 10964 RMD160 15aaa39fe25907464c9567a29e4c7b62d7436864 SHA1 8804af3e75cf2f3a4ff2395b24819a43a8d63c88 SHA256 86cc8359b666f7255946cb4ff3b9456bbaf4c510a043db01cbdbc8e97117ee3e
 EBUILD chromium-9999-r1.ebuild 13766 RMD160 345f49991c0b591e399c21ef0ed9f55459bce470 SHA1 02d8c85fb509b6d27341611a5dc1bc87f2f352ee SHA256 38b9d0e900dcb40d3375c3bd41a3ccdd88d65f1cd6082842e96793e9d7f1be97
-MISC ChangeLog 74812 RMD160 da0f88604dd1aafea1f73c3e43bae1a18c89973d SHA1 fb08401f6d1c72f52d705a4198be6d7d47096714 SHA256 82cda56c8a644251274a08c694c4c38c40f3ac65f3a3a0fe07dffb57d444f59f
+MISC ChangeLog 74982 RMD160 cf7b30dd169e9214ba66ab7117d0095ba2e2720d SHA1 a70d04049415ef712a6802edcd3f91b866cbbf69 SHA256 60734bf0988a2a8295914715fd773ea0efbf621a025340411bd28f4eadaf8c77
 MISC metadata.xml 392 RMD160 5fbc2d4aaba9b5262830ad7201bbb58d13b49787 SHA1 7834b589940775fae16e006524e4cbe808ad5cc7 SHA256 3022ab24c39c42b1bc53666fe4fc3da2305d69db5655ccf261cb521ecfb17282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2lvZEACgkQuUQtlDBCeQI9kACgg2j2je+8xF85vYjj+k+W+Ekq
-/C4An199Dz/2q3YDfcZD2um7nJHo5VjN
-=WYor
+iEYEARECAAYFAk2nT6kACgkQuUQtlDBCeQJE9gCggsfIRw39dK9cAfGqIctq7/u1
+FRkAnRD+LJdmqbXidHIqJzQWvK3akVLJ
+=tSv3
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-10.0.648.205.ebuild b/www-client/chromium/chromium-10.0.648.205.ebuild
new file mode 100644
index 000000000000..58d4d4c5e809
--- /dev/null
+++ b/www-client/chromium/chromium-10.0.648.205.ebuild
@@ -0,0 +1,329 @@
+# 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-10.0.648.205.ebuild,v 1.1 2011/04/14 19:48:45 phajdan.jr Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils flag-o-matic multilib pax-utils portability python \
+	toolchain-funcs versionator virtualx
+
+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 +gecko-mediaplayer gnome gnome-keyring"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/dbus-glib
+	>=dev-libs/icu-4.4.1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	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
+	media-libs/flac
+	virtual/jpeg
+	media-libs/libpng
+	>=media-libs/libvpx-0.9.5
+	media-libs/speex
+	>=media-video/ffmpeg-0.6_p25767[threads]
+	cups? ( >=net-print/cups-1.3.11 )
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2"
+RDEPEND+="
+	x11-misc/xdg-utils
+	virtual/ttf-fonts
+	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
+
+egyp() {
+	set -- build/gyp_chromium --depth=. "${@}"
+	echo "${@}" >&2
+	"${@}"
+}
+
+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
+
+	# Prevent user problems like bug #348235.
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
+	fi
+	eshopts_pop
+}
+
+src_prepare() {
+	# Enable optional support for gecko-mediaplayer.
+	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r1.patch
+
+	# Make sure we don't use bundled libvpx headers.
+	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
+
+	# Make sure we don't use bundled FLAC.
+	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
+
+	# Fix build, http://crbug.com/70606.
+	epatch "${FILESDIR}"/${PN}-webkit-version.patch
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libwebp/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
+
+	# Provide our own gyp file to use system flac.
+	# TODO: move this upstream.
+	cp "${FILESDIR}/flac.gyp" "third_party/flac" || die
+
+	# 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_speex=1
+		-Duse_system_vpx=1
+		-Duse_system_xdg_utils=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
+
+	# 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="
+
+	# Avoid a build error with -Os, bug #352457.
+	replace-flags "-Os" "-O2"
+
+	egyp ${myconf} || die
+}
+
+src_compile() {
+	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
+	pax-mark m out/Release/chrome
+	if use test; then
+		emake base_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/base_unittests
+	fi
+}
+
+src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #350347.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
+		'--gtest_filter=-ICUStringConversionsTest.*'
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	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 chrome/app/theme/chromium/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
+}
+
+pkg_postinst() {
+	# For more info see bug #292201, bug #352263, bug #361859.
+	elog
+	elog "Depending on your desktop environment, you may need"
+	elog "to install additional packages to get icons on the Downloads page."
+	elog
+	elog "For KDE, the required package is kde-base/oxygen-icons."
+	elog
+	elog "For other desktop environments, try one of the following:"
+	elog " - x11-themes/gnome-icon-theme"
+	elog " - x11-themes/tango-icon-theme"
+
+	# For more info see bug #359153.
+	elog
+	elog "Some web pages may require additional fonts to display properly."
+	elog "Try installing some of the following packages if some characters"
+	elog "are not displayed properly:"
+	elog " - media-fonts/arphicfonts"
+	elog " - media-fonts/bitstream-cyberbit"
+	elog " - media-fonts/droid"
+	elog " - media-fonts/ipamonafont"
+	elog " - media-fonts/ja-ipafonts"
+	elog " - media-fonts/takao-fonts"
+	elog " - media-fonts/wqy-microhei"
+	elog " - media-fonts/wqy-zenhei"
+}