gentoo resync : 17.02.2020

5 files changed, 14 insertions, 6 deletions

diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 7fd5a0f40770..3029d07118b7 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2020 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # Select the correct ELIBC
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
index 808c71a894c3..4b5eef8c610b 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Benda Xu <heroxbd@gentoo.org> (2019-08-20)
@@ -14,7 +14,6 @@ games-util/gamemode
 gnome-extra/gnome-logs
 gnome-extra/gnome-user-share
 gnome-extra/office-runner
-kde-misc/systemd-kcm
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
 sys-process/systemd-cron
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 20a3aff74cf5..49293adb98d1 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -38,8 +38,15 @@ elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]
     sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
 	"${S}"/ld/configure.tgt
     eend $?
+
     ebegin "Prefixifying path to /etc/ld.so.conf"
-    sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${S}"/ld/emultempl/elf32.em
+    local f=
+    if [[ -f "${S}"/ld/emultempl/elf32.em ]]; then
+        f="${S}"/ld/emultempl/elf32.em
+    elif [[ -f "${S}"/ld/ldelf.c ]]; then
+        f="${S}"/ld/ldelf.c
+    fi
+    [[ -n "${f}" ]] && sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${f}"
     eend $?
 elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then
     cd "${S}"
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index c265c0639db4..3bda66d6463d 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,3 +1,6 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 # Göktürk Yüksek <gokturk@gentoo.org> (2016-11-09)
 # On behalf of proxy-maint
 # Mask due to the package requiring systemd
@@ -35,7 +38,6 @@ gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
 gnome-extra/pch-session
-kde-misc/systemd-kcm
 net-firewall/firewalld
 sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
index ef3dd6d4a992..94bf5b5ae184 100644
--- a/profiles/features/uclibc/use.mask
+++ b/profiles/features/uclibc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2020 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # Thomas Deutschmann <whissi@gentoo.org> (2017-01-28)