[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/musl/, profiles/arch/mips/, ...

[Sam James]

commit:     6163cd3fa19853dca27519180cc2980f78f52408
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Sep 15 00:00:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 00:05:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6163cd3f

profiles: bring musl on mips into line with 17.0 profiles

This lets us get rid of default/linux/musl/ and hardened/ entirely (the
latter was marked deprecated in January)

Bug: https://bugs.gentoo.org/515694
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/arch/mips/package.use.force               |  6 +-
 profiles/arch/mips/package.use.mask                |  4 ++
 profiles/default/linux/{ => mips/17.0}/musl/eapi   |  0
 .../{musl/mips => mips/17.0/musl/mipsel}/eapi      |  0
 .../mips => mips/17.0/musl}/mipsel/make.defaults   |  6 +-
 .../mips/mipsel => mips/17.0/musl/mipsel/n64}/eapi |  0
 .../linux/mips/17.0/musl/mipsel/n64/make.defaults  |  6 ++
 .../default/linux/mips/17.0/musl/mipsel/n64/parent |  2 +
 .../linux/mips/17.0/musl/mipsel/o32}/eapi          |  0
 .../linux/mips/17.0/musl/mipsel/o32/make.defaults  |  6 ++
 .../default/linux/mips/17.0/musl/mipsel/o32/parent |  2 +
 .../default/linux/mips/17.0/musl/mipsel/parent     |  2 +
 .../musl => default/linux/mips/17.0/musl/n64}/eapi |  0
 .../default/linux/mips/17.0/musl/n64/make.defaults |  6 ++
 profiles/default/linux/mips/17.0/musl/n64/parent   |  2 +
 .../mips => default/linux/mips/17.0/musl/o32}/eapi |  0
 .../default/linux/mips/17.0/musl/o32/make.defaults |  6 ++
 profiles/default/linux/mips/17.0/musl/o32/parent   |  2 +
 .../{musl/mips => mips/17.0/musl}/package.mask     |  2 +-
 profiles/default/linux/mips/17.0/musl/parent       |  3 +
 profiles/default/linux/musl/make.defaults          | 16 -----
 profiles/default/linux/musl/mips/make.defaults     | 20 ------
 profiles/default/linux/musl/mips/mipsel/parent     |  1 -
 profiles/default/linux/musl/mips/package.use.force |  5 --
 profiles/default/linux/musl/mips/parent            |  1 -
 profiles/default/linux/musl/mips/use.force         |  6 --
 profiles/default/linux/musl/mips/use.mask          |  6 --
 profiles/default/linux/musl/package.mask           | 84 ----------------------
 profiles/default/linux/musl/package.use            |  7 --
 profiles/default/linux/musl/package.use.force      |  9 ---
 profiles/default/linux/musl/package.use.mask       | 18 -----
 profiles/default/linux/musl/packages               |  6 --
 profiles/default/linux/musl/packages.build         | 10 ---
 profiles/default/linux/musl/parent                 |  3 -
 profiles/default/linux/musl/use.force              |  5 --
 profiles/default/linux/musl/use.mask               | 10 ---
 profiles/hardened/deprecated                       |  5 --
 profiles/hardened/linux/musl/make.defaults         |  5 --
 profiles/hardened/linux/musl/mips/mipsel/eapi      |  1 -
 profiles/hardened/linux/musl/mips/mipsel/parent    |  2 -
 profiles/hardened/linux/musl/mips/parent           |  2 -
 profiles/hardened/linux/musl/package.use.mask      |  6 --
 profiles/hardened/linux/musl/use.force             |  8 ---
 profiles/hardened/linux/musl/use.mask              | 13 ----
 profiles/profiles.desc                             |  8 +--
 45 files changed, 52 insertions(+), 260 deletions(-)

diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force
index 89f4520ca4eb..bc882ff72538 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@××××××.tk> (2022-09-14)
+# Same as below for rust.
+dev-lang/rust llvm_targets_Mips
+
 # Michał Górny <mgorny@g.o> (2016-09-24)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_Mips

diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index d761e4e458d6..2c2619a4a296 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@××××××.tk> (2022-09-14)
+# Not broken, but better wait on profiles: bug #515694
+dev-lang/rust system-llvm
+
 # Matt Turner <mattst88@g.o> (2022-04-18)
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell

diff --git a/profiles/default/linux/musl/eapi b/profiles/default/linux/mips/17.0/musl/eapi
similarity index 100%
rename from profiles/default/linux/musl/eapi
rename to profiles/default/linux/mips/17.0/musl/eapi

diff --git a/profiles/default/linux/musl/mips/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/eapi
similarity index 100%
rename from profiles/default/linux/musl/mips/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/eapi

diff --git a/profiles/default/linux/musl/mips/mipsel/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
similarity index 60%
rename from profiles/default/linux/musl/mips/mipsel/make.defaults
rename to profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
index dce419912712..53daa27ad9fb 100644
--- a/profiles/default/linux/musl/mips/mipsel/make.defaults
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
@@ -1,9 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 2022 Gentoo Authors
 # 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/default/linux/musl/mips/mipsel/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
similarity index 100%
rename from profiles/default/linux/musl/mips/mipsel/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi

diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..26dbb0e4c1dc
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64el-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"

diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
new file mode 100644
index 000000000000..e92fcf7cbf75
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/n64

diff --git a/profiles/hardened/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
similarity index 100%
rename from profiles/hardened/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi

diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..d0dec15ac7be
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"

diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
new file mode 100644
index 000000000000..85db6caf16e5
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/o32

diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/parent b/profiles/default/linux/mips/17.0/musl/mipsel/parent
new file mode 100644
index 000000000000..f2bcf2737c18
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel

diff --git a/profiles/hardened/linux/musl/eapi b/profiles/default/linux/mips/17.0/musl/n64/eapi
similarity index 100%
rename from profiles/hardened/linux/musl/eapi
rename to profiles/default/linux/mips/17.0/musl/n64/eapi

diff --git a/profiles/default/linux/mips/17.0/musl/n64/make.defaults b/profiles/default/linux/mips/17.0/musl/n64/make.defaults
new file mode 100644
index 000000000000..90dd88675350
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"

diff --git a/profiles/default/linux/mips/17.0/musl/n64/parent b/profiles/default/linux/mips/17.0/musl/n64/parent
new file mode 100644
index 000000000000..0a2e2f270682
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/n64

diff --git a/profiles/hardened/linux/musl/mips/eapi b/profiles/default/linux/mips/17.0/musl/o32/eapi
similarity index 100%
rename from profiles/hardened/linux/musl/mips/eapi
rename to profiles/default/linux/mips/17.0/musl/o32/eapi

diff --git a/profiles/default/linux/mips/17.0/musl/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/o32/make.defaults
new file mode 100644
index 000000000000..4027a830450d
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"

diff --git a/profiles/default/linux/mips/17.0/musl/o32/parent b/profiles/default/linux/mips/17.0/musl/o32/parent
new file mode 100644
index 000000000000..6d4edaa24a38
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/o32

diff --git a/profiles/default/linux/musl/mips/package.mask b/profiles/default/linux/mips/17.0/musl/package.mask
similarity index 71%
rename from profiles/default/linux/musl/mips/package.mask
rename to profiles/default/linux/mips/17.0/musl/package.mask
index b102791cad4a..ee0e90a0fba8 100644
--- a/profiles/default/linux/musl/mips/package.mask
+++ b/profiles/default/linux/mips/17.0/musl/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 >sys-apps/kbd-1.15.5-r99

diff --git a/profiles/default/linux/mips/17.0/musl/parent b/profiles/default/linux/mips/17.0/musl/parent
new file mode 100644
index 000000000000..9ef7663a23b6
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../features/musl
+../../../../../features/wd40

diff --git a/profiles/default/linux/musl/make.defaults b/profiles/default/linux/musl/make.defaults
deleted file mode 100644
index f0116539f6b1..000000000000
--- a/profiles/default/linux/musl/make.defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-PORTAGE_LIBC="musl"
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="nptl unicode -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
-
-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"

