Dev channel bump. Add pic USE flag to build libffmpegsumo.so without text relocations on x86 (bug #493670 by ago). Remove old.

(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

4 files changed, 53 insertions, 109 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index b65d5e828c8d..30b831228547 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1090 2014/06/12 00:18:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1091 2014/06/12 06:36:11 phajdan.jr Exp $
+
+*chromium-37.0.2041.4 (12 Jun 2014)
+
+  12 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-37.0.2041.4.ebuild, +files/chromium-ffmpeg-r1.patch,
+  -chromium-37.0.2017.2.ebuild, metadata.xml:
+  Dev channel bump. Add pic USE flag to build libffmpegsumo.so without text
+  relocations on x86 (bug #493670 by ago). Remove old.
 
 *chromium-35.0.1916.153 (12 Jun 2014)
 
diff --git a/www-client/chromium/chromium-37.0.2017.2.ebuild b/www-client/chromium/chromium-37.0.2041.4.ebuild
index fbabf3906428..58cb629ad8f0 100644
--- a/www-client/chromium/chromium-37.0.2017.2.ebuild
+++ b/www-client/chromium/chromium-37.0.2041.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2017.2.ebuild,v 1.1 2014/05/30 07:21:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2041.4.ebuild,v 1.1 2014/06/12 06:36:11 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,13 +14,12 @@ inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	test? ( https://commondatastorage.googleapis.com/chromium-browser-official/${P}-testdata.tar.xz )"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -81,10 +80,7 @@ DEPEND="${RDEPEND}
 	sys-apps/hwids
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-libs/openssl:0
-	)"
+	virtual/pkgconfig"
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
 	!=www-client/chromium-9999
@@ -97,11 +93,9 @@ RDEPEND+="
 # with python_check_deps.
 DEPEND+=" $(python_gen_any_dep '
 	dev-python/simplejson[${PYTHON_USEDEP}]
-	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
 ')"
 python_check_deps() {
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
-		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
+	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
 }
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
@@ -161,7 +155,8 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-harfbuzz-r0.patch"
+	epatch "${FILESDIR}/${PN}-angle-r0.patch"
+	epatch "${FILESDIR}/${PN}-ffmpeg-r1.patch"
 
 	epatch_user
 
@@ -429,11 +424,17 @@ src_configure() {
 	export TMPDIR="${WORKDIR}/temp"
 	mkdir -m 755 "${TMPDIR}" || die
 
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py --config-only linux ${ffmpeg_target_arch} || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die
 	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
 	popd > /dev/null || die
 
 	einfo "Configuring Chromium..."
@@ -459,17 +460,7 @@ eninja() {
 }
 
 src_compile() {
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	local test_targets=""
-	for x in base cacheinvalidation content crypto \
-		gpu net printing sql; do
-		test_targets+=" ${x}_unittests"
-	done
-
 	local ninja_targets="chrome chrome_sandbox chromedriver"
-	if use test; then
-		ninja_targets+=" $test_targets"
-	fi
 
 	# Build mksnapshot and pax-mark it.
 	eninja -C out/Release mksnapshot || die
@@ -480,91 +471,6 @@ src_compile() {
 	eninja -C out/Release ${ninja_targets} || die
 
 	pax-mark m out/Release/chrome
-	if use test; then
-		for x in $test_targets; do
-			pax-mark m out/Release/${x}
-		done
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local LC_ALL="en_US.utf8"
-
-	if ! locale -a | grep -q "${LC_ALL}"; then
-		eerror "${PN} requires ${LC_ALL} 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 ${LC_ALL} is not supported"
-	fi
-
-	# If we have the right locale, export it to the environment
-	export LC_ALL
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# virtualmake dies on failure, so we run our tests in a function
-	VIRTUALX_COMMAND="chromium_test" virtualmake
-}
-
-chromium_test() {
-	# Keep track of the cumulative exit status for all tests
-	local exitstatus=0
-
-	runtest() {
-		local cmd=$1
-		shift
-		local IFS=:
-		set -- "${cmd}" --test-launcher-bot-mode "--gtest_filter=-$*"
-		einfo "$@"
-		"$@"
-		local st=$?
-		(( st )) && eerror "${cmd} failed"
-		(( exitstatus |= st ))
-	}
-
-	local excluded_base_unittests=(
-		"OutOfMemoryDeathTest.ViaSharedLibraries" # bug #497512
-	)
-	runtest out/Release/base_unittests "${excluded_base_unittests[@]}"
-	runtest out/Release/cacheinvalidation_unittests
-
-	local excluded_content_unittests=(
-		"RendererDateTimePickerTest.*" # bug #465452
-	)
-	runtest out/Release/content_unittests "${excluded_content_unittests[@]}"
-
-	runtest out/Release/crypto_unittests
-	runtest out/Release/gpu_unittests
-
-	# TODO: add media_unittests after fixing compile (bug #462546).
-	# runtest out/Release/media_unittests
-
-	local excluded_net_unittests=(
-		"NetUtilTest.IDNToUnicode*" # bug 361885
-		"NetUtilTest.FormatUrl*" # see above
-		"SpdyFramerTests/SpdyFramerTest.CreatePushPromiseCompressed/2" # bug #478168
-		"SpdyFramerTests/SpdyFramerTest.CreateContinuationCompressed/2" # see above
-		"HostResolverImplTest.BypassCache" # bug #498304
-		"HostResolverImplTest.FlushCacheOnIPAddressChange" # bug #481812
-		"HostResolverImplTest.ResolveFromCache" # see above
-		"ProxyResolverV8TracingTest.*" # see above
-		"SSLClientSocketTest.ConnectMismatched" # see above
-		"UDPSocketTest.*" # see above
-		"*EndToEndTest*" # see above
-		"Version/QuicHttpStreamTest.Priority/0" # bug #503010
-		"Version/QuicHttpStreamTest.DestroyedEarly/0" # see above
-	)
-	runtest out/Release/net_unittests "${excluded_net_unittests[@]}"
-
-	runtest out/Release/printing_unittests
-	runtest out/Release/sql_unittests
-
-	return ${exitstatus}
 }
 
 src_install() {
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
new file mode 100644
index 000000000000..ed037ddb6dc1
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -0,0 +1,29 @@
+--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2014-06-11 10:13:47.246416916 +0000
++++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py	2014-06-11 10:19:55.333739033 +0000
+@@ -170,12 +170,13 @@
+                     'is not necessary for generate_gyp.py')
+   options, args = parser.parse_args(argv)
+ 
+-  if len(args) != 2:
++  if len(args) < 2:
+     parser.print_help()
+     return 1
+ 
+   target_os = args[0]
+   target_arch = args[1]
++  configure_args = args[2:]
+ 
+   if target_os not in ('linux', 'linux-noasm', 'win', 'win-vs2013', 'mac'):
+     parser.print_help()
+@@ -429,9 +430,9 @@
+       BuildFFmpeg, target_os, target_arch, host_os, host_arch, parallel_jobs,
+       options.config_only)
+   do_build_ffmpeg(
+-      'Chromium', configure_flags['Common'] + configure_flags['Chromium'])
++      'Chromium', configure_flags['Common'] + configure_flags['Chromium'] + configure_args)
+   do_build_ffmpeg(
+-      'Chrome', configure_flags['Common'] + configure_flags['Chrome'])
++      'Chrome', configure_flags['Common'] + configure_flags['Chrome'] + configure_args)
+ 
+   if target_os == 'linux':
+     do_build_ffmpeg('ChromiumOS',
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index f70f1e129129..f04266601ab6 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -5,6 +5,7 @@
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
 		<flag name="bindist">Disable patent-encumbered HTML5 video codecs</flag>
+		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc.</flag>
 	</use>
 </pkgmetadata>