2025-07-09 22:10:43+00:00

3 files changed, 45 insertions, 21 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0d495915122b2..0f46c19471bc0 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/idris2/Manifest b/dev-lang/idris2/Manifest
index 70e0354513cb5..177ac48040a57 100644
--- a/dev-lang/idris2/Manifest
+++ b/dev-lang/idris2/Manifest
@@ -1,4 +1,4 @@
 AUX idris2-0.7.0-disable-allbackends-tests.patch 255 BLAKE2B b81b2185f66ee30c456c0fd2b8f408aa24a83df89b3db3f2dbd04948aa17bf1498bf666e8de02fd64651183c4d59d7d1348c4f2d223f3a1d55a97b2384d955b0 SHA512 f0edca9ee09caf99c58dae7bced66a03956ada42aed5aab4dd299d29ccc33f18feaa8d31f8fc19a838955f2469ba52ca0d201ea3765da545239801824889f933
 DIST idris2-0.7.0.tar.gz 6987849 BLAKE2B 5a3df7eb4541830822c92bc76e616266e9535c7fe989e78db4477c724d25720ec46bb21625ab9c0541da52fbacc0b1f7d49c3316191f88b553ec8a4f8d22892c SHA512 3c645807d71ecf62bc66b674438ebf80ec6e7e4bbf473d86ec06bc7b59f8187618e0d56535380079837e15caebef02deba9beb3eb3c77da787befac88d7a6d2b
-EBUILD idris2-0.7.0.ebuild 2828 BLAKE2B 08b2b85af4b8ab87cb6f14b913296479ef5181c58d8bd8795e68d77127b9cf31c7a4cc0fc37e7856d0f602496d7a397a3d517d0af190574b6a6a3191602d341b SHA512 d1dd11371a54e900cf0ea61b754a78e31b636487b364f584f2680aab187ccdf47f01ce86840ca69b80f097d92bc925686f4fb611ca79c8f3d793083aaffc41f6
+EBUILD idris2-0.7.0-r1.ebuild 3350 BLAKE2B 53fb36e652499a922c8feabdd2febcffc2e1f86b54d7133ab97dbc5c539dade8c4a549bc6ac5e221f33f6cdff73ef7de5857f7a880d0bbf2fc332199452c0fe3 SHA512 c915ffd217201d4796f244fe50aead98d2cae3db2d16bf6db176abbf0f6ee2e9826c04aed9069599214a88a87be6d37f67eaf9ceaa8504e412015648414822e1
 MISC metadata.xml 1255 BLAKE2B d4d6a952913f404faab8d2383eab1ece0de7bc20486c3126149f7644b3d3445b6b87948f14b43b812dc748824d26da610914969a906735d6c13b9cdbcc0e6ba1 SHA512 df684d9f038601e7d8728a226743f79c7523bb462ed231fb60f33cc214c267dd1981da3f7c39d6cfc153a389330e779cfd580266677e003f8787366545c1f0fa
diff --git a/dev-lang/idris2/idris2-0.7.0.ebuild b/dev-lang/idris2/idris2-0.7.0-r1.ebuild
index acc07f686ab72..7b6cae4f351a2 100644
--- a/dev-lang/idris2/idris2-0.7.0.ebuild
+++ b/dev-lang/idris2/idris2-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+chez doc racket test-full"
+IUSE="+chez doc minimal racket test-full"
 REQUIRED_USE="^^ ( chez racket )"
 
 RDEPEND="
@@ -48,11 +48,12 @@ BDEPEND="
 	)
 "
 
-CHECKREQS_DISK_BUILD="800M"
+CHECKREQS_DISK_BUILD="1200M"
 
 PATCHES=( "${FILESDIR}/${PN}-0.7.0-disable-allbackends-tests.patch"  )
 
 # Generated via "SCHEME", not CC
+RESTRICT="strip"
 QA_FLAGS_IGNORED="
 	usr/lib/idris2/bin/idris2_app/idris2
 	usr/lib/idris2/bin/idris2_app/idris2-boot
@@ -98,38 +99,61 @@ src_prepare() {
 
 src_configure() {
 	export IDRIS2_VERSION="${PV}"
+	export IDRIS2_CG="$(usex chez chez racket)"
 	export SCHEME="$(usex chez chezscheme racket)"
-
-	if use chez ; then
-		export IDRIS2_CG=chez
-		export BOOTSTRAP_TARGET=bootstrap
-	elif use racket ; then
-		export IDRIS2_CG=racket
-		export BOOTSTRAP_TARGET=bootstrap-racket
-	else
-		die 'Neither "chez" nor "racket" was chosen'
-	fi
 }
 
 src_compile() {
 	# > jobserver unavailable
+	# We have to use -j1.
 	# This is caused by Makefile using a script which in turn calls make
 	# https://github.com/idris-lang/Idris2/issues/2152
-	emake SCHEME="${SCHEME}" "${BOOTSTRAP_TARGET}" -j1
 
-	use doc && emake -C ./docs html
+	local bootstrap_target="$(usex chez bootstrap bootstrap-racket)"
+
+	einfo "Bootstrapping stage 1 (from Scheme)"
+	emake -j1 PREFIX="${S}/stage1" SCHEME="${SCHEME}" "${bootstrap_target}"
+	emake -j1 PREFIX="${S}/stage1" SCHEME="${SCHEME}" install
+
+	einfo "Bootstrapping stage 2 (self-hosted)"
+	local -x PATH="${S}/stage1/bin:${PATH}"
+	if use racket ; then
+		emake -j1 IDRIS2_BOOT="idris2 --codegen racket" all
+	else
+		emake -j1 all
+	fi
+
+	if use doc ; then
+		emake -C ./docs html
+	fi
 }
 
 src_test() {
-	emake SCHEME="${SCHEME}" bootstrap-test
+	emake SCHEME="${SCHEME}" test
 }
 
 src_install() {
-	# "DESTDIR" variable is not respected, use "PREFIX" instead
-	emake IDRIS2_PREFIX="${ED}/usr/lib/idris2" PREFIX="${ED}/usr/lib/idris2" install
+	emake -j1 DESTDIR="${ED}" install
 	dosym "../lib/${PN}/bin/${PN}" "/usr/bin/${PN}"
 
-	# Install documentation
-	use doc && dodoc -r ./docs/build/html
+	local -x PATH="${S}/build/exec:${PATH}"
+
+	if ! use minimal ; then
+		emake -j1 DESTDIR="${ED}" install-with-src-api
+		emake -j1 DESTDIR="${ED}" install-with-src-libs
+	fi
+
+	cat <<EOF > "${ED}/usr/lib/${PN}/gentoo-build-info.txt"
+Package: ${P}
+Installed: $(date +'%Y-%m-%d %H:%M %Z')
+Bootstrapped from: $(usex chez Chez Racket)
+Self-hosted: yes
+Idris2 API installed: $(usex minimal no yes)
+EOF
+
+	if use doc ; then
+		dodoc -r ./docs/build/html
+	fi
+
 	einstalldocs
 }