gentoo auto-resync : 25:11:2022 - 01:11:36

4 files changed, 33 insertions, 33 deletions

diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 2ce5023b4d7d..e34cfb3c3036 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.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
 DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
-EBUILD libxcrypt-4.4.28-r1.ebuild 8807 BLAKE2B 60b00d1d0d9e0f1ec66bf234d63c08703e789fd0319eadf440ca0b9433eaff11685a3906af2ddda4301f46033cd92688b0a87186de25c178523928c59c213571 SHA512 05daee208a35a70f82da2ea650aeebfb692692b9e019c18614ea436c20a8dbb355d657e9b625ca7eb6daf31ad52dd01c64afa256669d4950fb8ebc08c4625414
-EBUILD libxcrypt-4.4.28-r2.ebuild 9208 BLAKE2B 6135632aa93a142b71aa1179d76ab58b823598378e767ef8a242cdcda6d75546ca4ddff606dc74a2be225083d30b230abc0dd8f4610f975635203d7a91867ac7 SHA512 ee9ee52ad1562abd11a31b9a7b11d4ad7d83e496ff672412fbce29c1fcb3591e785e02fa8a9a1ab4eaf7b518d9417e6cbf66d65f3c3047ab0eb7c9c503e3af4f
-EBUILD libxcrypt-4.4.33.ebuild 9034 BLAKE2B e5bc1a47c3b4a598527a9496569abdb7e9c250b9b152756d118d5d48083929573faa89b4f80a66006a91c19934e2006e8b248cf07c82399c5078a20ef6de0cc6 SHA512 a3537093dfe4f0f9d031c456a71957abf635ee71ba3613471dbf5c9ca5d53a5f4327b1fd533eb03e2ebf47054fe5ba296c1ea6c35c6548fda65cccef0c28f66b
+EBUILD libxcrypt-4.4.28-r1.ebuild 8810 BLAKE2B ea0c27d0613bda09c4fcc5b80650c576eca95727d59bdaa43472c4f01c4bf7c186c09769471311295a948af988a6ac314f30f24853f6adbdc99f0d851ae4514a SHA512 9997cc62b2bc5632b6f8b8fe51679460127bd1ef3cff1dff25e9829c4637054103ee8baa407e8122e04de2a887bcfbb077a9088c806f94cf758dd5ea1f1bbc78
+EBUILD libxcrypt-4.4.28-r2.ebuild 9211 BLAKE2B d0367cbf6c8b0723941244374f28410340c10a4e2200e58ce9b3e119af38d43e645ee20f4746124a4076775db9e7f24b8468a9eeb3688c2be5caa1b63e484f4c SHA512 777ce9dd5ab3c0dc57396af93b2286a03f7302a65f7be6a8f028ea74d8f1c3ef1d88fbcc81325f129946d8247eab4c8f69a3f0c796107ce6507ec2254a8eec2d
+EBUILD libxcrypt-4.4.33.ebuild 9037 BLAKE2B 883f2bfe69a42b91baa8e0c17cf193cfdf65f7fc3b0b7cf93db6f492c9ac51a6b515522f8b7d7cba351080f59be86164700b48d1d0a08efe8647df61bb49a3fd SHA512 64f9608f92f39c8210377bfd9cdcce091aae0e1d2ff3f3e14124f1a651204a60a0ab544a38623fd815fb8248a0a4421a209f49bfd9890ee4fbd042aecc980e61
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
index 8f335d8027ca..581dc70c0fd7 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r1.ebuild
@@ -304,17 +304,17 @@ pkg_preinst() {
 	# is cleaned up in *_src_install.
 	local broken_symlinks=()
 	mapfile -d '' broken_symlinks < <(
-		find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+		find "${ED}" -xtype l -print0
 	)
 
-	[[ -z "${broken_symlinks[@]}" ]] && return
-
-	eerror "Broken symlinks found before merging!"
-	for symlink in "${broken_symlinks[@]}" ; do
-		bad_dest="$(readlink -f ${symlink})"
-		eerror "\t${symlink} is broken!"
-		eerror "\treadlink -f ${symlink}:"
-		eerror "\t\t${bad_dest}"
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
 		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
-	done
+	fi
 }
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
index 5e72a74c6d85..755fdd744e22 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.28-r2.ebuild
@@ -320,17 +320,17 @@ pkg_preinst() {
 	# is cleaned up in *_src_install.
 	local broken_symlinks=()
 	mapfile -d '' broken_symlinks < <(
-		find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+		find "${ED}" -xtype l -print0
 	)
 
-	[[ -z "${broken_symlinks[@]}" ]] && return
-
-	eerror "Broken symlinks found before merging!"
-	for symlink in "${broken_symlinks[@]}" ; do
-		bad_dest="$(readlink -f ${symlink})"
-		eerror "\t${symlink} is broken!"
-		eerror "\treadlink -f ${symlink}:"
-		eerror "\t\t${bad_dest}"
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
 		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
-	done
+	fi
 }
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index d0bd8a723065..0e077bd372ed 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
@@ -315,17 +315,17 @@ pkg_preinst() {
 	# is cleaned up in *_src_install.
 	local broken_symlinks=()
 	mapfile -d '' broken_symlinks < <(
-		find "${ED}" -type l ! -exec test -e {} \; -print0 2>/dev/null
+		find "${ED}" -xtype l -print0
 	)
 
-	[[ -z "${broken_symlinks[@]}" ]] && return
-
-	eerror "Broken symlinks found before merging!"
-	for symlink in "${broken_symlinks[@]}" ; do
-		bad_dest="$(readlink -f ${symlink})"
-		eerror "\t${symlink} is broken!"
-		eerror "\treadlink -f ${symlink}:"
-		eerror "\t\t${bad_dest}"
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
 		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
-	done
+	fi
 }