gentoo resync : 28.04.2019

11 files changed, 42 insertions, 7 deletions

diff --git a/profiles/default/linux/arm64/17.0/musl/eapi b/profiles/default/linux/arm64/17.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/musl/hardened/eapi b/profiles/default/linux/arm64/17.0/musl/hardened/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/musl/hardened/parent b/profiles/default/linux/arm64/17.0/musl/hardened/parent
new file mode 100644
index 000000000000..488bf0d8c2c3
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm64
diff --git a/profiles/default/linux/arm64/17.0/musl/make.defaults b/profiles/default/linux/arm64/17.0/musl/make.defaults
new file mode 100644
index 000000000000..d9ba618fa184
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+CHOST="aarch64-gentoo-linux-musl"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
+# Multilib-related setup, bug #515130
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+CHOST_arm64="${CHOST}"
+LIBDIR_arm64="lib"
+
+# Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/default/linux/arm64/17.0/musl/parent b/profiles/default/linux/arm64/17.0/musl/parent
new file mode 100644
index 000000000000..a340ae545671
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl/
diff --git a/profiles/default/linux/arm64/17.0/musl/use.mask b/profiles/default/linux/arm64/17.0/musl/use.mask
new file mode 100644
index 000000000000..e6145791eeca
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/musl/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/profiles/default/linux/musl/arm/armv7a/deprecated b/profiles/default/linux/musl/arm/armv7a/deprecated
new file mode 100644
index 000000000000..2300c15ba6cc
--- /dev/null
+++ b/profiles/default/linux/musl/arm/armv7a/deprecated
@@ -0,0 +1 @@
+default/linux/arm/17.0/musl/armv7a
diff --git a/profiles/default/linux/musl/arm64/deprecated b/profiles/default/linux/musl/arm64/deprecated
new file mode 100644
index 000000000000..fd62fe78077a
--- /dev/null
+++ b/profiles/default/linux/musl/arm64/deprecated
@@ -0,0 +1 @@
+default/linux/arm64/17.0/musl
diff --git a/profiles/default/linux/musl/ppc/deprecated b/profiles/default/linux/musl/ppc/deprecated
new file mode 100644
index 000000000000..47463d6e50fa
--- /dev/null
+++ b/profiles/default/linux/musl/ppc/deprecated
@@ -0,0 +1 @@
+default/linux/powerpc/ppc32/17.0/musl
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 596bcd617ea5..9f49523996e5 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (14 Apr 2019)
+# Masked due to vulnerability in dev-libs/ace
+dev-cpp/xsd ace
+
 # Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
 # This is masked in base/package.use.mask as Linux only.
 sys-auth/consolekit -cgroups
diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask
index 3694a0731d15..5aec6f4b252e 100644
--- a/profiles/default/linux/uclibc/mips/package.use.mask
+++ b/profiles/default/linux/uclibc/mips/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Felix Janda <felix.janda@posteo.de> (24 Sep 2016)
@@ -20,9 +20,3 @@ app-doc/doxygen clang
 # Matthias Maier <tamiko@gentoo.org> (17 Oct 2014)
 # virtual/jre is not keyworded on mips.
 net-print/cups java
-
-# Vicente Olivert Riera <vincent@gentoo.org> (11 Sep 2014)
-# www-client/midori[jit] depends on net-libs/webkit-gtk[jit]
-# which is masked on base/package.use.mask and not unmasked
-# on arch/mips/package.use.mask by "net-libs/webkit-gtk -jit"
-www-client/midori jit