5 files changed, 22 insertions, 64 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index d726b3620295..1f09cbd9ca77 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -24,54 +24,6 @@ _QMAKE_UTILS_ECLASS=1
 
 inherit toolchain-funcs
 
-# @FUNCTION: _qmake-utils_banned_func
-# @INTERNAL
-# @DESCRIPTION:
-# Banned functions are banned.
-_qmake-utils_banned_func() {
-	die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-}
-
-# @FUNCTION: qt4_get_bindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_bindir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_headerdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_headerdir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_libdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_libdir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_mkspecsdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_mkspecsdir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_plugindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_plugindir() {
-	_qmake-utils_banned_func
-}
-
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
@@ -108,22 +60,6 @@ qt5_get_plugindir() {
 	echo $(qt5_get_libdir)/qt5/plugins
 }
 
-# @FUNCTION: qmake-utils_find_pro_file
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qmake-utils_find_pro_file() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: eqmake4
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-eqmake4() {
-	_qmake-utils_banned_func
-}
-
 # @FUNCTION: eqmake5
 # @USAGE: [arguments for qmake]
 # @DESCRIPTION:
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 845b9573adfb..0171a016d3c9 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,6 +1,10 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Mask in favor of opentmpfiles until usable on selinux profiles (bug #801217)
+sys-apps/systemd-tmpfiles
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-04-06)
 # depends on sys-apps/systemd
 kde-plasma/plasma-firewall
diff --git a/profiles/features/selinux/package.unmask b/profiles/features/selinux/package.unmask
new file mode 100644
index 000000000000..c2fdcbc1d358
--- /dev/null
+++ b/profiles/features/selinux/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Unmask opentmpfiles on selinux profiles until systemd-tmpfiles is
+# usable (bug #801217). Lower bound to keep 0.3.1 mask active.
+<sys-apps/opentmpfiles-0.3.1
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index c81f0fe19e48..fe51d352f2f1 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,10 @@ sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
+sys-apps/systemd-tmpfiles
+
 # David Seifert <soap@gentoo.org> (2021-02-08)
 # nvidia-drivers only works against glibc.
 x11-drivers/nvidia-drivers
diff --git a/profiles/features/uclibc/package.unmask b/profiles/features/uclibc/package.unmask
new file mode 100644
index 000000000000..3c4392737b2e
--- /dev/null
+++ b/profiles/features/uclibc/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Unmask opentmpfiles on uclibc profiles until systemd-tmpfiles is
+# usable (bug #801106). Lower bound to keep 0.3.1 mask active.
+<sys-apps/opentmpfiles-0.3.1