gentoo resync : 24.12.2018

27 files changed, 15 insertions, 36 deletions

diff --git a/profiles/hardened/linux/amd64/deprecated b/profiles/hardened/linux/amd64/deprecated
new file mode 100644
index 000000000000..e6cea706fada
--- /dev/null
+++ b/profiles/hardened/linux/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/hardened
diff --git a/profiles/hardened/linux/amd64/no-multilib/deprecated b/profiles/hardened/linux/amd64/no-multilib/deprecated
new file mode 100644
index 000000000000..41a61f1937b6
--- /dev/null
+++ b/profiles/hardened/linux/amd64/no-multilib/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/hardened
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 85b720dc8ab8..d88978f6c408 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -1,8 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# >=teamviewer-13 is amd64 native application without wine
-<net-misc/teamviewer-13
 # These are broken as reported by Halcy0n, Aug, 23, 2011
 dev-lang/rebol-bin
 
@@ -33,7 +31,6 @@ app-emulation/q4wine
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
 app-emulation/winetricks
-app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
 dev-util/android-sdk-update-manager
diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated b/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
new file mode 100644
index 000000000000..d9f2abb8d832
--- /dev/null
+++ b/profiles/hardened/linux/amd64/no-multilib/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/no-multilib/hardened/selinux
diff --git a/profiles/hardened/linux/amd64/selinux/deprecated b/profiles/hardened/linux/amd64/selinux/deprecated
new file mode 100644
index 000000000000..13191e6977a1
--- /dev/null
+++ b/profiles/hardened/linux/amd64/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/hardened/selinux
diff --git a/profiles/hardened/linux/amd64/x32/deprecated b/profiles/hardened/linux/amd64/x32/deprecated
new file mode 100644
index 000000000000..5cbfaf5838b0
--- /dev/null
+++ b/profiles/hardened/linux/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/profiles/hardened/linux/arm/armv4/eapi b/profiles/hardened/linux/arm/armv4/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv4/parent b/profiles/hardened/linux/arm/armv4/parent
deleted file mode 100644
index 4c317660c403..000000000000
--- a/profiles/hardened/linux/arm/armv4/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv4
-..
diff --git a/profiles/hardened/linux/arm/armv4t/eapi b/profiles/hardened/linux/arm/armv4t/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv4t/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv4t/parent b/profiles/hardened/linux/arm/armv4t/parent
deleted file mode 100644
index c970fcdfaf20..000000000000
--- a/profiles/hardened/linux/arm/armv4t/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv4t
-..
diff --git a/profiles/hardened/linux/arm/armv5te/eapi b/profiles/hardened/linux/arm/armv5te/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv5te/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv5te/parent b/profiles/hardened/linux/arm/armv5te/parent
deleted file mode 100644
index 5f182c779d32..000000000000
--- a/profiles/hardened/linux/arm/armv5te/parent
+++ /dev/null
@@ -1,4 +0,0 @@
-../../../../base
-../../../../default/linux
-../../../../arch/arm/armv5te
-..
diff --git a/profiles/hardened/linux/arm/armv7a/selinux/eapi b/profiles/hardened/linux/arm/armv7a/selinux/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/arm/armv7a/selinux/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/arm/armv7a/selinux/parent b/profiles/hardened/linux/arm/armv7a/selinux/parent
deleted file mode 100644
index 933e67923d1a..000000000000
--- a/profiles/hardened/linux/arm/armv7a/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/selinux
diff --git a/profiles/hardened/linux/musl/amd64/deprecated b/profiles/hardened/linux/musl/amd64/deprecated
new file mode 100644
index 000000000000..075b2b8c9a7b
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/musl/hardened
diff --git a/profiles/hardened/linux/musl/amd64/x32/deprecated b/profiles/hardened/linux/musl/amd64/x32/deprecated
new file mode 100644
index 000000000000..5cbfaf5838b0
--- /dev/null
+++ b/profiles/hardened/linux/musl/amd64/x32/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/profiles/hardened/linux/musl/x86/deprecated b/profiles/hardened/linux/musl/x86/deprecated
new file mode 100644
index 000000000000..5cbfaf5838b0
--- /dev/null
+++ b/profiles/hardened/linux/musl/x86/deprecated
@@ -0,0 +1 @@
+# no successor
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
index 0074f0bf4e56..5641eeb1b34d 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/package.use.mask
@@ -9,7 +9,7 @@ app-office/libreoffice libreoffice_extensions_nlpsolver libreoffice_extensions_s
 # Unresolved dependencies.
 app-admin/conky apcupsd hddtemp xmms2
 app-admin/gkrellm hddtemp
