gentoo auto-resync : 30:09:2024 - 01:25:52

3 files changed, 9 insertions, 9 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 17a9b4833590..0cf3557d9ac2 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -6,5 +6,5 @@ DIST gcc-interface-10-2021-20210519-19A75-src.tar.gz 359085 BLAKE2B 75f941a7635f
 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-2021-r5.ebuild 4743 BLAKE2B 7ff29f5870fbeb0ee21930178445ae080a6637b2a7a36ab53d6f4aa6b30896cfef963310305ac71e1053672e98cdcb73bab8f0cdb58b8c610d299ac3241db438 SHA512 64d5dd6e0b21057811838cf477a5ac27cc25b0538912ad7aa1655b3dff438f1431933ca8ad2afee3f34284f6fa2b3c6928cf13eb505dd8bf5df79febe1468dd1
-MISC metadata.xml 2104 BLAKE2B c7a3edb581a8a82c65642269156b8d2eece24342387e95e4afd4786d7155a91ed67f875a8bf720e1bb0b8b7825730e8b4656cefd52e8e0b978d78fb5659fc67b SHA512 a699bd522f23376786a6690f56db22cdc3b07413f4c25d68f7d3ef63b5645bce02d4ee05e0338bcf9e119efe43d32d51420db921e475d7a2d7dce34c4e1dec84
+EBUILD gnat-gpl-2021-r5.ebuild 4791 BLAKE2B 1a0b18b36ca808b966f20bfa78a9f23ef74d7d6f77196314d41a5953b788e064a8c836cd867c2d9abde262f9521ae86b8ab924f4dbf26ec00742beb117b768ea SHA512 56bdfa15c570017677d3530549a1036169ec2a42baa17b50ef9d55854a8f491b0ab6ceaf4d408d149201ff399c43f39456d6fcf74fd678a66e464888f0974303
+MISC metadata.xml 2123 BLAKE2B 37449000a0a107ef9cddeedb867b54709108ea3ee5be59aa5300cdccb1e6a55ddf54df3cb35b9d198ee8d251ede8622d29a0f73800227faca2f621e7a07a11bf SHA512 e979fcde61993c462b816ce1917ae801843b1f44a659342fdf5020d10eacc139681ca54f5fc80b6d70eae26bd33861f1de4cb1d2f9b0ae13446fd9a9bd5b6dff
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
index 002368b2c0c0..d3fa9bbf092e 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r5.ebuild
@@ -24,7 +24,7 @@ GCC_TARBALL_SRC_URI="
 		-> ${MYP}.tar.gz
 	${BASE_URI}/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=${INTFDIR}.tar.gz
 		-> ${INTFDIR}.tar.gz
-	bootstrap? (
+	!system-bootstrap? (
 		amd64? (
 			${BASE_URI}/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=${BTSTRP_AMD64}.tar.gz&rand=1193
 			-> ${BTSTRP_AMD64}.tar.gz
@@ -42,7 +42,7 @@ HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
 KEYWORDS="amd64 x86"
-IUSE="+ada +bootstrap"
+IUSE="+ada system-bootstrap"
 RESTRICT="test"
 
 RDEPEND="!=sys-devel/gcc-${TOOLCHAIN_GCC_PV}*"
@@ -64,7 +64,7 @@ src_prepare() {
 		BTSTRP=${BTSTRP_X86}
 	fi
 
-	if use bootstrap; then
+	if ! use system-bootstrap; then
 		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
 	else
 		GCC=${ADA:-$(tc-getCC)}
@@ -78,10 +78,10 @@ src_prepare() {
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
 
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+	if use system-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 "2) disable the system-bootstrap use flag or"
 		eerror "3) set ADA to a working gcc ada compiler"
 		die "ada compiler not available"
 	fi
@@ -89,7 +89,7 @@ src_prepare() {
 	local bundledchost=""
 	use amd64 && local bundledchost="x86_64"
 	use x86 && local bundledchost="i686"
-	if use bootstrap; then
+	if ! use system-bootstrap; then
 		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/${bundledchost}-pc-linux-gnu/4.7.4/ld \
 			|| die
 		ln -s /usr/bin/$CHOST-ld \
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 45bf56ac30ee..626b079044db 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -6,7 +6,6 @@
 	</maintainer>
 	<use>
 		<flag name="ada">Build the ADA language (GNAT) frontend</flag>
-		<flag name="bootstrap">Used to bootstrap gnat-gpl</flag>
 		<flag name="cet" restrict="&gt;=dev-lang/gnat-gpl-2021">Enable support for Intel Control Flow Enforcement Technology (CET)</flag>
 		<flag name="d">Enable support for the D programming language</flag>
 		<flag name="default-stack-clash-protection">Build packages with stack clash protection on by default</flag>
@@ -29,6 +28,7 @@
 		<flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
 		<flag name="rust">Build support for the Rust language, installs gccrs.</flag>
 		<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
+		<flag name="system-bootstrap">Bootstrap using installed Ada compiler</flag>
 		<flag name="systemtap">enable systemtap static probe points</flag>
 		<flag name="ssp">Build packages with stack smashing protector on by default</flag>
 		<flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag>