profiles: hardened/linux/musl inherits from default/linux/musl

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

50 files changed, 11 insertions, 543 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
diff --git a/profiles/hardened/linux/musl/arm/armv7a/make.defaults b/profiles/hardened/linux/musl/arm/armv7a/make.defaults
deleted file mode 100644
index c680f6aa2e5a..000000000000
--- a/profiles/hardened/linux/musl/arm/armv7a/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="armv7a-hardfloat-linux-musleabi"
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/musl/arm/armv7a/parent b/profiles/hardened/linux/musl/arm/armv7a/parent
index f3229c5b9876..4be939d87ce7 100644
--- a/profiles/hardened/linux/musl/arm/armv7a/parent
+++ b/profiles/hardened/linux/musl/arm/armv7a/parent
@@ -1 +1,3 @@
+../../../../../default/linux/musl/arm/armv7a
 ..
+../..
diff --git a/profiles/hardened/linux/musl/arm/make.defaults b/profiles/hardened/linux/musl/arm/make.defaults
deleted file mode 100644
index e0e4051efde6..000000000000
--- a/profiles/hardened/linux/musl/arm/make.defaults
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="arm"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="arm-unknown-linux-musleabi"
-CFLAGS="-O2"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (25 Oct 2015)
-# Multilib-related setup, bug #515130
-ABI="arm"
-DEFAULT_ABI="arm"
-MULTILIB_ABIS="arm"
-CHOST_arm="${CHOST}"
-LIBDIR_arm="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/hardened/linux/musl/arm/package.use.force b/profiles/hardened/linux/musl/arm/package.use.force
deleted file mode 100644
index b92b1029f52a..000000000000
--- a/profiles/hardened/linux/musl/arm/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_ARM
-sys-devel/llvm llvm_targets_ARM
diff --git a/profiles/hardened/linux/musl/arm/parent b/profiles/hardened/linux/musl/arm/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/hardened/linux/musl/arm/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/hardened/linux/musl/arm/use.force b/profiles/hardened/linux/musl/arm/use.force
deleted file mode 100644
index 11e95dae7631..000000000000
--- a/profiles/hardened/linux/musl/arm/use.force
+++ /dev/null
@@ -1,5 +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.
-arm
diff --git a/profiles/hardened/linux/musl/arm/use.mask b/profiles/hardened/linux/musl/arm/use.mask
deleted file mode 100644
index 8dffd62b8e39..000000000000
--- a/profiles/hardened/linux/musl/arm/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm
diff --git a/profiles/hardened/linux/musl/arm64/make.defaults b/profiles/hardened/linux/musl/arm64/make.defaults
deleted file mode 100644
index d9ba618fa184..000000000000
--- a/profiles/hardened/linux/musl/arm64/make.defaults
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/hardened/linux/musl/arm64/package.use.force b/profiles/hardened/linux/musl/arm64/package.use.force
deleted file mode 100644
index d90dd06eaf22..000000000000
--- a/profiles/hardened/linux/musl/arm64/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_AArch64
-sys-devel/llvm llvm_targets_AArch64
diff --git a/profiles/hardened/linux/musl/arm64/parent b/profiles/hardened/linux/musl/arm64/parent
index f3229c5b9876..f687b3f5f7c4 100644
--- a/profiles/hardened/linux/musl/arm64/parent
+++ b/profiles/hardened/linux/musl/arm64/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/arm64
 ..