diff --git a/profiles/default/linux/musl/mips/make.defaults b/profiles/default/linux/musl/mips/make.defaults
deleted file mode 100644
index f1406ac0ecda..000000000000
--- a/profiles/default/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@g.o> (2014-07-01)
-# 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/default/linux/musl/mips/mipsel/parent b/profiles/default/linux/musl/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/default/linux/musl/mips/package.use.force b/profiles/default/linux/musl/mips/package.use.force
deleted file mode 100644
index 9fc197b1445f..000000000000
--- a/profiles/default/linux/musl/mips/package.use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Michał Górny <mgorny@g.o> (2016-09-24)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Mips
-sys-devel/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips

diff --git a/profiles/default/linux/musl/mips/parent b/profiles/default/linux/musl/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/default/linux/musl/mips/use.force b/profiles/default/linux/musl/mips/use.force
deleted file mode 100644
index e94d30137368..000000000000
--- a/profiles/default/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/default/linux/musl/mips/use.mask b/profiles/default/linux/musl/mips/use.mask
deleted file mode 100644
index b285b3b4746e..000000000000
--- a/profiles/default/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/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
deleted file mode 100644
index 369b436b9733..000000000000
--- a/profiles/default/linux/musl/package.mask
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/glibc
-
-# We use eudev which is tested on musl
-sys-apps/systemd
-sys-fs/udev
-
-# dev-libs/elfutils needs a port to musl, bug #602126
-dev-libs/elfutils
->virtual/libelf-2
-
-# packages that need masked packages or multilib
-dev-games/ps2-packer
-games-action/beathazardultra
-games-action/brutal-legend-gog
-games-action/brutal-legend-hb
-games-action/crimsonland
-games-action/descent3
-games-action/descent3-demo
-games-action/guacamelee
-games-action/heretic2-demo
-games-action/hotline-miami
-games-action/intrusion2
-games-action/shadowgrounds-bin
-games-action/shadowgrounds-survivor-bin
-games-action/solar2
-games-action/swordandsworcery
-games-action/trine
-games-action/trine-enchanted-edition
-games-action/trine2
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/dynamitejack
-games-arcade/jardinains
-games-arcade/thinktanks-demo
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/soldieroffortune
-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-bonuspack-cbp1
-games-fps/ut2004-bonuspack-cbp2
-games-fps/ut2004-bonuspack-ece
-games-fps/ut2004-bonuspack-mega
-games-fps/ut2004-data
-games-fps/ut2004-demo
-games-misc/little-inferno
-games-misc/papers-please
-games-puzzle/world-of-goo-demo
-games-puzzle/world-of-goo-hb
-games-roguelike/adom
-games-roguelike/neon-chrome
-games-rpg/costume-quest
-games-rpg/crosscode
-games-rpg/dear-esther
-games-rpg/dungeon-defenders
-games-rpg/eschalon-book-1-demo
-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
-
-# James Le Cuirot <chewi@g.o> (2022-08-11)
-# Binary package for glibc. Could be built from source but would take ages and
-# isn't worth the maintenance cost.
-dev-libs/nwjs

diff --git a/profiles/default/linux/musl/package.use b/profiles/default/linux/musl/package.use
deleted file mode 100644
index 2220022c5f79..000000000000
--- a/profiles/default/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@g.o> (2016-07-14)
-# 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/default/linux/musl/package.use.force b/profiles/default/linux/musl/package.use.force
deleted file mode 100644
index 8122d90a6c88..000000000000
--- a/profiles/default/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/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
deleted file mode 100644
index f06ca2ec25ae..000000000000
--- a/profiles/default/linux/musl/package.use.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See bug #604542
-net-misc/iputils idn
-
-# See bug #504200
-sys-devel/gcc sanitize
-
-# These cause collisions with <libintl.h>
-# even with --without-included-gettext
-sys-devel/gettext nls
-sys-fs/e2fsprogs nls
-
-# bash-malloc relies on sbrk which is implemented
-# as a fail-only stub in musl. breaks horribly if enabled.
-# bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
-app-shells/bash mem-scramble

