Attachment #292613 for bug #385587




	x11-libs/libXtst
	kerberos? ( virtual/krb5 )"
DEPEND="${RDEPEND}
	dev-lang/nacl-toolchain-newlib
	dev-lang/perl
	dev-lang/yasm
	dev-python/simplejson

	python_set_active_version 2
	python_pkg_setup

	if ! use prefix; then
		if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
			# Fail if the kernel doesn't support features needed for sandboxing,
			# bug #363907.
			ERROR_PID_NS="PID_NS is required for sandbox to work"
			ERROR_NET_NS="NET_NS is required for sandbox to work"
			CONFIG_CHECK="~PID_NS ~NET_NS"
			check_extra_config
		fi
	fi

	if use bindist; then

}

src_prepare() {
        if ! use prefix; then
                ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
                        native_client/toolchain/linux_x86_newlib || die
        fi

	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
	sed -i '1i#define OF(x) x' \

	# will be used.
	# TODO: find a solution that can be upstreamed.
	rmdir v8/include || die
	ln -s ${EPREFIX}/usr/include v8/include || die

	# Make sure the build system will use the right python, bug #344367.
	# Only convert directories that need it, to save time.

		$(gyp_use kerberos use_kerberos)
		$(gyp_use pulseaudio use_pulseaudio)"

	if ! use prefix; then
		# Enable sandbox.
		myconf+="
			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
	fi

	# if host-is-pax; then
	#	# Prevent the build from failing (bug #301880). The performance

		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
	fi

        if use prefix; then
                myconf+=" -Ddisable_nacl=1"
        fi

	local myarch="$(tc-arch)"
	if [[ $myarch = amd64 ]] ; then
		myconf+=" -Dtarget_arch=x64"

}

src_compile() {
        if use prefix; then
	        emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
        else
	        emake chrome chromedriver BUILDTYPE=Release V=1 || die
        fi
	pax-mark m out/Release/chrome
	if use test; then
		emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die

src_install() {
	exeinto "${CHROMIUM_HOME}"
	doexe out/Release/chrome || die
	if ! use prefix; then
		doexe out/Release/chrome_sandbox || die
		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
	fi

	doexe out/Release/chromedriver || die

        if ! use prefix; then
                # Install Native Client files on platforms that support it.
                insinto "${CHROMIUM_HOME}"
                case "$(tc-arch)" in
                        amd64)
                                doexe out/Release/nacl_helper{,_bootstrap} || die
                                doins out/Release/nacl_irt_x86_64.nexe || die
                                doins out/Release/libppGoogleNaClPluginChrome.so || die
                        ;;
                        x86)
                                doexe out/Release/nacl_helper{,_bootstrap} || die
                                doins out/Release/nacl_irt_x86_32.nexe || die
                                doins out/Release/libppGoogleNaClPluginChrome.so || die
                        ;;
                esac
        fi

	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then

Return to bug 385587

Lines 54-60 Link Here

(-)chromium-17.0.932.0.ebuild.orig (-32 / +49 lines)
54	x11-libs/libXtst	54	x11-libs/libXtst
55	kerberos? ( virtual/krb5 )"	55	kerberos? ( virtual/krb5 )"
56	DEPEND="${RDEPEND}	56	DEPEND="${RDEPEND}
57	dev-lang/nacl-toolchain-newlib
58	dev-lang/perl	57	dev-lang/perl
59	dev-lang/yasm	58	dev-lang/yasm
60	dev-python/simplejson	59	dev-python/simplejson
Lines 152-164 Link Here
152	python_set_active_version 2	151	python_set_active_version 2
153	python_pkg_setup	152	python_pkg_setup
154		153
155	if [[ "${MERGE_TYPE}" == "source" \|\| "${MERGE_TYPE}" == "binary" ]]; then	154	if ! use prefix; then
156	# Fail if the kernel doesn't support features needed for sandboxing,	155	if [[ "${MERGE_TYPE}" == "source" \|\| "${MERGE_TYPE}" == "binary" ]]; then
157	# bug #363907.	156	# Fail if the kernel doesn't support features needed for sandboxing,
158	ERROR_PID_NS="PID_NS is required for sandbox to work"	157	# bug #363907.
159	ERROR_NET_NS="NET_NS is required for sandbox to work"	158	ERROR_PID_NS="PID_NS is required for sandbox to work"
160	CONFIG_CHECK="~PID_NS ~NET_NS"	159	ERROR_NET_NS="NET_NS is required for sandbox to work"
161	check_extra_config	160	CONFIG_CHECK="~PID_NS ~NET_NS"
		161	check_extra_config
		162	fi
