--- a/chromium-25.0.1364.160.ebuild
+++ a/chromium-25.0.1364.160.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
RDEPEND="app-accessibility/speech-dispatcher
app-arch/bzip2
@@ -64,7 +64,7 @@ RDEPEND="app-accessibility/speech-dispatcher
sys-libs/libselinux
)"
DEPEND="${RDEPEND}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -83,6 +83,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -115,7 +119,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
ebegin "Preparing NaCl newlib toolchain"
pushd "${T}" >/dev/null || die
mkdir sdk || die
@@ -147,6 +151,7 @@ src_prepare() {
die "tarball fixed, please remove workaround"
fi
+ if use nacl; then
mkdir -p chrome/test/data/nacl
cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
{
@@ -158,6 +163,7 @@ src_prepare() {
],
}
EOF
+ fi
epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
@@ -286,6 +292,7 @@ src_configure() {
$(gyp_use gnome-keyring use_gnome_keyring)
$(gyp_use gnome-keyring linux_link_gnome_keyring)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -335,7 +342,7 @@ src_configure() {
myconf+=" -Dtarget_arch=arm
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -449,7 +456,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-25.0.1364.172.ebuild
+++ a/chromium-25.0.1364.172.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
RDEPEND="app-accessibility/speech-dispatcher
app-arch/bzip2
@@ -64,7 +64,7 @@ RDEPEND="app-accessibility/speech-dispatcher
sys-libs/libselinux
)"
DEPEND="${RDEPEND}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -83,6 +83,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -115,7 +119,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
ebegin "Preparing NaCl newlib toolchain"
pushd "${T}" >/dev/null || die
mkdir sdk || die
@@ -147,6 +151,7 @@ src_prepare() {
die "tarball fixed, please remove workaround"
fi
+ if use nacl; then
mkdir -p chrome/test/data/nacl
cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF
{
@@ -158,6 +163,7 @@ src_prepare() {
],
}
EOF
+ fi
epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch"
@@ -289,6 +295,7 @@ src_configure() {
$(gyp_use gnome-keyring use_gnome_keyring)
$(gyp_use gnome-keyring linux_link_gnome_keyring)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -338,7 +345,7 @@ src_configure() {
myconf+=" -Dtarget_arch=arm
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -452,7 +459,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-26.0.1410.33-r1.ebuild
+++ a/chromium-26.0.1410.33-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -73,7 +73,7 @@ RDEPEND="app-accessibility/speech-dispatcher
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -92,6 +92,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -120,7 +124,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -273,6 +277,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -326,7 +331,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -447,7 +452,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-26.0.1410.33.ebuild
+++ a/chromium-26.0.1410.33.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -73,7 +73,7 @@ RDEPEND="app-accessibility/speech-dispatcher
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -92,6 +92,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -120,7 +124,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -269,6 +273,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -322,7 +327,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -443,7 +448,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-26.0.1410.40.ebuild
+++ a/chromium-26.0.1410.40.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -73,7 +73,7 @@ RDEPEND="app-accessibility/speech-dispatcher
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -92,6 +92,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -120,7 +124,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -273,6 +277,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -326,7 +331,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -447,7 +452,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-26.0.1410.43.ebuild
+++ a/chromium-26.0.1410.43.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
+IUSE="bindist cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-ffmpeg tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -73,7 +73,7 @@ RDEPEND="app-accessibility/speech-dispatcher
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -92,6 +92,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -120,7 +124,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -273,6 +277,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -326,7 +331,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -447,7 +452,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-27.0.1448.0.ebuild
+++ a/chromium-27.0.1448.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -75,7 +75,7 @@ RDEPEND="app-accessibility/speech-dispatcher:=
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -94,6 +94,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -122,7 +126,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -268,6 +272,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -330,7 +335,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -452,7 +457,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-27.0.1453.3.ebuild
+++ a/chromium-27.0.1453.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -75,7 +75,7 @@ RDEPEND="app-accessibility/speech-dispatcher:=
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -94,6 +94,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -122,7 +126,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -271,6 +275,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -333,7 +338,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -455,7 +460,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/chromium-9999-r1.ebuild
+++ a/chromium-9999-r1.ebuild
@@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src"
LICENSE="BSD"
SLOT="live"
KEYWORDS=""
-IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux system-sqlite tcmalloc"
+IUSE="cups gnome gnome-keyring gps kerberos +nacl pulseaudio selinux system-sqlite tcmalloc"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -74,7 +74,7 @@ RDEPEND="app-accessibility/speech-dispatcher:=
)"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- !arm? (
+ nacl? (
>=dev-lang/nacl-toolchain-newlib-0_p9093
dev-lang/yasm
)
@@ -93,6 +93,10 @@ RDEPEND+="
x11-misc/xdg-utils
virtual/ttf-fonts"
+REQUIRED_USE="
+ arm? ( !nacl )
+"
+
gclient_config() {
einfo "gclient config -->"
# Allow the user to keep their config if they know what they are doing.
@@ -179,7 +183,7 @@ pkg_setup() {
}
src_prepare() {
- if ! use arm; then
+ if use nacl; then
mkdir -p out/Release/obj/gen/sdk/toolchain || die
# Do not preserve SELinux context, bug #460892 .
cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
@@ -325,6 +329,7 @@ src_configure() {
$(gyp_use gps linux_use_libgps)
$(gyp_use gps linux_link_libgps)
$(gyp_use kerberos)
+ $(if use nacl; then echo "-Ddisable_nacl=0"; else echo "-Ddisable_nacl=1"; fi)
$(gyp_use pulseaudio)
$(gyp_use selinux selinux)"
@@ -387,7 +392,7 @@ src_configure() {
-Dsysroot=
-Darmv7=0
-Darm_neon=0
- -Ddisable_nacl=1"
+ "
else
die "Failed to determine target arch, got '$myarch'."
fi
@@ -509,7 +514,7 @@ src_install() {
doexe out/Release/chromedriver || die
- if ! use arm; then
+ if use nacl; then
doexe out/Release/nacl_helper{,_bootstrap} || die
insinto "${CHROMIUM_HOME}"
doins out/Release/nacl_irt_*.nexe || die
--- a/metadata.xml
+++ a/metadata.xml
@@ -5,6 +5,7 @@
Chromium is the open-source web browser project behind Google Chrome