gentoo auto-resync : 07:11:2022 - 21:22:53

8 files changed, 34 insertions, 29 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8c347a329338..da4e74e3be4c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 0d4ba43352d2..d80ab8fc1fb3 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,7 +13,7 @@ DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d8329396
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
-EBUILD gnat-gpl-2020.ebuild 3840 BLAKE2B 82c2560e8b058805ce38780067334a8930bd5601f242d58ebca6b2e661796dccf5de0c306e66da1561ba9e0f38b3184da7e95399e40622ddd36985eed4569412 SHA512 971629f9003934c9bf018dd7d41293d395c86f3cd3dfe54bc007392a66e3ee3b1a50c57bf850f5e667509f99a9e5c063cf77ed5b74dca47787ba8fd2ecd73c28
+EBUILD gnat-gpl-2020.ebuild 3856 BLAKE2B 44ecd30945e6d6d43ac52627c555813385e45833df4f8a5707a739255eb29c875c74ed5dee1ce8b777e952356f9ef0291b8b69ee2daf4d36949cd41daee8d6ed SHA512 981067880ec785f28816cefdc607a6b7a45ecdc027567dcc51cf0072e813fe12fa7bf6c6bb63ef664c13d0a2cd4f29585211ae235479d0de0771877c2721b4cd
 EBUILD gnat-gpl-2021-r1.ebuild 3963 BLAKE2B 13efe1a5e0196fe4af7b1a313bc2240be092c5bd772a99f8900473dc90a78e5c88b55a82a2fe86b138e5d1261ff0ed27b42fef4adc539ad7b3d5706a5d31a17f SHA512 b5b29e236535c4e5f53cd585ad13542e06875cc50eeb184fcc1997e055567efecefd1712c9037d50bafc0d0568ef727b5750aed93961b61e9b2efbdfa2806316
-EBUILD gnat-gpl-2021-r4.ebuild 3972 BLAKE2B 6191724794bc5a9a2189450432f553352cd00e5e1da4978a8f890db7edf5fe36fcc411c4c0679b525473fd0df6b2384e17fc1cd42fce4c9704697f8b714f3df1 SHA512 ad78b00fd56d1e9c0d40bfef0af070dff5734d5fc7c9a3c6919961549d91d7e1a35285993e515472bf5671b4f1ea5ae7d8e76b9ca14404ba0552dadc45eb8550
+EBUILD gnat-gpl-2021-r4.ebuild 4027 BLAKE2B 26dbc22175e9d7a963fd16caa6a32c505d1218e8451f883944996c19eff9752ccd2697abbbe21da837de0a32a6af60b0bed88b7ca661b38e29a54e9a1c8cdd08 SHA512 a681164a575c1ac8d04fcb2b09714889aea4cedfdf68e62a7fb0961400163c0ec6dbbe6d8297e2744091c029804ef9d45574a1c773c70813d353518fa81d2698
 MISC metadata.xml 1960 BLAKE2B e06642a8ae69d163bd2450a4dbf2350399becc0fa933780cbf1378721ec127b033cb547c7aff22d4b89724aefe933c7c0eaac55eab4a223f45d138006dd3492e SHA512 81c3ceafdc0a4d73427d6b12c1bfa41d647e8c788e71e1de09e79de4795573e35e403fd03b981beb350a6e9b55b44fd0d8a2f7279e83c23273fc150a126f2b07
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
index efc7ef0e3532..a70c2cc890dc 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@@ -52,17 +52,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
-}
-
 src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