diff --git a/profiles/hardened/linux/musl/arm64/use.force b/profiles/hardened/linux/musl/arm64/use.force
deleted file mode 100644
index 1fa2eca30677..000000000000
--- a/profiles/hardened/linux/musl/arm64/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to ARCH.
-arm64
diff --git a/profiles/hardened/linux/musl/arm64/use.mask b/profiles/hardened/linux/musl/arm64/use.mask
deleted file mode 100644
index 04a2bed3cacf..000000000000
--- a/profiles/hardened/linux/musl/arm64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to ARCH.
--arm64
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
index 518c214765bc..1212f635f54f 100644
--- a/profiles/hardened/linux/musl/make.defaults
+++ b/profiles/hardened/linux/musl/make.defaults
@@ -1,15 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="hardened nptl pic unicode -berkdb -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pic -berkdb -jit -nls -orc"
-
-SYMLINK_LIB="no"
-
-# TODO: fix so musl doesn't generate this for all packages
-# that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias"
+USE="${USE} hardened pic -jit -orc"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/hardened/linux/musl/mips/make.defaults b/profiles/hardened/linux/musl/mips/make.defaults
deleted file mode 100644
index 06fe764dc9f5..000000000000
--- a/profiles/hardened/linux/musl/mips/make.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="mips"
-ACCEPT_KEYWORDS="${ARCH} ~${ARCH}"
-
-CHOST="mips-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="o32"
-DEFAULT_ABI="o32"
-MULTILIB_ABIS="o32"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
-IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/hardened/linux/musl/mips/mipsel/make.defaults b/profiles/hardened/linux/musl/mips/mipsel/make.defaults
deleted file mode 100644
index dce419912712..000000000000
--- a/profiles/hardened/linux/musl/mips/mipsel/make.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-
-# Disable sandbox because its currently broken on mipsel-musl
-FEATURES="-sandbox"
-
diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
index f3229c5b9876..c3e31b297154 100644
--- a/profiles/hardened/linux/musl/mips/mipsel/parent
+++ b/profiles/hardened/linux/musl/mips/mipsel/parent
@@ -1 +1,2 @@
+../../../../../default/linux/musl/mips/mipsel
 ..
diff --git a/profiles/hardened/linux/musl/mips/package.mask b/profiles/hardened/linux/musl/mips/package.mask
deleted file mode 100644
index 8b52dc4d8d35..000000000000
--- a/profiles/hardened/linux/musl/mips/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-dev-util/pkgconfig
->sys-apps/kbd-1.15.5-r99
diff --git a/profiles/hardened/linux/musl/mips/package.use.force b/profiles/hardened/linux/musl/mips/package.use.force
deleted file mode 100644
index c184bfa93060..000000000000
--- a/profiles/hardened/linux/musl/mips/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips
-
-# The only working option
-dev-util/pkgconf pkg-config
diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
index f3229c5b9876..506bb45139d0 100644
--- a/profiles/hardened/linux/musl/mips/parent
+++ b/profiles/hardened/linux/musl/mips/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/mips
 ..
diff --git a/profiles/hardened/linux/musl/mips/use.force b/profiles/hardened/linux/musl/mips/use.force
deleted file mode 100644
index e94d30137368..000000000000
--- a/profiles/hardened/linux/musl/mips/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
-mips
-abi_mips_o32
diff --git a/profiles/hardened/linux/musl/mips/use.mask b/profiles/hardened/linux/musl/mips/use.mask
deleted file mode 100644
index b285b3b4746e..000000000000
--- a/profiles/hardened/linux/musl/mips/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to arch/abi, bug #515130
--mips
--abi_mips_o32
diff --git a/profiles/hardened/linux/musl/package.mask b/profiles/hardened/linux/musl/package.mask
deleted file mode 100644
index c4367eb84875..000000000000
--- a/profiles/hardened/linux/musl/package.mask
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/uclibc
-sys-libs/uclibc-ng
-sys-libs/glibc
-
-# Older versions of net-mail/mailutils fail on musl, bug #604212
-<net-mail/mailutils-3.2
-
-# We use eudev which is tested on both uclibc and musl
-sys-apps/systemd
-sys-fs/udev
-
-# dev-libs/elfutils needs a port to musl, bug #602126
-dev-libs/elfutils
-
-# packages that unconditionally depend on dev-libs/elfutils
-<net-firewall/fwbuilder-5.3.7
-
-# packages that need masked packages or multilib
-dev-games/gtkradiant
-dev-games/ps2-packer
-games-action/beathazardultra
-games-action/brutal-legend
-games-action/descent3
-games-action/descent3-demo
-games-action/heretic2-demo
-games-action/hotline-miami
-games-action/intrusion2
-games-action/rune
-games-action/shadowgrounds-bin
-games-action/shadowgrounds-survivor-bin
-games-action/solar2
-games-action/spacetripper-demo
-games-action/swordandsworcery
-games-action/trine-bin
-games-action/trine2
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/dynamitejack
-games-arcade/jardinains
-games-arcade/marbleblastgold-demo
-games-arcade/thinktanks-demo
-games-emulation/nestra
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/enemy-territory
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-truecombat
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2mp-demo
-games-fps/quake3-bin
-games-fps/quake3-demo
-games-fps/rtcwmp-demo
-games-fps/rtcwsp-demo
-games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
-games-fps/transfusion-bin
-games-fps/tribes2
-games-fps/ut2003
-games-fps/ut2003-bonuspack-cm
-games-fps/ut2003-bonuspack-de
-games-fps/ut2003-bonuspack-epic
-games-fps/ut2003-demo
-games-fps/ut2004
-games-fps/ut2004-action
-games-fps/ut2004-airbuccaneers
-games-fps/ut2004-bonuspack-cbp1
-games-fps/ut2004-bonuspack-cbp2
-games-fps/ut2004-bonuspack-ece
-games-fps/ut2004-bonuspack-mega
-games-fps/ut2004-cor
-games-fps/ut2004-crossfire
-games-fps/ut2004-data
-games-fps/ut2004-deathball
-games-fps/ut2004-demo
-games-fps/ut2004-fragops
-games-fps/ut2004-hamsterbash
-games-fps/ut2004-muralis
-games-fps/ut2004-strikeforce
-games-fps/ut2004-troopers
-games-fps/ut2004-unwheel
-games-kids/crayon-physics
-games-misc/little-inferno
-games-misc/papers-please
-games-puzzle/hoh-bin
-games-puzzle/world-of-goo
-games-puzzle/world-of-goo-demo
-games-roguelike/adom
-games-rpg/dear-esther
-games-rpg/dungeon-defenders
-games-rpg/eschalon-book-1-demo
-games-rpg/penumbra-collection
-games-rpg/wasteland2
-games-server/etqw-ded
-games-server/ut2004-ded
-games-simulation/bcs-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/defcon-demo
-games-strategy/dominions2
-games-strategy/knights-demo
-games-strategy/majesty-demo
-media-video/binkplayer
-
-# Ian Stakenvicius, 2017-06-14
-# on behalf of mozilla@gentoo.org
-# Mask firefox-54 and above as it requires rust
-# now, and rust reportedly will not build yet.
->=www-client/firefox-54.0
diff --git a/profiles/hardened/linux/musl/package.use b/profiles/hardened/linux/musl/package.use
deleted file mode 100644
index 2d99b60f76b4..000000000000
--- a/profiles/hardened/linux/musl/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (14 Jul 2016)
-# We need this to break a circular dependency with
-# 'sys-libs/libcap pam' in stage3 catalyst builds
-sys-libs/pam -filecaps
diff --git a/profiles/hardened/linux/musl/package.use.force b/profiles/hardened/linux/musl/package.use.force
deleted file mode 100644
index 8122d90a6c88..000000000000
--- a/profiles/hardened/linux/musl/package.use.force
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Force system-libevent use flag on mozilla packages, since the building of
-# bundled libevent cannot accomodate a system without sysctl.h
-# See bug 574830 for more info.
->=www-client/firefox-45.0 system-libevent
->=www-client/seamonkey-2.40 system-libevent
->=mail-client/thunderbird-45.0 system-libevent
diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
index d66f247717f5..fe62de6696a8 100644
--- a/profiles/hardened/linux/musl/package.use.mask
+++ b/profiles/hardened/linux/musl/package.use.mask
@@ -4,21 +4,3 @@
 # Matthias Maier <tamiko@genoto.org> (11 May 2017)
 # masked in base, unmask for hardened/musl/
 sys-devel/gcc -pie
