gentoo resync : 15.01.2020

6 files changed, 16 insertions, 14 deletions

diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index a6ebbb5f4d44..7fd5a0f40770 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -9,3 +9,6 @@ elibc_glibc
 # Musl doesn't have support for utmp/wtmp by design
 utmp
 wtmp
+
+# sys-apps/systemd is masked
+systemd
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
index e8e0ce1eaeac..2881aa37fc7b 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -17,7 +17,3 @@ ac_cv_func_pipe2=no
 ac_cv_func_dup3=no
 # epoll_create1 requires >=linux-2.6.27.
 ac_cv_func_epoll_create1=no
-
-# >=python-3 is masked.
-PYTHON_TARGETS=python2_7
-PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index 049bbfe48ee6..dad9dcbc5852 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -8,6 +8,9 @@ elif [[ ${CATEGORY}/${PN} == dev-qt/qtcore && ${EBUILD_PHASE} == configure ]]; t
     sed -e '/define.*HAVE_PIPE2/d' -i "${S}"/src/3rdparty/forkfd/forkfd.c || die
     einfo "Removing utimensat calls..."
     sed -e '/_POSIX_VERSION/s/defined(_POSIX_VERSION)/0/' -i "${S}"/qmake/library/ioutils.cpp || die
+    einfo "Lower the minimal version of Linux..."
+    sed -r -e 's/MINLINUX_PATCH[[:space:]]+28/MINLINUX_PATCH 18/' \
+        -i "${S}"/src/corelib/global/minimum-linux_p.h || die
 elif [[ ${CATEGORY}/${PN} == dev-lang/ocaml && ${EBUILD_PHASE} == configure ]]; then
     einfo "Removing dup3 and pipe2 definitions..."
     sed -e '/hasgot dup3/,/^fi/d;/hasgot pipe2/,/^fi/d' -i "${S}"/configure || die
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index b7f146f8d4a1..83862097866b 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,3 +1 @@
 # >=python-3 is masked
-python_single_target_python3_5
-python_targets_python3_5
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 287c2abb966b..ed28e6e8aad5 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -7,14 +7,14 @@ net-analyzer/wireshark sdjournal
 
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
 # mask pypy for several utilities due to incompatibility with libselinux
-sys-apps/portage python_targets_pypy python_targets_pypy3
-app-portage/gentoolkit python_targets_pypy python_targets_pypy3
-app-portage/layman python_targets_pypy python_targets_pypy3
-app-admin/webapp-config python_targets_pypy python_targets_pypy3
-app-portage/diffmask python_targets_pypy python_targets_pypy3
-app-portage/flaggie python_targets_pypy python_targets_pypy3
-app-portage/gentoopm python_targets_pypy python_targets_pypy3
-app-portage/gpyutils python_targets_pypy python_targets_pypy3
+sys-apps/portage python_targets_pypy3
+app-portage/gentoolkit python_targets_pypy3
+app-portage/layman python_targets_pypy3
+app-admin/webapp-config python_targets_pypy3
+app-portage/diffmask python_targets_pypy3
+app-portage/flaggie python_targets_pypy3
+app-portage/gentoopm python_targets_pypy3
+app-portage/gpyutils python_targets_pypy3
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
 # SystemD has no support in the SELinux policy at the moment.
diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
index dcee6a32b660..ef3dd6d4a992 100644
--- a/profiles/features/uclibc/use.mask
+++ b/profiles/features/uclibc/use.mask
@@ -13,3 +13,5 @@ pam
 -elibc_uclibc
 elibc_glibc
 elibc_musl
+
+systemd