From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- profiles/features/musl/package.mask | 23 ++++++++++++++++------ profiles/features/musl/package.use.force | 4 ++++ profiles/features/musl/package.use.mask | 4 ++++ profiles/features/prefix/standalone/profile.bashrc | 9 ++++++++- profiles/features/uclibc/package.mask | 4 ++++ profiles/features/uclibc/package.use.force | 6 ++++++ profiles/features/uclibc/package.use.mask | 4 ++++ 7 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 profiles/features/uclibc/package.use.force (limited to 'profiles/features') diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index 2cdc63f8b852..afb5ebda7f3e 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -1,6 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Hank Leininger (2021-07-14) +# Uses glibc-specific rexec(3) function, bug #715898 +net-misc/netkit-rsh + +# Andreas K. Hüttel (2021-07-14) +# Mask the libxcrypt-based virtual +~virtual/libcrypt-2 + # David Seifert (2021-02-08) # nvidia-drivers only works against glibc. x11-drivers/nvidia-drivers @@ -36,6 +44,13 @@ dev-libs/elfutils # Linux debugger needs a port to musl. app-emulation/dosemu +# Mikle Kolyada (2020-03-20) +# No source builds for musl +app-emulation/firecracker + +# Old undated blocks of masks +# + sys-libs/uclibc-ng sys-libs/glibc @@ -47,8 +62,8 @@ sys-fs/udev # systemd sources fail to build without glibc sys-boot/systemd-boot -# Ian Stakenvicius, 2017-06-14 -# on behalf of mozilla@gentoo.org +# Ian Stakenvicius (2017-06-14) +# (on behalf of ) # Mask firefox-54 and above as it requires rust # now, and rust reportedly will not build yet. >=www-client/firefox-54.0 @@ -57,7 +72,3 @@ sys-boot/systemd-boot dev-lang/rust-bin mail-client/thunderbird-bin www-client/firefox-bin - -# Mikle Kolyada (2020-03-20) -# No source builds for musl -app-emulation/firecracker diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force index c26a7ba83f24..da728fcc47ae 100644 --- a/profiles/features/musl/package.use.force +++ b/profiles/features/musl/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel (2021-07-14) +# Do not force system install for libxcrypt here +>=sys-libs/libxcrypt-4.4.23-r1 -system -compat + # 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. diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index afdd59ca5f50..58cd6477116c 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2020 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel +# Restore mask here that is gone elsewhere +sys-libs/libxcrypt split-usr system + # James Le Cuirot (2020-05-16) # execinfo.h is required for debug. dev-games/cegui debug diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index 76ef2455b35a..5423535d0fc9 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -1,5 +1,5 @@ # -*- mode: shell-script; -*- -# Copyright 2018-2020 Gentoo Authors +# Copyright 2018-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # RAP specific patches pending upstream: @@ -109,4 +109,11 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying ext/iconv/config.m4 paths" sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4 eend $? +elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; then + einfo "Removing Debian magic..." + for f in Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake; do + ebegin " Updating $f" + sed -i -e 's,EXISTS "/etc/debian_version",FALSE,' "${S}"/$f + eend $? + done fi diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask index fe51d352f2f1..ba157ac6b0c5 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 +# Andreas K. Hüttel (2021-07-14) +# Mask the libxcrypt-based virtual +~virtual/libcrypt-2 + # Ionen Wolkens (2021-07-09) # Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106) sys-apps/systemd-tmpfiles diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force new file mode 100644 index 000000000000..82ca48bfea6c --- /dev/null +++ b/profiles/features/uclibc/package.use.force @@ -0,0 +1,6 @@ +# Copyright 2021 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Andreas K. Hüttel (2021-07-14) +# Do not force system install for libxcrypt here +>=sys-libs/libxcrypt-4.4.23-r1 -system -compat diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask index 1c6069c30db8..b3f8a9ebe24a 100644 --- a/profiles/features/uclibc/package.use.mask +++ b/profiles/features/uclibc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel +# Restore mask here that is gone elsewhere +sys-libs/libxcrypt split-usr system + # Anthony G. Basile # sanitize is broken on at least all hardened uclibc sys-devel/gcc sanitize -- cgit v1.2.3