gentoo auto-resync : 27:02:2025 - 19:26:39

4 files changed, 12 insertions, 8 deletions

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 8d9df2ebb131..b05fc40bb983 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,7 +1,7 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f SHA512 fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10
 DIST libxcrypt-4.4.38-autotools.tar.xz 630696 BLAKE2B 471066e83495fbaf3ef8dee066b4a7bff36dbc36d6ae1c09f2510d79b041b8517d6cc345e678d92508f5d044dc25fd7b1d36e0243aa46314bbbe7e3201838a5c SHA512 9b1d53119e0d808f6bc30e39cbe85710e3abb774109df28e05b90adebb828f47db3f7126de4ffdea2e63073905648ad941985d1a2167ba7282c01e132ef4e2b2
-EBUILD libxcrypt-4.4.36-r3.ebuild 6586 BLAKE2B c45a3078d4d2f0bda8d7b6a48864998f40e95b111106421b1a5ac8f56c05e86ef6bd2b4ad2630de466e96ea71cb1609844f07aebc3034a875448bf612a46c8ed SHA512 f84b03d0f0d6ab86fb96f059aa2b3c1ad648ec7ed7998d27786274ede4cdef0a64ae7553ca117017f21d13ee84f83ea25f03d9d8e5a0851c252f18fdba6effb8
+EBUILD libxcrypt-4.4.36-r3.ebuild 6701 BLAKE2B 6208c5011c5f02e492848d5a86283ef0a0acbc9ab4f74d39acbb7af622cdd90e0b9a01038b805676f135f2b8757055ed362e5a81866d12a2125d042761a56b20 SHA512 6bddd57ff2ad8bba24258cee36927baf6bf276dcafb5def5e8cbfe67c56303db20ae27c6d80551e590a14b3fba588e97beb8e1a12b454c36171ea2daed87fef2
 EBUILD libxcrypt-4.4.36.ebuild 9270 BLAKE2B 4c8a349c1b5496f0727476fcec727fb9c348ec09389d9caf7e1a4a09e32cf478f74ed8d4c4e71fcc6aae7c87348f150316c22354fe317cc5be38b76601c4d1f3 SHA512 ae10a1021720bd168fd7029024a8ddf5a009deb056a013ff38943f1fee38c101ea4e6b1c3d03b8e7e2606f260e1bf36e13a35e7248e92f924b254090f52c469b
-EBUILD libxcrypt-4.4.38.ebuild 6501 BLAKE2B 0e379ad86e086d3a66d42518b8f091c794fe7ff370d066273ac70f6442c62eaf01cc75e660ffc69ac5d434b86292bd128ec9303bf59d092107e4a07dc0da0404 SHA512 015818c96713469571154f97338b7579f66ee650b19e35d13bf442ec530063bc044d42cafaceef1192f2448a774b2ed4e01cef7a1deea3ae86b4a00ce0acafce
-MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
+EBUILD libxcrypt-4.4.38.ebuild 6616 BLAKE2B 0ca911e17b46b6f19372cc62dbc5d3a9d9e9611e545747263d84aa4d01dc28c153d15d3f60a44b369d0b45be30ddb1083cdd64c7a5c782edfec06845800c5dee SHA512 c468c5d0413ef0133140033e6352e70f8d245ca3432596b00aaa0fe661e89f64a24c6286ecf85807e7d968b05a3e8b3f42db80e83c9c4b8900a38ced3cfb7e2b
+MISC metadata.xml 988 BLAKE2B e435c82f587cbca44bdaa3a19d2a0274bb599e4747551d66055f4a6da23111a8854a463dda90765a7a7668e7df514132afe62109348b6a1934b0c54a402348e5 SHA512 8f205098ecad795ac241b9fcfa9508cfe386175e59d6fd0b8ec5d394bf6c8e3ae930306614ff4c68af25a9188685464c76e1654eddc32df7ebe6f006898aa7ca
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
index 31934e95cd77..ee2c2f74d184 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -138,9 +138,11 @@ src_configure() {
 	fi
 
 	if use headers-only; then
-		# Nothing is compiled here which would affect the headers for the target.
-		# So forcing CC is sane.
+		# Nothing is compiled which would affect the headers, so we set
+		# CC and PKG_CONFIG to ensure configure passes without defaulting
+		# to the unprefixed host variants e.g. "pkg-config"
 		local -x CC="$(tc-getBUILD_CC)"
+		local -x PKG_CONFIG="false"
 	fi
 
 	# Avoid possible "illegal instruction" errors with gold
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild
index 566750ba0d8d..42cb9b1e2412 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild
@@ -138,9 +138,11 @@ src_configure() {
 	fi
 
 	if use headers-only; then
-		# Nothing is compiled here which would affect the headers for the target.
-		# So forcing CC is sane.
+		# Nothing is compiled which would affect the headers, so we set
+		# CC and PKG_CONFIG to ensure configure passes without defaulting
+		# to the unprefixed host variants e.g. "pkg-config"
 		local -x CC="$(tc-getBUILD_CC)"
+		local -x PKG_CONFIG="false"
 	fi
 
 	# Doesn't work with LTO: bug #852917.
diff --git a/sys-libs/libxcrypt/metadata.xml b/sys-libs/libxcrypt/metadata.xml
index cef5e501f632..ff23f0d0be02 100644
--- a/sys-libs/libxcrypt/metadata.xml
+++ b/sys-libs/libxcrypt/metadata.xml
@@ -13,7 +13,7 @@
 	<use>
 		<flag name="compat">Build with compatibility interfaces for other crypt implementations</flag>
 		<flag name="system">Install as system libcrypt.so rather than to an alternate directory (will collide with <pkg>sys-libs/glibc</pkg>'s version)</flag>
-		<flag name="headers-only">Build and install only the headers.</flag>
+		<flag name="headers-only">Build and install only the headers. This is mostly useful for toolchain bootstrapping, to avoid circular deps.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">besser82/libxcrypt</remote-id>