gentoo auto-resync : 01:10:2022 - 01:09:37

2 files changed, 12 insertions, 14 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 53df7b779ade..3108ebd818ec 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -4,6 +4,7 @@ AUX gnat-gpl-2020-gentoo.patch 2146 BLAKE2B 1abd27bece2366d89603b9152730ae9d4949
 AUX gnat-gpl-2021-gentoo.patch 2039 BLAKE2B 323255e2c0942788eed9a1ce2977a153ddb2e1693136c935f41f80ead4dccb756388e21255055e01f3a749f7a0988cfcf93b3ba02cbab454120c7c81b6e7a9d4 SHA512 cfdf1ec863c3df43a80f7cdb54faeff75d77780473b7a1d14ffa291c1905bfe27d05a907e15c1b31fa980d926e57352bd0b73221458e87260651cc6b092da3c6
 DIST gcc-10-2021-20210519-19A74-src.tar.gz 109157702 BLAKE2B 8ec307e4fde35c8726bc7b9702717329695bad928d5222a7bb691cce47500de31a60bcfcbb925129a57cb81d3d7ea92e60599aa7383d5358e63cc087b0482550 SHA512 2e2cc0ec9a3a82816a5d399d2db261c356e106b82a44efd54a1ac882b96549ab8de79c69858127c4397de6e9e9463ce6fb9994fc2e426e7d3d2f98d5efa2edb6
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
+DIST gcc-10.3.0-patches-4.tar.xz 18460 BLAKE2B 7c4b91c3beebc5fd91c0fdbeec6512c141bd78759a02aa7fff32dd30025ef41db1d57280e50db575f46cc0061a480ced9259410e9875b1dc0048886df469c4c9 SHA512 3befbcdec84e583966aad37d1a08c1863f39eb877296c5991348db9d37cc8359197f23cb3b8fa1b0f4d01497dfd2ebaa393e1a459267c19a0976fb535e463ec8
 DIST gcc-9-2020-20200429-19AA7-src.tar.gz 101030094 BLAKE2B 843d7a92f206a08aa6c0fb41b8b93db494eee26c15872b8d8547685c1013559856cd83c5a4139d8ba68aa6737c0270502fd5547664b458cb8fd023f5ce9601e8 SHA512 2eaf999f4ef7f0216b7bab9963ce1cb9dd4be4d4645415183a0e0706ce0f0f119a5437c482d60db16ea152ebcb36186fc7900ec196fc7b8022d4d9cea2e5a631
 DIST gcc-9.3.0-patches-5.tar.bz2 18336 BLAKE2B 8aefb94bfec041da69efdd751fe9df58cc2352e66afe7ec2090da698912e31de8a82ef588e393929f50dbc6d5967bb015f8e807f868ec19c7cf9813495fa4687 SHA512 0eedc2a33b7fa1a846a30055dcaf38ea9882d5c7b3d8a7d9145fe768d778747413b7822fc625135fa010e749fbbda51f7460e03c989dee8551c50b798a9d1aba
 DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f2880cc0192acb49d8e7f567baca7530fb981be14dc6cb1bf46fda0e3c043c8703cdbeeb242b548894e0bc6787adfff0f27198354d150e6e36386 SHA512 0251a93d20c59cc4705963438880fe265e2e0bb94a35b7ddaaf03e9efae60e044e585a2204d0773a46f17b3b774e4d0c73adf852f5d06ba17373d26ed580ca8d
@@ -14,5 +15,5 @@ DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 EBUILD gnat-gpl-2020.ebuild 3828 BLAKE2B b0b04987c3cd4cf49b6f3d8ec61a1ed84d8cf422149bbc38c2a20e9d0e9c3ee2a05fe37e45cf992caf3b3bb954a30c1eb45ad9b61fb5b6ae97efb4a4382248f6 SHA512 c84506eca5fd33270ca19141a80f921c04817f8dd8694e57b6f43ba12c8f6b9535272828339474ac1d4b508936ca52cb167c754410210cfa7d21c1c7b64157a2
 EBUILD gnat-gpl-2021-r1.ebuild 3997 BLAKE2B 3574dfdfb89d860cb42becccb479df5aff27b0de7005137b119f4ca5fd858c94ea11c723ad177765f2161b7486d6a57a4d8f73567d2a57add3ceb185add2d17b SHA512 3d59a0bfba9a3260c6ff0d9ea6061a45a6e8b2c9cc1559781d45d2f5034de05f652234691531ec80f979c577f48ed44ef4758f73d28083dbaeac1782046fb71e
-EBUILD gnat-gpl-2021-r3.ebuild 4000 BLAKE2B 08670fd0e1db7df5cf120e15d61f3b246abba0d08aa78943fe10265b57387f39d10cf2cea93207191e3c194565416a4e07f59799e593332f05773936c1cd8173 SHA512 b32ce6bbb7e81305f9bbbadbcb6a35068611c65bd6a70303fd3ecb95e11b765eda665c467e5c11b77a848289e5ff174d375bbb5d13a925bd7476a62abb322713
+EBUILD gnat-gpl-2021-r4.ebuild 3961 BLAKE2B 9c5b826c4123210d4cbc4c793ff5baa3b8178c5fdbfa8739a1de03d7451e4bc1062972b84804070718cc7f6ff0d3352820b3ccebcb6cf85bd3519430a5d778d3 SHA512 640e2e5723cff3b9ef5ade327c0d8b853c78e602dcdc06f67e28c871438e35849053f3a8ef564c60d365a0a8a10a014bde53f9a3d435b2947ff0ef58f7948585
 MISC metadata.xml 1960 BLAKE2B e06642a8ae69d163bd2450a4dbf2350399becc0fa933780cbf1378721ec127b033cb547c7aff22d4b89724aefe933c7c0eaac55eab4a223f45d138006dd3492e SHA512 81c3ceafdc0a4d73427d6b12c1bfa41d647e8c788e71e1de09e79de4795573e35e403fd03b981beb350a6e9b55b44fd0d8a2f7279e83c23273fc150a126f2b07
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
index 3122d8366ba2..1d550e0fd45b 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PATCH_GCC_VER=10.3.0
-PATCH_VER="3"
+PATCH_VER="4"
 
 TOOLCHAIN_GCC_PV=10.3.1
 
@@ -50,17 +50,6 @@ BDEPEND=sys-devel/binutils
 
 S="${WORKDIR}"/${MYP}
 
-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}
@@ -81,6 +70,14 @@ 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"
+		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