162	fi	163	fi
163		164
164	if use bindist; then	165	if use bindist; then
Lines 169-176 Link Here
169	}	170	}
170		171
171	src_prepare() {	172	src_prepare() {
172	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \	173	if ! use prefix; then
173	native_client/toolchain/linux_x86_newlib \|\| die	174	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
		175	native_client/toolchain/linux_x86_newlib \|\| die
		176	fi
174		177
175	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.	178	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
176	sed -i '1i#define OF(x) x' \	179	sed -i '1i#define OF(x) x' \
Lines 237-243 Link Here
237	# will be used.	240	# will be used.
238	# TODO: find a solution that can be upstreamed.	241	# TODO: find a solution that can be upstreamed.
239	rmdir v8/include \|\| die	242	rmdir v8/include \|\| die
240	ln -s /usr/include v8/include \|\| die	243	ln -s ${EPREFIX}/usr/include v8/include \|\| die
241		244
242	# Make sure the build system will use the right python, bug #344367.	245	# Make sure the build system will use the right python, bug #344367.
243	# Only convert directories that need it, to save time.	246	# Only convert directories that need it, to save time.
Lines 282-291 Link Here
282	$(gyp_use kerberos use_kerberos)	285	$(gyp_use kerberos use_kerberos)
283	$(gyp_use pulseaudio use_pulseaudio)"	286	$(gyp_use pulseaudio use_pulseaudio)"
284		287
285	# Enable sandbox.	288	if ! use prefix; then
286	myconf+="	289	# Enable sandbox.
287	-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox	290	myconf+="
288	-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"	291	-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
		292	-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
		293	fi
289		294
290	# if host-is-pax; then	295	# if host-is-pax; then
291	# # Prevent the build from failing (bug #301880). The performance	296	# # Prevent the build from failing (bug #301880). The performance
Lines 302-307 Link Here
302	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"	307	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
303	fi	308	fi
304		309
		310	if use prefix; then
		311	myconf+=" -Ddisable_nacl=1"
		312	fi
		313
305	local myarch="$(tc-arch)"	314	local myarch="$(tc-arch)"
306	if [[ $myarch = amd64 ]] ; then	315	if [[ $myarch = amd64 ]] ; then
307	myconf+=" -Dtarget_arch=x64"	316	myconf+=" -Dtarget_arch=x64"
Lines 330-336 Link Here
330	}	339	}
331		340
332	src_compile() {	341	src_compile() {
333	emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 \|\| die	342	if use prefix; then
		343	emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 \|\| die
		344	else
		345	emake chrome chromedriver BUILDTYPE=Release V=1 \|\| die
		346	fi
334	pax-mark m out/Release/chrome	347	pax-mark m out/Release/chrome
335	if use test; then	348	if use test; then
336	emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 \|\| die	349	emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 \|\| die
Lines 376-400 Link Here
376	src_install() {	389	src_install() {
377	exeinto "${CHROMIUM_HOME}"	390	exeinto "${CHROMIUM_HOME}"
378	doexe out/Release/chrome \|\| die	391	doexe out/Release/chrome \|\| die
379	doexe out/Release/chrome_sandbox \|\| die	392	if ! use prefix; then
380	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"	393	doexe out/Release/chrome_sandbox \|\| die
		394	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
		395	fi
381		396
382	doexe out/Release/chromedriver \|\| die	397	doexe out/Release/chromedriver \|\| die
383		398
384	# Install Native Client files on platforms that support it.	399	if ! use prefix; then
385	insinto "${CHROMIUM_HOME}"	400	# Install Native Client files on platforms that support it.
386	case "$(tc-arch)" in	401	insinto "${CHROMIUM_HOME}"
387	amd64)	402	case "$(tc-arch)" in
388	doexe out/Release/nacl_helper{,_bootstrap} \|\| die	403	amd64)
389	doins out/Release/nacl_irt_x86_64.nexe \|\| die	404	doexe out/Release/nacl_helper{,_bootstrap} \|\| die
390	doins out/Release/libppGoogleNaClPluginChrome.so \|\| die	405	doins out/Release/nacl_irt_x86_64.nexe \|\| die
391	;;	406	doins out/Release/libppGoogleNaClPluginChrome.so \|\| die
392	x86)	407	;;
393	doexe out/Release/nacl_helper{,_bootstrap} \|\| die	408	x86)
394	doins out/Release/nacl_irt_x86_32.nexe \|\| die	409	doexe out/Release/nacl_helper{,_bootstrap} \|\| die
395	doins out/Release/libppGoogleNaClPluginChrome.so \|\| die	410	doins out/Release/nacl_irt_x86_32.nexe \|\| die
396	;;	411	doins out/Release/libppGoogleNaClPluginChrome.so \|\| die
397	esac	412	;;
		413	esac
		414	fi
398		415
399	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh \|\| die	416	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh \|\| die
400	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then	417	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then