gentoo resync : 15.12.2017

11 files changed, 2 insertions, 110 deletions

diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults
deleted file mode 100644
index 496becbfe820..000000000000
--- a/profiles/hardened/linux/musl/amd64/make.defaults
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="x86_64-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014)
-# Multilib-related setup, bug #515130
-ABI="amd64"
-DEFAULT_ABI="amd64"
-MULTILIB_ABIS="amd64"
-CHOST_amd64="${CHOST}"
-LIBDIR_amd64="lib"
-IUSE_IMPLICIT="abi_x86_64"
-
-# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
-# Relect these flags from arch/amd64 which we don't inherit
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-
-# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/hardened/linux/musl/amd64/package.mask b/profiles/hardened/linux/musl/amd64/package.mask
deleted file mode 100644
index 2d46a562aced..000000000000
--- a/profiles/hardened/linux/musl/amd64/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Ulrich Müller <ulm@gentoo.org> (18 Mar 2013)
-# Packages that rely on multilib
-=app-editors/emacs-18*
-net-misc/icaclient
diff --git a/profiles/hardened/linux/musl/amd64/package.use.force b/profiles/hardened/linux/musl/amd64/package.use.force
deleted file mode 100644
index ca264fedc8ce..000000000000
--- a/profiles/hardened/linux/musl/amd64/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/hardened/linux/musl/amd64/package.use.mask b/profiles/hardened/linux/musl/amd64/package.use.mask
deleted file mode 100644
index 49830f81047d..000000000000
--- a/profiles/hardened/linux/musl/amd64/package.use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/hardened/linux/musl/amd64/parent b/profiles/hardened/linux/musl/amd64/parent
index f3229c5b9876..e5409d5f56f4 100644
--- a/profiles/hardened/linux/musl/amd64/parent
+++ b/profiles/hardened/linux/musl/amd64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/amd64
 ..
diff --git a/profiles/hardened/linux/musl/amd64/use.force b/profiles/hardened/linux/musl/amd64/use.force
deleted file mode 100644
index 181cb39654fc..000000000000
--- a/profiles/hardened/linux/musl/amd64/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-amd64
-abi_x86_64
diff --git a/profiles/hardened/linux/musl/amd64/use.mask b/profiles/hardened/linux/musl/amd64/use.mask
deleted file mode 100644
index cc3b7ca5f0e3..000000000000
--- a/profiles/hardened/linux/musl/amd64/use.mask
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--amd64
--abi_x86_64
-
-# unmask all SIMD assembler flags
--cpu_flags_x86_3dnow
--cpu_flags_x86_3dnowext
--cpu_flags_x86_aes
--cpu_flags_x86_avx
--cpu_flags_x86_avx2
--cpu_flags_x86_fma3
--cpu_flags_x86_fma4
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_padlock
--cpu_flags_x86_popcnt
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_sse3
--cpu_flags_x86_sse4_1
--cpu_flags_x86_sse4_2
--cpu_flags_x86_sse4a
--cpu_flags_x86_ssse3
--cpu_flags_x86_xop
-
-# Lilo works on amd64
--lilo
-
-# These work
--input_devices_synaptics
--input_devices_wacom
--video_cards_qxl
diff --git a/profiles/hardened/linux/musl/amd64/x32/make.defaults b/profiles/hardened/linux/musl/amd64/x32/make.defaults
deleted file mode 100644
index 88509a6717c0..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="x86_64-gentoo-linux-muslx32"
-
-# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015)
-# Multilib-related setup, bug #515130
-ABI="x32"
-DEFAULT_ABI="x32"
-MULTILIB_ABIS="x32"
-CHOST_x32="${CHOST}"
-LIBDIR_x32="lib"
-IUSE_IMPLICIT="abi_x86_x32"
diff --git a/profiles/hardened/linux/musl/amd64/x32/parent b/profiles/hardened/linux/musl/amd64/x32/parent
index f3229c5b9876..6deffb52fb62 100644
--- a/profiles/hardened/linux/musl/amd64/x32/parent
+++ b/profiles/hardened/linux/musl/amd64/x32/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/amd64/x32
 ..
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.force b/profiles/hardened/linux/musl/amd64/x32/use.force
deleted file mode 100644
index a837531f8a4a..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--abi_x86_64
-abi_x86_x32
diff --git a/profiles/hardened/linux/musl/amd64/x32/use.mask b/profiles/hardened/linux/musl/amd64/x32/use.mask
deleted file mode 100644
index fb16cbe71565..000000000000
--- a/profiles/hardened/linux/musl/amd64/x32/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
--abi_x86_x32
-abi_x86_64