gentoo auto-resync : 27:12:2024 - 06:30:34

6 files changed, 50 insertions, 4 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 137971c8ba1e..9e5893b3c78e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a06bb6e01164..d0500c187767 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -52,6 +52,6 @@ EBUILD glibc-2.37-r10.ebuild 53322 BLAKE2B 301a9c47f4149e927764cc132e6ec2a20b90a
 EBUILD glibc-2.38-r13.ebuild 55028 BLAKE2B fcee988603b8bcec9cf184c54e040c9190a98170170665c56998e9a14bec55b34e25fc1002b2aaa8bae29392968a8f543f2f68f1e564c52d9e7a0fcf5c829317 SHA512 9bd2e1fe3709f4b792575d37c6b343e2db3b4bb60090281521ac3b9c4e5b9bed2367453933a2df8c1fa9cc988a71e97d797c009f7bb9fabde6c2821ab61102dd
 EBUILD glibc-2.39-r11.ebuild 54663 BLAKE2B ef95a8014c990f42738c5b66b73416a55fab1b433af10d879a60d4d798ed3b9fca747242fb09d110f6a258e37bdbb384a85cc59dd8dc80f375c6faaa30ab4932 SHA512 3e8c216ac02f129a37de9d475980d911fb1ff77d09949f87ff6c5ffa666afdc6a35004d32d60d8a78b1abc17a823083442a68cbea6df35d4409897648ce8783f
 EBUILD glibc-2.40-r5.ebuild 54662 BLAKE2B 62dd423d70cd8598bc4e69dc49e9b5442d283af497b80c58a99fcc6d4977936b0171c0c76325978fd43ddccd7e3c6496984c90a171bfd7b27ce5296bd204f7e9 SHA512 4daab8f45afa47660e9edce14ce5733702a5c229e1dea24e702858425d30201686eb62b0fd2d6a9c99343e4c6e138352f18eacde24d99aada8ce610f001c5b33