-
-# See bug #504200
-sys-devel/gcc sanitize
-
-# llvm's sanitizers are also incompatible with musl
-sys-devel/llvm sanitize
-
-# These cause collisions with <libintl.h>
-# even with --without-included-gettext
-sys-devel/gettext nls
-sys-fs/e2fsprogs nls
-
-# Broken
-dev-vcs/git gpg
-
-# See bug #576928
-media-libs/mesa nptl
-x11-base/xorg-server nptl
diff --git a/profiles/hardened/linux/musl/packages b/profiles/hardened/linux/musl/packages
deleted file mode 100644
index 8e9700f13e8f..000000000000
--- a/profiles/hardened/linux/musl/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-*app-misc/pax-utils
-*sys-apps/sandbox
--*sys-apps/man-pages
diff --git a/profiles/hardened/linux/musl/packages.build b/profiles/hardened/linux/musl/packages.build
deleted file mode 100644
index c07961aa76f7..000000000000
--- a/profiles/hardened/linux/musl/packages.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-util/pkgconf
-sys-apps/attr
-sys-apps/sandbox
-dev-python/pyxattr
diff --git a/profiles/hardened/linux/musl/parent b/profiles/hardened/linux/musl/parent
deleted file mode 100644
index a9dd6fd5cb5b..000000000000
--- a/profiles/hardened/linux/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../arch/base
-../../../base
-../../../default/linux
diff --git a/profiles/hardened/linux/musl/ppc/make.defaults b/profiles/hardened/linux/musl/ppc/make.defaults
deleted file mode 100644
index 2022413f04a2..000000000000
--- a/profiles/hardened/linux/musl/ppc/make.defaults
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="powerpc-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ABI="ppc"
-DEFAULT_ABI="ppc"
-MULTILIB_ABIS="ppc"
-CHOST_ppc="${CHOST}"
-LIBDIR_ppc="lib"
-IUSE_IMPLICIT="abi_ppc_32"
diff --git a/profiles/hardened/linux/musl/ppc/package.mask b/profiles/hardened/linux/musl/ppc/package.mask
deleted file mode 100644
index 56345622fa74..000000000000
--- a/profiles/hardened/linux/musl/ppc/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# gcc-4.8 still doesn't work on ppc musl
->sys-devel/gcc-4.8
diff --git a/profiles/hardened/linux/musl/ppc/package.use.force b/profiles/hardened/linux/musl/ppc/package.use.force
deleted file mode 100644
index e18275fe8cd6..000000000000
--- a/profiles/hardened/linux/musl/ppc/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_PowerPC
-sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/hardened/linux/musl/ppc/parent b/profiles/hardened/linux/musl/ppc/parent
index f3229c5b9876..08b096c5a3e0 100644
--- a/profiles/hardened/linux/musl/ppc/parent
+++ b/profiles/hardened/linux/musl/ppc/parent
@@ -1 +1,2 @@
+../../../../default/linux/musl/ppc
 ..
diff --git a/profiles/hardened/linux/musl/ppc/use.force b/profiles/hardened/linux/musl/ppc/use.force
deleted file mode 100644
index f4c29429b272..000000000000
--- a/profiles/hardened/linux/musl/ppc/use.force
+++ /dev/null
@@ -1,8 +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.
-ppc
-
-# Force the flag corresponding to the only ABI.
-abi_ppc_32
diff --git a/profiles/hardened/linux/musl/ppc/use.mask b/profiles/hardened/linux/musl/ppc/use.mask
deleted file mode 100644
index e1f5512c8bb0..000000000000
--- a/profiles/hardened/linux/musl/ppc/use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Unmask the flag which corresponds to ARCH.
--ppc
-
-# Unmask the flag corresponding to the only ABI.
--abi_ppc_32
diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults
deleted file mode 100644
index 73fedb030e1d..000000000000
--- a/profiles/hardened/linux/musl/x86/make.defaults
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86"
-ACCEPT_KEYWORDS="${ARCH}"
-
-CHOST="i686-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="x86"
-DEFAULT_ABI="x86"
-MULTILIB_ABIS="x86"
-CHOST_x86="${CHOST}"
-LIBDIR_x86="lib"
-IUSE_IMPLICIT="abi_x86_32"
-
-# 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/x86/package.use.force b/profiles/hardened/linux/musl/x86/package.use.force
deleted file mode 100644
index ca264fedc8ce..000000000000
--- a/profiles/hardened/linux/musl/x86/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/x86/parent b/profiles/hardened/linux/musl/x86/parent
index f3229c5b9876..54abcade7471 100644
--- a/profiles/hardened/linux/musl/x86/parent
+++ b/profiles/hardened/linux/musl/x86/parent
@@ -1 +1,2 @@
+../../../../default/linux/uclibc/x86
 ..
diff --git a/profiles/hardened/linux/musl/x86/use.force b/profiles/hardened/linux/musl/x86/use.force
deleted file mode 100644
index eb8c5dfc7f70..000000000000
--- a/profiles/hardened/linux/musl/x86/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
-x86
-abi_x86_32
diff --git a/profiles/hardened/linux/musl/x86/use.mask b/profiles/hardened/linux/musl/x86/use.mask
deleted file mode 100644
index 61e5564be9fc..000000000000
--- a/profiles/hardened/linux/musl/x86/use.mask
+++ /dev/null
@@ -1,33 +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
--x86
--abi_x86_32
-
-# ssp is broken on x86 musl.  This is critical for gcc-6.
-ssp
-
-# 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
-
-# Masked on all profiles but x86, bug #458354
--video_cards_geode