Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 541610 | Differences between
and this patch

Collapse All | Expand All

(-)a/gentoo/chromium-53.0.2785.92.ebuild (-11 / +24 lines)
Lines 18-28 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
18
LICENSE="BSD"
18
LICENSE="BSD"
19
SLOT="0"
19
SLOT="0"
20
KEYWORDS="amd64 ~arm ~arm64 x86"
20
KEYWORDS="amd64 ~arm ~arm64 x86"
21
IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
21
IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos nacl neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
22
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
22
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
23
23
24
# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
24
# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
25
REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc )"
25
REQUIRED_USE="gn? ( gnome gnome-keyring !tcmalloc ) arm? ( !nacl )"
26
26
27
# Native Client binaries are compiled with different set of flags, bug #452066.
27
# Native Client binaries are compiled with different set of flags, bug #452066.
28
QA_FLAGS_IGNORED=".*\.nexe"
28
QA_FLAGS_IGNORED=".*\.nexe"
Lines 187-192 pkg_setup() { Link Here
187
}
187
}
188
188
189
src_prepare() {
189
src_prepare() {
190
    if use nacl; then
191
        python build/download_nacl_toolchains.py \
192
            --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
193
        sync --extract
194
    fi
195
190
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
196
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
191
	epatch "${FILESDIR}/${PN}-system-jinja-r11.patch"
197
	epatch "${FILESDIR}/${PN}-system-jinja-r11.patch"
192
	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
198
	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
Lines 320-325 src_prepare() { Link Here
320
		'url/third_party/mozilla' \
326
		'url/third_party/mozilla' \
321
		'v8/src/third_party/fdlibm' \
327
		'v8/src/third_party/fdlibm' \
322
		'v8/src/third_party/valgrind' \
328
		'v8/src/third_party/valgrind' \
329
		'base/third_party/libevent' \
330
		'native_client/src/third_party/dlmalloc' \
323
		--do-remove || die
331
		--do-remove || die
324
}
332
}
325
333
Lines 334-342 src_configure() { Link Here
334
	# additions, bug #336871.
342
	# additions, bug #336871.
335
	myconf_gyp+=" -Ddisable_sse2=1"
343
	myconf_gyp+=" -Ddisable_sse2=1"
336
344
337
	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
345
	if ! use nacl ; then
338
	myconf_gyp+=" -Ddisable_nacl=1"
346
		myconf_gyp+=" -Ddisable_nacl=1"
339
	myconf_gn+=" enable_nacl=false"
347
		myconf_gn+=" enable_nacl=false"
348
	else
349
		myconf_gyp+=" -Ddisable_glibc=1"
350
		myconf_gn+=" enable_glibc=false"
351
	fi
352
340
353
341
	# Make it possible to remove third_party/adobe.
354
	# Make it possible to remove third_party/adobe.
342
	echo > "${T}/flapper_version.h" || die
355
	echo > "${T}/flapper_version.h" || die
Lines 622-633 src_install() { Link Here
622
	doexe out/Release/chromedriver || die
635
	doexe out/Release/chromedriver || die
623
	use widevine && doexe out/Release/libwidevinecdmadapter.so
636
	use widevine && doexe out/Release/libwidevinecdmadapter.so
624
637
625
	# if ! use arm; then
638
	if use nacl; then
626
	#	doexe out/Release/nacl_helper{,_bootstrap} || die
639
		doexe out/Release/nacl_helper{,_bootstrap} || die
627
	#	insinto "${CHROMIUM_HOME}"
640
		insinto "${CHROMIUM_HOME}"
628
	#	doins out/Release/nacl_irt_*.nexe || die
641
		doins out/Release/nacl_irt_*.nexe || die
629
	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
642
	fi
630
	# fi
643
631
644
632
	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
645
	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
633
	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
646
	if [[ -n ${CHROMIUM_SUFFIX} ]]; then

Return to bug 541610