-media-video/ffmpeg celt frei0r
+media-video/ffmpeg frei0r
 media-video/gpac dvb
 media-video/libav frei0r
 x11-base/xorg-drivers video_cards_glint
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
index a075b05100a2..499e2125d213 100644
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/package.use.mask
@@ -4,7 +4,6 @@
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unresolved dependencies.
 app-admin/puppet rrdtool
-media-video/ffmpeg celt
 media-video/gpac dvb
 x11-base/xorg-drivers video_cards_glint
 
@@ -14,6 +13,6 @@ x11-base/xorg-drivers video_cards_glint
 www-servers/nginx nginx_modules_http_lua pcre-jit
 
 # Kacper Kowalik <xarthisius@gentoo.org> (25 Apr 2012)
-# Masking wrt bug 274847 and other unsolved 
+# Masking wrt bug 274847 and other unsolved
 # dependencies
 app-admin/conky apcupsd xmms2 hddtemp
diff --git a/profiles/hardened/linux/powerpc/ppc64/package.use.mask b/profiles/hardened/linux/powerpc/ppc64/package.use.mask
deleted file mode 100644
index 0a7da57f7a4d..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
-# Requires USE=guile that is masked in this profile.
-net-libs/gnutls test-full
diff --git a/profiles/hardened/linux/powerpc/ppc64/use.mask b/profiles/hardened/linux/powerpc/ppc64/use.mask
index 3abb7f43138f..a68fb1d35788 100644
--- a/profiles/hardened/linux/powerpc/ppc64/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/use.mask
@@ -17,7 +17,6 @@ portaudio
 
 # mask mozilla/firefox (bug #108020)
 mozilla
-seamonkey
 
 # Masked p2p for bug #155302 <josejx@gentoo.org>
 p2p
diff --git a/profiles/hardened/linux/uclibc/amd64/deprecated b/profiles/hardened/linux/uclibc/amd64/deprecated
new file mode 100644
index 000000000000..b5528b4811c0
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/amd64/deprecated
@@ -0,0 +1 @@
+default/linux/amd64/17.0/uclibc/hardened
diff --git a/profiles/hardened/linux/uclibc/arm/armv6j/eapi b/profiles/hardened/linux/uclibc/arm/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/arm/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/arm/armv6j/parent b/profiles/hardened/linux/uclibc/arm/armv6j/parent
deleted file mode 100644
index 05328829c80a..000000000000
--- a/profiles/hardened/linux/uclibc/arm/armv6j/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../../../default/linux/uclibc/arm/armv6j
-..
-../..
diff --git a/profiles/hardened/linux/uclibc/x86/deprecated b/profiles/hardened/linux/uclibc/x86/deprecated
new file mode 100644
index 000000000000..a923ebfd48bb
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/uclibc/hardened
diff --git a/profiles/hardened/linux/x86/deprecated b/profiles/hardened/linux/x86/deprecated
new file mode 100644
index 000000000000..2411cb5bd1d5
--- /dev/null
+++ b/profiles/hardened/linux/x86/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/hardened
diff --git a/profiles/hardened/linux/x86/selinux/deprecated b/profiles/hardened/linux/x86/selinux/deprecated
new file mode 100644
index 000000000000..58212ed1f1e2
--- /dev/null
+++ b/profiles/hardened/linux/x86/selinux/deprecated
@@ -0,0 +1 @@
+default/linux/x86/17.0/hardened/selinux