@@ -83,6 +72,15 @@ src_prepare() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
+
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag or"
+		eerror "3) set ADA to a working gcc ada compiler"
+		die "ada compiler not available"
+	fi
+
 	if use bootstrap; then
 		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \
 			|| die
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
index c757e0fa766a..0ab2e943e258 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
@@ -74,7 +74,8 @@ src_prepare() {
 	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
 		eerror "You need a gcc compiler that provides the Ada Compiler:"
 		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
+		eerror "2) set the bootstrap use flag or"
+		eerror "3) set ADA to a working gcc ada compiler"
 		die "ada compiler not available"
 	fi
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index e0d0194f51c8..eabe469a4849 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -19,10 +19,10 @@ DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
-EBUILD spidermonkey-102.4.0.ebuild 11041 BLAKE2B 37acb65d609cde79674874f69c2d772833e1ca857fe5b9f8ba54d151a37e1587d43daf3ba5cea061ff3753ad083c88003b7907ee61d3b4aaf94448f11c046004 SHA512 82a01b5d49e1b50c2e0f7450ad77a1b113d1f286aa509712c1e3ab1bad4f42cab52c246ccf45381e42a0bbdc2b16d3977d46035ad859a4bbca10763149395194
+EBUILD spidermonkey-102.4.0.ebuild 11046 BLAKE2B 76afc867969348b1f7d2b4ee724dabf9d6681019e9f2cb6848ffa7ac165bed78c023ea16e0b08a33729d90f42efff6b4e35ad7b446211f407f27d1d5cb48bb34 SHA512 11e95e012dc668ff2f6d25d257e7c4654cdd3c8694ab952a49df206d8c1cb69481d3e44572267c1886bcbfc12263f4ed0866105b95b56383e50e4bced1791cad
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
-EBUILD spidermonkey-78.15.0.ebuild 13125 BLAKE2B 30de33d7210c4a9757e27ebf850877f01e311b9a19f7e5aedec56cb5e024d2c96640658d412fcb96a4c3300e449465c82ad271d491d084a6a49ca21ac81f182b SHA512 efac163acbd4b988fbf3974bbe7bbad2be2d1c91c83cd93ca5560f13c5cb873d3cd72c92c34b26498524ed0920e8729ddef48ecd539d7f3b428446ca72c93570
+EBUILD spidermonkey-78.15.0.ebuild 13130 BLAKE2B d0c2f2749c442b6d67ad990e07e2496ef1c57af7e71f0fd0d7fc362d11278e062847d730429b64edfc94e289c11236efdc3b66006fd6c7208bedf3043f6676ca SHA512 626aa7d0d21e5718def7d2e948c2606ae07a0536267ec6c81af2f95bc390e0eb2c436d4749fe65ccb8d1efac311525ac69261f27754bfb2a039e9fb73935aa7d
 EBUILD spidermonkey-91.11.0.ebuild 15080 BLAKE2B 0f68ed8232a2f7b34a6be94638a24c8f0a039e285f84945f5655357b6374341251651aad3a98ca05909dfe40eceff3b62e80a088baf8a78e72d89fa5b4769981 SHA512 5fa0fde2e74255e34c00869f06780cc7ed8cc251c41a35e9f9c7e2330282e7b487039c3a1b100dead979ce06d0b2254bd1c63c8e6e1f83d7dbcddabb8f442834
-EBUILD spidermonkey-91.13.0.ebuild 15168 BLAKE2B 50b6aeda98b52f1c14cf68e36151ff5b01c65f7f36f7ef8788b2f5aff4d1444e3b59f494560b411151e4c35a9eea774caf2c416c99d14e2614680130b90440ba SHA512 cf117ee9feda65c611fe05601cde5f23b443d55c1b2a1186a8c09923acec57700a49ffb60de96ff01d95c8bb79c1c8d30699463f7e36f01ade7b800bbab13d72
+EBUILD spidermonkey-91.13.0.ebuild 15173 BLAKE2B 89cdc1302610d7f7c3269719bbe24461fb00d7e75065e7bf6a128d2334a4a0f6064655251380509913e1bfddd69625846e3b8873eb9d215e966cabc8960804d0 SHA512 89b55aa8d82eb5d5043f7727ebe16aed245e4473e7dd7b24abd7dc78d5eed4958a07141e509ac4271e34504423fee47c0502c0bcf00348dd0a5dfbdff6f93947
 MISC metadata.xml 869 BLAKE2B 79d6ea91e84e3bb666797cde6b2993282ff1b4266dfa835eaf02d8aa65d5d000729b149a49c9fa5c8dbf12e4b97b46d976243c888834db9df73a8a5c814aa610 SHA512 f78399a1ad88583c50ad1e967f5ba293cdfff7d58cf26b87bd8888c7102b62d42ef1982d1b8462f3d31f0806b6cead8db28b7f0c7b12c08d3871607b5a4c63cc
diff --git a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
index 40a248c7290f..d78ef4c2e97f 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
@@ -113,8 +113,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -228,10 +228,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		AS=llvm-as
 		CC=${CHOST}-clang
diff --git a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
index 80ef8034aaa8..8af327dd9b6e 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
@@ -126,8 +126,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -252,10 +252,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
diff --git a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
index 6dc4ab9f813f..11f4cc2fe5e8 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
@@ -120,8 +120,8 @@ llvm_check_deps() {
 		fi
 
 		if use lto ; then
-			if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-				einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
 				return 1
 			fi
 		fi
@@ -235,10 +235,12 @@ src_configure() {
 	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
 
 	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
+	if use clang; then
 		# Force clang
 		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
 		AR=llvm-ar
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++