Merge branch 'edge' into next

8 files changed, 5 insertions, 13 deletions

diff --git a/profiles/features/hardened/amd64/package.use b/profiles/features/hardened/amd64/package.use
index 944deb8d886c..bc50e9c21e40 100644
--- a/profiles/features/hardened/amd64/package.use
+++ b/profiles/features/hardened/amd64/package.use
@@ -6,7 +6,5 @@
 # Bugs 358929, 490276, 513464, 523736 and 512208.
 media-libs/x264 pic
 media-video/ffmpeg pic
-media-video/libav pic
 media-libs/mesa pic
-media-libs/libpostproc pic
 media-libs/xvid pic
diff --git a/profiles/features/hardened/package.mask b/profiles/features/hardened/package.mask
index af6a869977fc..c5d117e47c24 100644
--- a/profiles/features/hardened/package.mask
+++ b/profiles/features/hardened/package.mask
@@ -1,9 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-# We need newer then glibc 2.24
-<sys-libs/glibc-2.25
-
 # broken on hardened, use sys-apps/elfix to fix gnustack
 sys-devel/prelink
 # depends on prelink
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index c4c7bc96159e..27d5c51ebf9f 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -51,6 +51,8 @@ sys-boot/systemd-boot
 
 # rust-bin requires a glibc system
 dev-lang/rust-bin
+mail-client/thunderbird-bin
+www-client/firefox-bin
 
 # Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
 #  No source builds for musl
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 3e8e86a01b67..bdf59a5b1484 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -21,9 +21,5 @@ sys-fs/e2fsprogs nls
 # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
 app-shells/bash mem-scramble
 
-# lto builds are known to cause an OOM issue during build.
-mail-client/thunderbird lto
-www-client/firefox lto
-
 # static linking works with musl
 app-shells/mksh -static
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
deleted file mode 100644
index 83862097866b..000000000000
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ /dev/null
@@ -1 +0,0 @@
-# >=python-3 is masked
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/use.force b/profiles/features/prefix/standalone/kernel-2.6.32+/use.force
new file mode 100644
index 000000000000..45cddcc00fa1
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/use.force
@@ -0,0 +1 @@
+old-kernel
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 49293adb98d1..bef26cfd012f 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -48,10 +48,10 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]
     fi
     [[ -n "${f}" ]] && sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${f}"
     eend $?
-elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then
+elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then
     cd "${S}"
     einfo "Prefixifying hardcoded path"
-    
+
     for f in libio/iopopen.c \
 		 shadow/lckpwdf.c resolv/{netdb,resolv}.h elf/rtld.c \
 		 nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 9f0f0f4923e9..ebfb091bb2d6 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -20,7 +20,6 @@ www-servers/uwsgi uwsgi_plugins_systemd_logger
 >=x11-wm/mutter-3.22 wayland
 x11-misc/xscreensaver gdm
 app-misc/workrave gnome
-net-misc/wicd gnome-shell
 x11-misc/gpaste gnome
 x11-terms/gnome-terminal gnome-shell
 x11-themes/arc-theme gnome-shell