gentoo resync : 03.11.2021

4 files changed, 45 insertions, 10 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3df5ba67c0bc..e338437d6d26 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,7 +35,7 @@ EBUILD glibc-2.30-r9.ebuild 43400 BLAKE2B 01cbb9398dbe5d93f110f7c7ffe24d40719d86
 EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880eeacb5aaa8438b41b98f5b275f0816a0e654446f62ee2f34f412c5c6e72befcc0deb8988b6faec2c53a07601a9 SHA512 5247b1d75efa86b1a1c85a09219f54d402aae8aaecf0e377ca663a984daf7c69ea97b3072fe83a20002ec7d72661ec7737fbc72982122b58c26cb5bc89997548
 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f
 EBUILD glibc-2.33-r1.ebuild 45233 BLAKE2B 881f8eebb4c7e4e78760b92bd6cb64de2372abed3f15b916ab0d47f60d5cbceaaedf2624db92aec97a2742f205e7b243a02f7ddd3932a83ba8d0de3b40f72caf SHA512 54978040ee64ccc03bf8aea55af21775d8e360fcf5eeddad61b36c51dcc016849e9650270463e46edbd35e7eb6ffa1c72f1068031c80b6fca316980674c22dce
-EBUILD glibc-2.33-r7.ebuild 46610 BLAKE2B 4081d213d820c4d4e27e6d017b293712dd6054c93ad1cc4386c958ee971413836e387e0b292a68792e6526bd87d96baf3f7a3991edd5a44ba33dfae5186e3b85 SHA512 f5838889a23f9e58fb58fe8b274d85bef96dadffd790a467820391fdb68a1e8e5c054b63412db68113ef866974a33413c2bbe1342d1bf3e8b30f9d94c406737b
-EBUILD glibc-2.34.ebuild 47168 BLAKE2B 95ce25c961c352425b3d328f5c545f6ddf688af11fb64332ca8408c10deb499916146f612eb241791d3731761a3b4a36a8bd10995fa1d1312153cf3d19f6d7e5 SHA512 59805afa82e8b36ef115708eca93e35f2dd3c628c3a0d9550ad70f53350248339a43aa294e0cbbabdf15e03ec86a0e239b4d42a18ec60d7bde2df98dfdb530ca
-EBUILD glibc-9999.ebuild 47168 BLAKE2B c99f60d9831df42f3fc9dde54559e48e8bc1c49bf6bfb724c1b57b982a318bafb892ac2ddfc86b02a6276b78f969ed2b49b235f0e687681b8b37bd70d6a2f7f5 SHA512 afc7f1b5c731c94c0919110a357eab986048fe566dbd002560f04943b75c15bc2477bc55f1e62f8edab80f730430fcae64a42a7b2d475990c9378ab48df1cff1
+EBUILD glibc-2.33-r7.ebuild 47056 BLAKE2B cdc38cda15f2df199e0f4cf39b902e137b14f4b0bf44f6db2fa98842c022c9d8954dee1ce950d27f12451ad451c6c9ad4f3eb290489a5e7e16ffd4ebd386effa SHA512 b1c40a3b8ddbd794d7de3307ea83b95645faf44ce4f4cb409840d13544e314ca80b43e68a366a48fde4bc386f1edcfe7d7041b5e42ef8834b9166e31190a65a9
+EBUILD glibc-2.34.ebuild 47526 BLAKE2B f3cebb95bc7aeb7bf7ae824309c2114f5f31e0e773cc37315bf2dffbd771578d4995c4cd2734afd94767a2aea8940de1b9ddd337cbcf091f03c61284849c18bd SHA512 d527943d6fb733c260494c8f4ef592892c39021372395a8ae6ddcd33a200dc95618a8bf4cefd558e86d59db88bf219efcd2c0ee72f7baaa691f3e58a9012b205
+EBUILD glibc-9999.ebuild 47525 BLAKE2B 7007796c02ce7b333f0213e44e5bfaa1d68070f963febbc062b195506314e3474b471c7871c3b8f90fc82c6499396dcce58d0d04f216788b6b2cda3d8545a09b SHA512 e5ea4e3e1615d944cafd8772f457f714b7a9e3cabcb6cd54a5f1bcf5d702a4840ca95603c907f6286bda0f0f11ea69267bdd568248b1b0b28cdf42f73f7a075c
 MISC metadata.xml 1556 BLAKE2B c8deb6ffdb2f6d045ea8c96dbefde33d108f8123d4c51351d77aa487db703b7312d26394e6c320b97e4955acbc0fc97c7ca918426f3bba3b1c2536c2461d334d SHA512 c47d15cf75001e40e6533bc157689d621e853966e70e504e540a16e1390dc0f122acaa705956d25b43683f9c633eb40bc2ffab64ce93f21a8a6346a9fc9dd51e
diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild b/sys-libs/glibc/glibc-2.33-r7.ebuild
index 2f9ce004d3a7..146cce876a7f 100644
--- a/sys-libs/glibc/glibc-2.33-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r7.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
@@ -1506,7 +1506,12 @@ pkg_preinst() {
 	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then
 		PRESERVED_OLD_LIBCRYPT=1
 		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16.
+		if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then
+			cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+		fi
 	else
 		PRESERVED_OLD_LIBCRYPT=0
 	fi
@@ -1542,10 +1547,17 @@ pkg_postinst() {
 
 	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
 		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16
+		if [[ -f "${T}"/crypt.h ]] ; then
+			cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+		fi
+
 		elog "Please ignore a possible later error message about a file collision involving"
 		elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep"
 		elog "the upgrade working, but it also needs to be overwritten when"
 		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+		elog "If you have FEATURES=collision-protect, please use FEATURES=unmerge-orphans instead!"
 	fi
 }
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild
index 0a5f70fd284f..f292dc31fc3b 100644
--- a/sys-libs/glibc/glibc-2.34.ebuild
+++ b/sys-libs/glibc/glibc-2.34.ebuild
@@ -1519,7 +1519,13 @@ pkg_preinst() {
 	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then
 		PRESERVED_OLD_LIBCRYPT=1
 		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16
+		if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then
+			cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+		fi
+
 	else
 		PRESERVED_OLD_LIBCRYPT=0
 	fi
@@ -1555,7 +1561,13 @@ pkg_postinst() {
 
 	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
 		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16
+		if [[ -f "${T}"/crypt.h ]] ; then
+			cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+		fi
+
 		elog "Please ignore a possible later error message about a file collision involving"
 		elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep"
 		elog "the upgrade working, but it also needs to be overwritten when"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 7be3669c52a0..ce817f25421f 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1519,7 +1519,12 @@ pkg_preinst() {
 	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then
 		PRESERVED_OLD_LIBCRYPT=1
 		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16
+		if [[ -f "${EROOT}"/usr/include/crypt.h ]] ; then
+			cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+		fi
 	else
 		PRESERVED_OLD_LIBCRYPT=0
 	fi
@@ -1555,7 +1560,13 @@ pkg_postinst() {
 
 	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
 		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-		cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+
+		# Only copy if it exists; some people may have tiny embedded
+		# systems without headers: https://bugs.gentoo.org/802207#c16
+		if [[ -f "${T}"/crypt.h ]] ; then
+			cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+		fi
+
 		elog "Please ignore a possible later error message about a file collision involving"
 		elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep"
 		elog "the upgrade working, but it also needs to be overwritten when"