-EBUILD glibc-2.40-r7.ebuild 54670 BLAKE2B b1d6131882778b27e943d5a6ef15e81288366a66a400f48c0282bdeb5a4559b63168cef8a082d6b4f6910e50411fbbe986ea91ad8f031804fb140cecb9f44144 SHA512 efc619a834f6044de420ad08dd7bbb568b3013954f9dd16b0269bfa983623bc85891061b9b6250b5ac43f09ee567fe875e907463013b2551b3425b8306d8e85d
-EBUILD glibc-9999.ebuild 54918 BLAKE2B a4e522a62c93bd03477ef2e6846998867687b78effb55bfa286c21c920654e745582454696371211ca8bf9bc03de179a881a2b4897a9513b1804ab56ee2039f4 SHA512 1d6444c380a555fcdb33f252271087f7b876b9886ab45dba266fdf1975fd75c12ece7804e4234ba25d6ddf13e2bd482af30e7ac9b57c20515d78f3b05d7696a7
+EBUILD glibc-2.40-r7.ebuild 55811 BLAKE2B acfceb338224a38741d4f2802041fbeb89ec0cc8d1326d14e4a9b7ae799e9a077fef3c1b0b72c2616f6cabf7763b425582745e53656ef121eec8f9ff174595df SHA512 6e036c5977c6bc4c095396b054df3397a01e2320683158c09387e3af18eb7cbec8c252b69ee478f8015881d81c03f4637a67af8806d2ca20293a9de2e3125c5e
+EBUILD glibc-9999.ebuild 56059 BLAKE2B 5911dcb8e625f5567c560b4eda59da1af83c6e3937880149a67192c8a46033da7ccb7524c4e6f7079fb652ed57bbcea3010860e515f26d514a03b9f4a919c683 SHA512 6260c0c28ec09b2fb9f054238b2649d89c715e843af4403f0f06223595c95685391cc73a2e97d3092e22e1ca5da386582bed9c4ca5ceaa637792496ed197d5f5
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.40-r7.ebuild b/sys-libs/glibc/glibc-2.40-r7.ebuild
index 4b56270760cc..c24d663d40e0 100644
--- a/sys-libs/glibc/glibc-2.40-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.40-r7.ebuild
@@ -1720,6 +1720,29 @@ pkg_postinst() {
 		use loong && glibc_refresh_ldconfig
 
 		use compile-locales || run_locale_gen "${EROOT}/"
+
+		# If fixincludes was/is active for a particular GCC slot, we
+		# must refresh it. See bug #933282 and GCC's documentation:
+		# https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html
+		#
+		# TODO: Could this be done for non-cross? Some care would be needed
+		# to pass the right arguments.
+		while IFS= read -r -d $'\0' slot ; do
+			local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders
+			local pthread_h="${BROOT}"/usr/lib/gcc/${CBUILD}/${slot##*/}/include-fixed/pthread.h
+			if [[ -x ${mkheaders_path} ]] ; then
+				ebegin "Refreshing fixincludes for ${CBUILD} with gcc-${slot##*/}"
+				${mkheaders_path} -v
+				eend $?
+			elif [[ -f ${pthread_h} ]] ; then
+				# fixincludes might have been enabled in the past for this
+				# GCC slot but not since we fixed toolchain.eclass to install
+				# mkheaders, so we need to manually delete pthread.h at least.
+				ebegin "Deleting stale fixincludes'd pthread.h for ${CBUILD} with gcc-${slot##*/}"
+				mv -v "${pthread_h}" "${pthread_h}.bak"
+				eend $?
+			fi
+		done < <(find "${BROOT}"/usr/libexec/gcc/${CBUILD}/ -mindepth 1 -maxdepth 1 -type d -print0)
 	fi
 
 	upgrade_warning
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 50730ce83294..ceafddea0f5b 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1731,6 +1731,29 @@ pkg_postinst() {
 		use loong && glibc_refresh_ldconfig
 
 		use compile-locales || run_locale_gen "${EROOT}/"
+
+		# If fixincludes was/is active for a particular GCC slot, we
+		# must refresh it. See bug #933282 and GCC's documentation:
+		# https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html
+		#
+		# TODO: Could this be done for non-cross? Some care would be needed
+		# to pass the right arguments.
+		while IFS= read -r -d $'\0' slot ; do
+			local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders
+			local pthread_h="${BROOT}"/usr/lib/gcc/${CBUILD}/${slot##*/}/include-fixed/pthread.h
+			if [[ -x ${mkheaders_path} ]] ; then
+				ebegin "Refreshing fixincludes for ${CBUILD} with gcc-${slot##*/}"
+				${mkheaders_path} -v
+				eend $?
+			elif [[ -f ${pthread_h} ]] ; then
+				# fixincludes might have been enabled in the past for this
+				# GCC slot but not since we fixed toolchain.eclass to install
+				# mkheaders, so we need to manually delete pthread.h at least.
+				ebegin "Deleting stale fixincludes'd pthread.h for ${CBUILD} with gcc-${slot##*/}"
+				mv -v "${pthread_h}" "${pthread_h}.bak"
+				eend $?
+			fi
+		done < <(find "${BROOT}"/usr/libexec/gcc/${CBUILD}/ -mindepth 1 -maxdepth 1 -type d -print0)
 	fi
 
 	upgrade_warning
diff --git a/sys-libs/libieee1284/Manifest b/sys-libs/libieee1284/Manifest
index e17eed41ef4d..2d1d6867dc49 100644
--- a/sys-libs/libieee1284/Manifest
+++ b/sys-libs/libieee1284/Manifest
@@ -1,4 +1,4 @@
 AUX libieee1284-0.2.11-don-t-blindly-assume-outb_p-to-be-available.patch 1114 BLAKE2B cfc35b9dec4cb0cc08f9128f8f735b0843aa77c534c2707a888388805af60583eb8ab55dd5f8ab04be2b152beef9ca7d798da3346c65a8c479b994dc3068a2cc SHA512 cd63304e5002105cf47d7c12212aa70aaf9b3ec6e7c87d67a4b5a32d3be7d41155968b1b8558bf2d126d0446223025ccccb1ded166789d355640637b9ed5ea7b
 DIST libieee1284-0.2.11.tar.bz2 278804 BLAKE2B 6bdc7051c91c7d1b7e601eb17823c4dbd17ca1f049a2af8487518649ec33fd5948d184b97764934371ea11d3871e82059cb0a5bd5501e1881e191791992e9d7b SHA512 06cc3049ce15613d34e39dc71bc572843c61ab64077c29ef9a6257edb0849c98565ff612a4cf787bc9642a39f1c89b7c47a20fb27f2318105be82aad8d472bb9
-EBUILD libieee1284-0.2.11-r9.ebuild 1041 BLAKE2B e17a4fe8ae7d1082f834750e6202a74544af0fcbab8063f840686bba7237263f763f0b2f607ea4f10be59c18823cf9aec4ac2f7c3e1b421f66b55711a64ac180 SHA512 240a39d327c9d31a19e3b7476bb07a2c84b1e711791a64610bbdd08fd4c0f0c3119c81a38dcb44e9039e09222463fbbe0c5e5037202a65a7f84b6b3235b2aa3f
+EBUILD libieee1284-0.2.11-r9.ebuild 1048 BLAKE2B 227b7319ebb1b26eaa87387dcd0340496ac7c140fe3d74440281e1b553b37fd41f281581bf41ec8553fd3951e954feeb8d655bdc2b60325539b7bee712a5632c SHA512 eb65d9222c54138c7db45e799e4db8ce1124ed70c7e874457698cc32acd4e56e0e75514e1c83aa8d67b8ae64df8540c1179955a53cac69ef27369571de337a18
 MISC metadata.xml 332 BLAKE2B c2c4da67b3d2e5d1324702d5337f5069becc86d7fba6f4f8a0b5a827a290fd54d5439cdf299f20f0a8586d332bc59dc13098f0b8a310e5ff5ec75cdf72d38989 SHA512 d6fde1d953667b89149bb7259f2bcb98682d4ff9c8fe21d94626c7a835f6e2b50b253209e7f1cd4917bb187a2d15d660dba5a146f0b06fbcae7701e77d274cf0
diff --git a/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild b/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
index 6d21bcb564ad..35ef225f2cea 100644
--- a/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
+++ b/sys-libs/libieee1284/libieee1284-0.2.11-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 BDEPEND="doc? (