diff --git a/profiles/default/linux/musl/packages b/profiles/default/linux/musl/packages
deleted file mode 100644
index 8e9700f13e8f..000000000000
--- a/profiles/default/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/default/linux/musl/packages.build b/profiles/default/linux/musl/packages.build
deleted file mode 100644
index c07961aa76f7..000000000000
--- a/profiles/default/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/default/linux/musl/parent b/profiles/default/linux/musl/parent
deleted file mode 100644
index 2348d8d17b95..000000000000
--- a/profiles/default/linux/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../arch/base
-../../../base
-..

diff --git a/profiles/default/linux/musl/use.force b/profiles/default/linux/musl/use.force
deleted file mode 100644
index cf1d9c0d3ca4..000000000000
--- a/profiles/default/linux/musl/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_musl
-

diff --git a/profiles/default/linux/musl/use.mask b/profiles/default/linux/musl/use.mask
deleted file mode 100644
index ce9f2fcf95c8..000000000000
--- a/profiles/default/linux/musl/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
--elibc_musl
-elibc_glibc
-
-# video cards that work on musl
--video_cards_i915
--video_cards_intel
--video_cards_virtualbox

diff --git a/profiles/hardened/deprecated b/profiles/hardened/deprecated
deleted file mode 100644
index 4c4fb270ad52..000000000000
--- a/profiles/hardened/deprecated
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Note that the hardened/arches profiles have been deprecated in
-favor of the hardened/linux/arches profiles.  Please use a supported
-profile which you can list using "eselect profile list" and select
-with "eselect profile set #".

diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
deleted file mode 100644
index 1212f635f54f..000000000000
--- a/profiles/hardened/linux/musl/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-USE="${USE} hardened pic -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"

diff --git a/profiles/hardened/linux/musl/mips/mipsel/eapi b/profiles/hardened/linux/musl/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/musl/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
deleted file mode 100644
index c3e31b297154..000000000000
--- a/profiles/hardened/linux/musl/mips/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/musl/mips/mipsel
-..

diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
deleted file mode 100644
index 506bb45139d0..000000000000
--- a/profiles/hardened/linux/musl/mips/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/mips
-..

diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
deleted file mode 100644
index ce38400b406e..000000000000
--- a/profiles/hardened/linux/musl/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Matthias Maier <tamiko@××××××.org> (2017-05-11)
-# masked in base, unmask for hardened/musl/
-sys-devel/gcc -pie

diff --git a/profiles/hardened/linux/musl/use.force b/profiles/hardened/linux/musl/use.force
deleted file mode 100644
index e2d7cf05ec5c..000000000000
--- a/profiles/hardened/linux/musl/use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_musl
-
-# Make sure people don't accidentally turn of ssp/pie in important packages.
-pie
-ssp

diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
deleted file mode 100644
index a98fea1d4e7b..000000000000
--- a/profiles/hardened/linux/musl/use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
--elibc_musl
-elibc_glibc
-
--hardened
-
-# precompiled headers are not compat with ASLR.
-pch
-
-# profile are incompatible when linking with pie
-profile

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 228506db4479..d5338d2db472 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -338,10 +338,10 @@ arm		default/linux/arm/17.0/musl/armv7a/hardened/selinux	exp
 arm64		default/linux/arm64/17.0/musl				exp
 arm64		default/linux/arm64/17.0/musl/hardened			exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux		exp
-mips		default/linux/musl/mips					exp
-mips		hardened/linux/musl/mips				exp
-mips		default/linux/musl/mips/mipsel				exp
-mips		hardened/linux/musl/mips/mipsel				exp
+mips		default/linux/mips/17.0/musl/o32			exp
+mips		default/linux/mips/17.0/musl/n64			exp
+mips		default/linux/mips/17.0/musl/mipsel/o32			exp
+mips		default/linux/mips/17.0/musl/mipsel/n64			exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		exp
 x86		default/linux/x86/17.0/musl				exp