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

Collapse All | Expand All

(-)a/chromium-25.0.1364.160.ebuild (-5 / +12 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="amd64 x86"
21
KEYWORDS="amd64 x86"
22
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
RDEPEND="app-accessibility/speech-dispatcher
24
RDEPEND="app-accessibility/speech-dispatcher
25
	app-arch/bzip2
25
	app-arch/bzip2
Lines 64-70 RDEPEND="app-accessibility/speech-dispatcher Link Here
64
		sys-libs/libselinux
64
		sys-libs/libselinux
65
	)"
65
	)"
66
DEPEND="${RDEPEND}
66
DEPEND="${RDEPEND}
67
	!arm? (
67
	nacl? (
68
		>=dev-lang/nacl-toolchain-newlib-0_p9093
68
		>=dev-lang/nacl-toolchain-newlib-0_p9093
69
		dev-lang/yasm
69
		dev-lang/yasm
70
	)
70
	)
Lines 83-88 RDEPEND+=" Link Here
83
	x11-misc/xdg-utils
83
	x11-misc/xdg-utils
84
	virtual/ttf-fonts"
84
	virtual/ttf-fonts"
85
85
86
REQUIRED_USE="
87
	arm? ( !nacl )
88
"
89
86
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
90
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
87
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
91
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
88
fi
92
fi
Lines 115-121 pkg_setup() { Link Here
115
}
119
}
116
120
117
src_prepare() {
121
src_prepare() {
118
	if ! use arm; then
122
	if use nacl; then
119
		ebegin "Preparing NaCl newlib toolchain"
123
		ebegin "Preparing NaCl newlib toolchain"
120
		pushd "${T}" >/dev/null || die
124
		pushd "${T}" >/dev/null || die
121
		mkdir sdk || die
125
		mkdir sdk || die
Lines 147-152 src_prepare() { Link Here
147
		die "tarball fixed, please remove workaround"
151
		die "tarball fixed, please remove workaround"
148
	fi
152
	fi
149
153
154
	if use nacl; then
150
	mkdir -p chrome/test/data/nacl
155
	mkdir -p chrome/test/data/nacl
151
	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
156
	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
152
	{
157
	{
Lines 158-163 src_prepare() { Link Here
158
	  ],
163
	  ],
159
	}
164
	}
160
	EOF
165
	EOF
166
	fi
161
167
162
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
168
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
163
169
Lines 286-291 src_configure() { Link Here
286
		$(gyp_use gnome-keyring use_gnome_keyring)
292
		$(gyp_use gnome-keyring use_gnome_keyring)
287
		$(gyp_use gnome-keyring linux_link_gnome_keyring)
293
		$(gyp_use gnome-keyring linux_link_gnome_keyring)
288
		$(gyp_use kerberos)
294
		$(gyp_use kerberos)
295
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
289
		$(gyp_use pulseaudio)
296
		$(gyp_use pulseaudio)
290
		$(gyp_use selinux selinux)"
297
		$(gyp_use selinux selinux)"
291
298
Lines 335-341 src_configure() { Link Here
335
		myconf+=" -Dtarget_arch=arm
342
		myconf+=" -Dtarget_arch=arm
336
			-Darmv7=0
343
			-Darmv7=0
337
			-Darm_neon=0
344
			-Darm_neon=0
338
			-Ddisable_nacl=1"
345
			"
339
	else
346
	else
340
		die "Failed to determine target arch, got '$myarch'."
347
		die "Failed to determine target arch, got '$myarch'."
341
	fi
348
	fi
Lines 449-455 src_install() { Link Here
449
456
450
	doexe out/Release/chromedriver || die
457
	doexe out/Release/chromedriver || die
451
458
452
	if ! use arm; then
459
	if use nacl; then
453
		doexe out/Release/nacl_helper{,_bootstrap} || die
460
		doexe out/Release/nacl_helper{,_bootstrap} || die
454
		insinto "${CHROMIUM_HOME}"
461
		insinto "${CHROMIUM_HOME}"
455
		doins out/Release/nacl_irt_*.nexe || die
462
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-25.0.1364.172.ebuild (-5 / +12 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="~amd64 ~x86"
21
KEYWORDS="~amd64 ~x86"
22
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
RDEPEND="app-accessibility/speech-dispatcher
24
RDEPEND="app-accessibility/speech-dispatcher
25
	app-arch/bzip2
25
	app-arch/bzip2
Lines 64-70 RDEPEND="app-accessibility/speech-dispatcher Link Here
64
		sys-libs/libselinux
64
		sys-libs/libselinux
65
	)"
65
	)"
66
DEPEND="${RDEPEND}
66
DEPEND="${RDEPEND}
67
	!arm? (
67
	nacl? (
68
		>=dev-lang/nacl-toolchain-newlib-0_p9093
68
		>=dev-lang/nacl-toolchain-newlib-0_p9093
69
		dev-lang/yasm
69
		dev-lang/yasm
70
	)
70
	)
Lines 83-88 RDEPEND+=" Link Here
83
	x11-misc/xdg-utils
83
	x11-misc/xdg-utils
84
	virtual/ttf-fonts"
84
	virtual/ttf-fonts"
85
85
86
REQUIRED_USE="
87
	arm? ( !nacl )
88
"
89
86
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
90
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
87
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
91
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
88
fi
92
fi
Lines 115-121 pkg_setup() { Link Here
115
}
119
}
116
120
117
src_prepare() {
121
src_prepare() {
118
	if ! use arm; then
122
	if use nacl; then
119
		ebegin "Preparing NaCl newlib toolchain"
123
		ebegin "Preparing NaCl newlib toolchain"
120
		pushd "${T}" >/dev/null || die
124
		pushd "${T}" >/dev/null || die
121
		mkdir sdk || die
125
		mkdir sdk || die
Lines 147-152 src_prepare() { Link Here
147
		die "tarball fixed, please remove workaround"
151
		die "tarball fixed, please remove workaround"
148
	fi
152
	fi
149
153
154
	if use nacl; then
150
	mkdir -p chrome/test/data/nacl
155
	mkdir -p chrome/test/data/nacl
151
	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
156
	cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
152
	{
157
	{
Lines 158-163 src_prepare() { Link Here
158
	  ],
163
	  ],
159
	}
164
	}
160
	EOF
165
	EOF
166
	fi
161
167
162
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
168
	epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
163
169
Lines 289-294 src_configure() { Link Here
289
		$(gyp_use gnome-keyring use_gnome_keyring)
295
		$(gyp_use gnome-keyring use_gnome_keyring)
290
		$(gyp_use gnome-keyring linux_link_gnome_keyring)
296
		$(gyp_use gnome-keyring linux_link_gnome_keyring)
291
		$(gyp_use kerberos)
297
		$(gyp_use kerberos)
298
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
292
		$(gyp_use pulseaudio)
299
		$(gyp_use pulseaudio)
293
		$(gyp_use selinux selinux)"
300
		$(gyp_use selinux selinux)"
294
301
Lines 338-344 src_configure() { Link Here
338
		myconf+=" -Dtarget_arch=arm
345
		myconf+=" -Dtarget_arch=arm
339
			-Darmv7=0
346
			-Darmv7=0
340
			-Darm_neon=0
347
			-Darm_neon=0
341
			-Ddisable_nacl=1"
348
			"
342
	else
349
	else
343
		die "Failed to determine target arch, got '$myarch'."
350
		die "Failed to determine target arch, got '$myarch'."
344
	fi
351
	fi
Lines 452-458 src_install() { Link Here
452
459
453
	doexe out/Release/chromedriver || die
460
	doexe out/Release/chromedriver || die
454
461
455
	if ! use arm; then
462
	if use nacl; then
456
		doexe out/Release/nacl_helper{,_bootstrap} || die
463
		doexe out/Release/nacl_helper{,_bootstrap} || die
457
		insinto "${CHROMIUM_HOME}"
464
		insinto "${CHROMIUM_HOME}"
458
		doins out/Release/nacl_irt_*.nexe || die
465
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-26.0.1410.33-r1.ebuild (-5 / +10 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="~amd64 ~x86"
21
KEYWORDS="~amd64 ~x86"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
# Native Client binaries are compiled with different set of flags, bug #452066.
24
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
25
QA_FLAGS_IGNORED=".*\.nexe"
Lines 73-79 RDEPEND="app-accessibility/speech-dispatcher Link Here
73
	)"
73
	)"
74
DEPEND="${RDEPEND}
74
DEPEND="${RDEPEND}
75
	${PYTHON_DEPS}
75
	${PYTHON_DEPS}
76
	!arm? (
76
	nacl? (
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
78
		dev-lang/yasm
78
		dev-lang/yasm
79
	)
79
	)
Lines 92-97 RDEPEND+=" Link Here
92
	x11-misc/xdg-utils
92
	x11-misc/xdg-utils
93
	virtual/ttf-fonts"
93
	virtual/ttf-fonts"
94
94
95
REQUIRED_USE="
96
	arm? ( !nacl )
97
"
98
95
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
99
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
96
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
100
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
97
fi
101
fi
Lines 120-126 pkg_setup() { Link Here
120
}
124
}
121
125
122
src_prepare() {
126
src_prepare() {
123
	if ! use arm; then
127
	if use nacl; then
124
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
128
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
125
		# Do not preserve SELinux context, bug #460892 .
129
		# Do not preserve SELinux context, bug #460892 .
126
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
130
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 273-278 src_configure() { Link Here
273
		$(gyp_use gps linux_use_libgps)
277
		$(gyp_use gps linux_use_libgps)
274
		$(gyp_use gps linux_link_libgps)
278
		$(gyp_use gps linux_link_libgps)
275
		$(gyp_use kerberos)
279
		$(gyp_use kerberos)
280
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
276
		$(gyp_use pulseaudio)
281
		$(gyp_use pulseaudio)
277
		$(gyp_use selinux selinux)"
282
		$(gyp_use selinux selinux)"
278
283
Lines 326-332 src_configure() { Link Here
326
			-Dsysroot=
331
			-Dsysroot=
327
			-Darmv7=0
332
			-Darmv7=0
328
			-Darm_neon=0
333
			-Darm_neon=0
329
			-Ddisable_nacl=1"
334
			"
330
	else
335
	else
331
		die "Failed to determine target arch, got '$myarch'."
336
		die "Failed to determine target arch, got '$myarch'."
332
	fi
337
	fi
Lines 447-453 src_install() { Link Here
447
452
448
	doexe out/Release/chromedriver || die
453
	doexe out/Release/chromedriver || die
449
454
450
	if ! use arm; then
455
	if use nacl; then
451
		doexe out/Release/nacl_helper{,_bootstrap} || die
456
		doexe out/Release/nacl_helper{,_bootstrap} || die
452
		insinto "${CHROMIUM_HOME}"
457
		insinto "${CHROMIUM_HOME}"
453
		doins out/Release/nacl_irt_*.nexe || die
458
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-26.0.1410.33.ebuild (-5 / +10 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="~amd64 ~x86"
21
KEYWORDS="~amd64 ~x86"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
# Native Client binaries are compiled with different set of flags, bug #452066.
24
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
25
QA_FLAGS_IGNORED=".*\.nexe"
Lines 73-79 RDEPEND="app-accessibility/speech-dispatcher Link Here
73
	)"
73
	)"
74
DEPEND="${RDEPEND}
74
DEPEND="${RDEPEND}
75
	${PYTHON_DEPS}
75
	${PYTHON_DEPS}
76
	!arm? (
76
	nacl? (
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
78
		dev-lang/yasm
78
		dev-lang/yasm
79
	)
79
	)
Lines 92-97 RDEPEND+=" Link Here
92
	x11-misc/xdg-utils
92
	x11-misc/xdg-utils
93
	virtual/ttf-fonts"
93
	virtual/ttf-fonts"
94
94
95
REQUIRED_USE="
96
	arm? ( !nacl )
97
"
98
95
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
99
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
96
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
100
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
97
fi
101
fi
Lines 120-126 pkg_setup() { Link Here
120
}
124
}
121
125
122
src_prepare() {
126
src_prepare() {
123
	if ! use arm; then
127
	if use nacl; then
124
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
128
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
125
		# Do not preserve SELinux context, bug #460892 .
129
		# Do not preserve SELinux context, bug #460892 .
126
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
130
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 269-274 src_configure() { Link Here
269
		$(gyp_use gps linux_use_libgps)
273
		$(gyp_use gps linux_use_libgps)
270
		$(gyp_use gps linux_link_libgps)
274
		$(gyp_use gps linux_link_libgps)
271
		$(gyp_use kerberos)
275
		$(gyp_use kerberos)
276
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
272
		$(gyp_use pulseaudio)
277
		$(gyp_use pulseaudio)
273
		$(gyp_use selinux selinux)"
278
		$(gyp_use selinux selinux)"
274
279
Lines 322-328 src_configure() { Link Here
322
			-Dsysroot=
327
			-Dsysroot=
323
			-Darmv7=0
328
			-Darmv7=0
324
			-Darm_neon=0
329
			-Darm_neon=0
325
			-Ddisable_nacl=1"
330
			"
326
	else
331
	else
327
		die "Failed to determine target arch, got '$myarch'."
332
		die "Failed to determine target arch, got '$myarch'."
328
	fi
333
	fi
Lines 443-449 src_install() { Link Here
443
448
444
	doexe out/Release/chromedriver || die
449
	doexe out/Release/chromedriver || die
445
450
446
	if ! use arm; then
451
	if use nacl; then
447
		doexe out/Release/nacl_helper{,_bootstrap} || die
452
		doexe out/Release/nacl_helper{,_bootstrap} || die
448
		insinto "${CHROMIUM_HOME}"
453
		insinto "${CHROMIUM_HOME}"
449
		doins out/Release/nacl_irt_*.nexe || die
454
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-26.0.1410.40.ebuild (-5 / +10 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="~amd64 ~x86"
21
KEYWORDS="~amd64 ~x86"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
# Native Client binaries are compiled with different set of flags, bug #452066.
24
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
25
QA_FLAGS_IGNORED=".*\.nexe"
Lines 73-79 RDEPEND="app-accessibility/speech-dispatcher Link Here
73
	)"
73
	)"
74
DEPEND="${RDEPEND}
74
DEPEND="${RDEPEND}
75
	${PYTHON_DEPS}
75
	${PYTHON_DEPS}
76
	!arm? (
76
	nacl? (
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
78
		dev-lang/yasm
78
		dev-lang/yasm
79
	)
79
	)
Lines 92-97 RDEPEND+=" Link Here
92
	x11-misc/xdg-utils
92
	x11-misc/xdg-utils
93
	virtual/ttf-fonts"
93
	virtual/ttf-fonts"
94
94
95
REQUIRED_USE="
96
	arm? ( !nacl )
97
"
98
95
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
99
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
96
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
100
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
97
fi
101
fi
Lines 120-126 pkg_setup() { Link Here
120
}
124
}
121
125
122
src_prepare() {
126
src_prepare() {
123
	if ! use arm; then
127
	if use nacl; then
124
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
128
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
125
		# Do not preserve SELinux context, bug #460892 .
129
		# Do not preserve SELinux context, bug #460892 .
126
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
130
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 273-278 src_configure() { Link Here
273
		$(gyp_use gps linux_use_libgps)
277
		$(gyp_use gps linux_use_libgps)
274
		$(gyp_use gps linux_link_libgps)
278
		$(gyp_use gps linux_link_libgps)
275
		$(gyp_use kerberos)
279
		$(gyp_use kerberos)
280
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
276
		$(gyp_use pulseaudio)
281
		$(gyp_use pulseaudio)
277
		$(gyp_use selinux selinux)"
282
		$(gyp_use selinux selinux)"
278
283
Lines 326-332 src_configure() { Link Here
326
			-Dsysroot=
331
			-Dsysroot=
327
			-Darmv7=0
332
			-Darmv7=0
328
			-Darm_neon=0
333
			-Darm_neon=0
329
			-Ddisable_nacl=1"
334
			"
330
	else
335
	else
331
		die "Failed to determine target arch, got '$myarch'."
336
		die "Failed to determine target arch, got '$myarch'."
332
	fi
337
	fi
Lines 447-453 src_install() { Link Here
447
452
448
	doexe out/Release/chromedriver || die
453
	doexe out/Release/chromedriver || die
449
454
450
	if ! use arm; then
455
	if use nacl; then
451
		doexe out/Release/nacl_helper{,_bootstrap} || die
456
		doexe out/Release/nacl_helper{,_bootstrap} || die
452
		insinto "${CHROMIUM_HOME}"
457
		insinto "${CHROMIUM_HOME}"
453
		doins out/Release/nacl_irt_*.nexe || die
458
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-26.0.1410.43.ebuild (-5 / +10 lines)
Lines 19-25 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="0"
20
SLOT="0"
21
KEYWORDS="~amd64 ~x86"
21
KEYWORDS="~amd64 ~x86"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
22
IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
23
23
24
# Native Client binaries are compiled with different set of flags, bug #452066.
24
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
25
QA_FLAGS_IGNORED=".*\.nexe"
Lines 73-79 RDEPEND="app-accessibility/speech-dispatcher Link Here
73
	)"
73
	)"
74
DEPEND="${RDEPEND}
74
DEPEND="${RDEPEND}
75
	${PYTHON_DEPS}
75
	${PYTHON_DEPS}
76
	!arm? (
76
	nacl? (
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
77
		>=dev-lang/nacl-toolchain-newlib-0_p9093
78
		dev-lang/yasm
78
		dev-lang/yasm
79
	)
79
	)
Lines 92-97 RDEPEND+=" Link Here
92
	x11-misc/xdg-utils
92
	x11-misc/xdg-utils
93
	virtual/ttf-fonts"
93
	virtual/ttf-fonts"
94
94
95
REQUIRED_USE="
96
	arm? ( !nacl )
97
"
98
95
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
99
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
96
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
100
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
97
fi
101
fi
Lines 120-126 pkg_setup() { Link Here
120
}
124
}
121
125
122
src_prepare() {
126
src_prepare() {
123
	if ! use arm; then
127
	if use nacl; then
124
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
128
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
125
		# Do not preserve SELinux context, bug #460892 .
129
		# Do not preserve SELinux context, bug #460892 .
126
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
130
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 273-278 src_configure() { Link Here
273
		$(gyp_use gps linux_use_libgps)
277
		$(gyp_use gps linux_use_libgps)
274
		$(gyp_use gps linux_link_libgps)
278
		$(gyp_use gps linux_link_libgps)
275
		$(gyp_use kerberos)
279
		$(gyp_use kerberos)
280
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
276
		$(gyp_use pulseaudio)
281
		$(gyp_use pulseaudio)
277
		$(gyp_use selinux selinux)"
282
		$(gyp_use selinux selinux)"
278
283
Lines 326-332 src_configure() { Link Here
326
			-Dsysroot=
331
			-Dsysroot=
327
			-Darmv7=0
332
			-Darmv7=0
328
			-Darm_neon=0
333
			-Darm_neon=0
329
			-Ddisable_nacl=1"
334
			"
330
	else
335
	else
331
		die "Failed to determine target arch, got '$myarch'."
336
		die "Failed to determine target arch, got '$myarch'."
332
	fi
337
	fi
Lines 447-453 src_install() { Link Here
447
452
448
	doexe out/Release/chromedriver || die
453
	doexe out/Release/chromedriver || die
449
454
450
	if ! use arm; then
455
	if use nacl; then
451
		doexe out/Release/nacl_helper{,_bootstrap} || die
456
		doexe out/Release/nacl_helper{,_bootstrap} || die
452
		insinto "${CHROMIUM_HOME}"
457
		insinto "${CHROMIUM_HOME}"
453
		doins out/Release/nacl_irt_*.nexe || die
458
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-27.0.1448.0.ebuild (-5 / +10 lines)
Lines 20-26 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
20
LICENSE="BSD"
20
LICENSE="BSD"
21
SLOT="0"
21
SLOT="0"
22
KEYWORDS="~amd64 ~x86"
22
KEYWORDS="~amd64 ~x86"
23
IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
23
IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
24
24
25
# Native Client binaries are compiled with different set of flags, bug #452066.
25
# Native Client binaries are compiled with different set of flags, bug #452066.
26
QA_FLAGS_IGNORED=".*\.nexe"
26
QA_FLAGS_IGNORED=".*\.nexe"
Lines 75-81 RDEPEND="app-accessibility/speech-dispatcher:= Link Here
75
	)"
75
	)"
76
DEPEND="${RDEPEND}
76
DEPEND="${RDEPEND}
77
	${PYTHON_DEPS}
77
	${PYTHON_DEPS}
78
	!arm? (
78
	nacl? (
79
		>=dev-lang/nacl-toolchain-newlib-0_p9093
79
		>=dev-lang/nacl-toolchain-newlib-0_p9093
80
		dev-lang/yasm
80
		dev-lang/yasm
81
	)
81
	)
Lines 94-99 RDEPEND+=" Link Here
94
	x11-misc/xdg-utils
94
	x11-misc/xdg-utils
95
	virtual/ttf-fonts"
95
	virtual/ttf-fonts"
96
96
97
REQUIRED_USE="
98
	arm? ( !nacl )
99
"
100
97
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
101
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
98
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
102
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
99
fi
103
fi
Lines 122-128 pkg_setup() { Link Here
122
}
126
}
123
127
124
src_prepare() {
128
src_prepare() {
125
	if ! use arm; then
129
	if use nacl; then
126
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
130
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
127
		# Do not preserve SELinux context, bug #460892 .
131
		# Do not preserve SELinux context, bug #460892 .
128
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
132
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 268-273 src_configure() { Link Here
268
		$(gyp_use gps linux_use_libgps)
272
		$(gyp_use gps linux_use_libgps)
269
		$(gyp_use gps linux_link_libgps)
273
		$(gyp_use gps linux_link_libgps)
270
		$(gyp_use kerberos)
274
		$(gyp_use kerberos)
275
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
271
		$(gyp_use pulseaudio)
276
		$(gyp_use pulseaudio)
272
		$(gyp_use selinux selinux)"
277
		$(gyp_use selinux selinux)"
273
278
Lines 330-336 src_configure() { Link Here
330
			-Dsysroot=
335
			-Dsysroot=
331
			-Darmv7=0
336
			-Darmv7=0
332
			-Darm_neon=0
337
			-Darm_neon=0
333
			-Ddisable_nacl=1"
338
			"
334
	else
339
	else
335
		die "Failed to determine target arch, got '$myarch'."
340
		die "Failed to determine target arch, got '$myarch'."
336
	fi
341
	fi
Lines 452-458 src_install() { Link Here
452
457
453
	doexe out/Release/chromedriver || die
458
	doexe out/Release/chromedriver || die
454
459
455
	if ! use arm; then
460
	if use nacl; then
456
		doexe out/Release/nacl_helper{,_bootstrap} || die
461
		doexe out/Release/nacl_helper{,_bootstrap} || die
457
		insinto "${CHROMIUM_HOME}"
462
		insinto "${CHROMIUM_HOME}"
458
		doins out/Release/nacl_irt_*.nexe || die
463
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-27.0.1453.3.ebuild (-5 / +10 lines)
Lines 20-26 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} Link Here
20
LICENSE="BSD"
20
LICENSE="BSD"
21
SLOT="0"
21
SLOT="0"
22
KEYWORDS="~amd64 ~x86"
22
KEYWORDS="~amd64 ~x86"
23
IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
23
IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
24
24
25
# Native Client binaries are compiled with different set of flags, bug #452066.
25
# Native Client binaries are compiled with different set of flags, bug #452066.
26
QA_FLAGS_IGNORED=".*\.nexe"
26
QA_FLAGS_IGNORED=".*\.nexe"
Lines 75-81 RDEPEND="app-accessibility/speech-dispatcher:= Link Here
75
	)"
75
	)"
76
DEPEND="${RDEPEND}
76
DEPEND="${RDEPEND}
77
	${PYTHON_DEPS}
77
	${PYTHON_DEPS}
78
	!arm? (
78
	nacl? (
79
		>=dev-lang/nacl-toolchain-newlib-0_p9093
79
		>=dev-lang/nacl-toolchain-newlib-0_p9093
80
		dev-lang/yasm
80
		dev-lang/yasm
81
	)
81
	)
Lines 94-99 RDEPEND+=" Link Here
94
	x11-misc/xdg-utils
94
	x11-misc/xdg-utils
95
	virtual/ttf-fonts"
95
	virtual/ttf-fonts"
96
96
97
REQUIRED_USE="
98
	arm? ( !nacl )
99
"
100
97
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
101
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
98
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
102
	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
99
fi
103
fi
Lines 122-128 pkg_setup() { Link Here
122
}
126
}
123
127
124
src_prepare() {
128
src_prepare() {
125
	if ! use arm; then
129
	if use nacl; then
126
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
130
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
127
		# Do not preserve SELinux context, bug #460892 .
131
		# Do not preserve SELinux context, bug #460892 .
128
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
132
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 271-276 src_configure() { Link Here
271
		$(gyp_use gps linux_use_libgps)
275
		$(gyp_use gps linux_use_libgps)
272
		$(gyp_use gps linux_link_libgps)
276
		$(gyp_use gps linux_link_libgps)
273
		$(gyp_use kerberos)
277
		$(gyp_use kerberos)
278
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
274
		$(gyp_use pulseaudio)
279
		$(gyp_use pulseaudio)
275
		$(gyp_use selinux selinux)"
280
		$(gyp_use selinux selinux)"
276
281
Lines 333-339 src_configure() { Link Here
333
			-Dsysroot=
338
			-Dsysroot=
334
			-Darmv7=0
339
			-Darmv7=0
335
			-Darm_neon=0
340
			-Darm_neon=0
336
			-Ddisable_nacl=1"
341
			"
337
	else
342
	else
338
		die "Failed to determine target arch, got '$myarch'."
343
		die "Failed to determine target arch, got '$myarch'."
339
	fi
344
	fi
Lines 455-461 src_install() { Link Here
455
460
456
	doexe out/Release/chromedriver || die
461
	doexe out/Release/chromedriver || die
457
462
458
	if ! use arm; then
463
	if use nacl; then
459
		doexe out/Release/nacl_helper{,_bootstrap} || die
464
		doexe out/Release/nacl_helper{,_bootstrap} || die
460
		insinto "${CHROMIUM_HOME}"
465
		insinto "${CHROMIUM_HOME}"
461
		doins out/Release/nacl_irt_*.nexe || die
466
		doins out/Release/nacl_irt_*.nexe || die
(-)a/chromium-9999-r1.ebuild (-5 / +10 lines)
Lines 19-25 ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src" Link Here
19
LICENSE="BSD"
19
LICENSE="BSD"
20
SLOT="live"
20
SLOT="live"
21
KEYWORDS=""
21
KEYWORDS=""
22
IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
22
IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
23
23
24
# Native Client binaries are compiled with different set of flags, bug #452066.
24
# Native Client binaries are compiled with different set of flags, bug #452066.
25
QA_FLAGS_IGNORED=".*\.nexe"
25
QA_FLAGS_IGNORED=".*\.nexe"
Lines 74-80 RDEPEND="app-accessibility/speech-dispatcher:= Link Here
74
	)"
74
	)"
75
DEPEND="${RDEPEND}
75
DEPEND="${RDEPEND}
76
	${PYTHON_DEPS}
76
	${PYTHON_DEPS}
77
	!arm? (
77
	nacl? (
78
		>=dev-lang/nacl-toolchain-newlib-0_p9093
78
		>=dev-lang/nacl-toolchain-newlib-0_p9093
79
		dev-lang/yasm
79
		dev-lang/yasm
80
	)
80
	)
Lines 93-98 RDEPEND+=" Link Here
93
	x11-misc/xdg-utils
93
	x11-misc/xdg-utils
94
	virtual/ttf-fonts"
94
	virtual/ttf-fonts"
95
95
96
REQUIRED_USE="
97
	arm? ( !nacl )
98
"
99
96
gclient_config() {
100
gclient_config() {
97
	einfo "gclient config -->"
101
	einfo "gclient config -->"
98
	# Allow the user to keep their config if they know what they are doing.
102
	# Allow the user to keep their config if they know what they are doing.
Lines 179-185 pkg_setup() { Link Here
179
}
183
}
180
184
181
src_prepare() {
185
src_prepare() {
182
	if ! use arm; then
186
	if use nacl; then
183
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
187
		mkdir -p out/Release/obj/gen/sdk/toolchain || die
184
		# Do not preserve SELinux context, bug #460892 .
188
		# Do not preserve SELinux context, bug #460892 .
185
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
189
		cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
Lines 325-330 src_configure() { Link Here
325
		$(gyp_use gps linux_use_libgps)
329
		$(gyp_use gps linux_use_libgps)
326
		$(gyp_use gps linux_link_libgps)
330
		$(gyp_use gps linux_link_libgps)
327
		$(gyp_use kerberos)
331
		$(gyp_use kerberos)
332
		$(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
328
		$(gyp_use pulseaudio)
333
		$(gyp_use pulseaudio)
329
		$(gyp_use selinux selinux)"
334
		$(gyp_use selinux selinux)"
330
335
Lines 387-393 src_configure() { Link Here
387
			-Dsysroot=
392
			-Dsysroot=
388
			-Darmv7=0
393
			-Darmv7=0
389
			-Darm_neon=0
394
			-Darm_neon=0
390
			-Ddisable_nacl=1"
395
			"
391
	else
396
	else
392
		die "Failed to determine target arch, got '$myarch'."
397
		die "Failed to determine target arch, got '$myarch'."
393
	fi
398
	fi
Lines 509-515 src_install() { Link Here
509
514
510
	doexe out/Release/chromedriver || die
515
	doexe out/Release/chromedriver || die
511
516
512
	if ! use arm; then
517
	if use nacl; then
513
		doexe out/Release/nacl_helper{,_bootstrap} || die
518
		doexe out/Release/nacl_helper{,_bootstrap} || die
514
		insinto "${CHROMIUM_HOME}"
519
		insinto "${CHROMIUM_HOME}"
515
		doins out/Release/nacl_irt_*.nexe || die
520
		doins out/Release/nacl_irt_*.nexe || die
(-)a/metadata.xml (+1 lines)
Lines 5-10 Link Here
5
	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
5
	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
6
	<use>
6
	<use>
7
		<flag name="bindist">Disable patent-encumbered HTML5 video codecs</flag>
7
		<flag name="bindist">Disable patent-encumbered HTML5 video codecs</flag>
8
		<flag name="nacl">Enable Google Native Client support</flag>
8
		<flag name="system-ffmpeg">Use system ffmpeg instead of bundled ffmpeg.</flag>
9
		<flag name="system-ffmpeg">Use system ffmpeg instead of bundled ffmpeg.</flag>
9
		<flag name="system-sqlite">
10
		<flag name="system-sqlite">
10
			Use system sqlite instead of bundled sqlite. This breaks WebSQL on websites,
11
			Use system sqlite instead of bundled sqlite. This breaks WebSQL on websites,

Return to bug 392347