gentoo auto-resync : 02:03:2024 - 17:41:59

3 files changed, 20 insertions, 81 deletions

diff --git a/dev-scheme/mit-scheme/Manifest b/dev-scheme/mit-scheme/Manifest
index b34a126c1dbd..2a6bf97d9df7 100644
--- a/dev-scheme/mit-scheme/Manifest
+++ b/dev-scheme/mit-scheme/Manifest
@@ -1,7 +1,5 @@
 AUX mit-scheme-11.2-implicit-int.patch 340 BLAKE2B 7c6fe1be03a8f3fa7e3594f64025f7c44f708583d40644c9946087dbe40b36d74c455787214488a3c0fe95673e676f967f827c9cde2745a89f539806c718dc80 SHA512 53dc1aac2f14a25ad5e32971a2976cb713513d808f6daac962c14f1179b64fd19c42414bbf4b73c9b01989dd89f1a42235a3a5bdac2490513967f2e7376d9a9a
 AUX mit-scheme-11.2-no-Werror.patch 671 BLAKE2B 7bc3a9524f275a1e0435484b9570e26b7ca6a30d0913a691f654f1fd6e51c0a0114daf7393c04f7850bc3a7c3c9c3f953df91ce0d609537069b7bb1c5760ab35 SHA512 7e1c692ed20d78d2747eb8186bc733766d5fa94eac2c45b50541d26a1b44c7393e267ba8da0f6866838af79f8805fcaeea8079bcd4d735db08eec7706ae8093e
-DIST mit-scheme-11.2-svm1-64le.tar.gz 73077951 BLAKE2B 0e6741103c7a96f665e643fe6cab1a52bebcc8549845bf592029f73bbc9518937f45ccbac39e14d29b05b26f602ce810ae3f01030b0afb88560970ad3bb1f6dd SHA512 0bf2e8b1710a87da775b8fca53df808e23e45f6e6310a78b507fa87cd340c051cdf2ffe74268e9f6fc7bf3eaaa9321c2fc016e675fb41e59f648d1e69a1e8458
 DIST mit-scheme-12.1-svm1-64le.tar.gz 88542947 BLAKE2B 07278da41c250924ff833933b7015e865a4dc8feea11a4e1b1647818cacf03fc25878cbe0aca3a8cf08adad5487c0f7aa5e5beb111ed46d09e8473ee01490eca SHA512 07e49b0f3919ad4ed85696766697615dc1720b4278c61d4aa6c3a1a92966d1e6fc7c9c7ca7db395d4e4279c5464639c80503bf4f6a8e51d2e951edc85a453dc9
-EBUILD mit-scheme-11.2.ebuild 1706 BLAKE2B 426d8983e211a76a865cd07ee626210d2cba6f88038c349964820a193e710e81e38f5ea447a41ab87aec3a6bfcb4ea8a3225de320ab915a13f68f791e228d63e SHA512 0965c1ef12858fec3fb215d413c2b6356d900bdb118e048000e33131e028e723d7d9497e96f06c1df8ffe50bd89c4a10840b57c68e2161a29eb976cec6780aaa
-EBUILD mit-scheme-12.1.ebuild 1721 BLAKE2B b8548cd43ddd7318f0f4d59fbd9dc5bb550e77530838d9c3a580b3ce443b701e33d756343b7e3129e5d0bf0037f629c1929608bce4466893dac1fbdcfbe28535 SHA512 17ea0739a338b69fbe8a296299db09d4bfed0da5e7b079b0e27062c38ad4c68cc68569a066a464a9195b2bb52395b7533e3a169dd2433f2df154f3cb1f3ca0eb
+EBUILD mit-scheme-12.1-r1.ebuild 2154 BLAKE2B 040dee62ab8c40d3afbfb79d297607db9af3ea92917d9f573f45adbdaf2e76f325554c0980e1af533a0b3911581fd04dc3f949b87aea1e014db4179db9a6c5ab SHA512 f2b4b18ae61016923af9afc483ff5329b3b69299ca41fc3aaa90199ccffdc0eaf33883ad41a65bec0d5f9c58c4d52a7d280f3ef1326d19c8aa1a37f9e3527476
 MISC metadata.xml 848 BLAKE2B ca56dc6d2f4876eb389f05143c784e56d6401b325164533d63f73f56becd224aafb2e9367b045682fa640c24420a0daf8d46aa1b88fbf23979967534be020d6b SHA512 fac1b2044c69935683ef03baa758f78a845231304a60ed09f7af1aeb2e149a47e7f99805d0ac576185afec60b57d97481ce7eeb181eec572a02f10bb13e705a6
diff --git a/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild b/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
deleted file mode 100644
index 723378e963db..000000000000
--- a/dev-scheme/mit-scheme/mit-scheme-11.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit wrapper
-
-DESCRIPTION="Scheme interpreter, compiler, debugger and runtime library"
-HOMEPAGE="https://www.gnu.org/software/mit-scheme/
-	https://savannah.gnu.org/projects/mit-scheme/"
-SRC_URI="https://ftp.gnu.org/gnu/${PN}/stable.pkg/${PV}/${P}-svm1-64le.tar.gz"
-S="${S}"/src
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"  # Additionally arm64 is officially supported.
-IUSE="blowfish gdbm gui postgres"
-
-RDEPEND="
-	blowfish? ( dev-libs/openssl:= )
-	gdbm? ( sys-libs/gdbm:= )
-	gui? ( x11-libs/libX11 )
-	postgres? ( dev-db/postgresql:* )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-Werror.patch
-	"${FILESDIR}"/${P}-implicit-int.patch
-)
-
-src_configure() {
-	local myconf=(
-		--disable-mcrypt
-		$(use_enable blowfish)
-		$(use_enable gdbm)
-		$(use_enable gui edwin)
-		$(use_enable gui imail)
-		$(use_enable gui x11)
-		$(use_enable postgres pgsql)
-		$(use_with gui x)
-	)
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	# Compile the "microcode" first, bug #879901
-	emake -C microcode
-
-	# Fails with multiple make-jobs, at least it compiles relatively fast.
-	emake -j1
-}
-
-# Tests that theoretically fail (still passes):
-# microcode/test-flonum-except
-# runtime/test-arith
-# runtime/test-flonum
-# runtime/test-flonum.bin
-# runtime/test-flonum.com
-
-src_test() {
-	FAST=y emake check -j1
-}
-
-src_install() {
-	default
-
-	# Create the edwin launcher.
-	use gui && make_wrapper mit-scheme-edwin 'mit-scheme --edit'
-
-	# Remove "scheme" symlink to not "discriminate" any other implementations.
-	rm "${ED}"/usr/bin/scheme || die
-
-	# Remove libtool files.
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild b/dev-scheme/mit-scheme/mit-scheme-12.1-r1.ebuild
index 97ddc30c4ab2..785388a9f324 100644
--- a/dev-scheme/mit-scheme/mit-scheme-12.1.ebuild
+++ b/dev-scheme/mit-scheme/mit-scheme-12.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit wrapper
+inherit toolchain-funcs wrapper
 
 DESCRIPTION="Scheme interpreter, compiler, debugger and runtime library"
 HOMEPAGE="https://www.gnu.org/software/mit-scheme/
@@ -16,7 +16,12 @@ SLOT="0"
 KEYWORDS="amd64"  # Additionally arm64 is officially supported.
 IUSE="blowfish gdbm gui postgres"
 
+BDEPEND="
+	virtual/pkgconfig
+"
+# Use ncurses to avoid ancient emulated termcap from 1980's, bug #871507
 RDEPEND="
+	sys-libs/ncurses
 	blowfish? ( dev-libs/openssl:= )
 	gdbm? ( sys-libs/gdbm:= )
 	gui? ( x11-libs/libX11 )
@@ -30,8 +35,20 @@ PATCHES=(
 )
 
 src_configure() {
+	local termcap
+
+	# ncurses provides termcap via terminfo which is found in "tinfo" when
+	# installed as ncurses[tinfo] and in "ncurses" when installed as
+	# ncurses[-tinfo].
+	if "$(tc-getPKG_CONFIG)" --exists tinfo ; then
+		termcap=tinfo
+	else
+		termcap=ncurses
+	fi
+
 	local -a myconf=(
 		--disable-mcrypt
+		--with-termcap=${termcap}
 		$(use_enable blowfish)
 		$(use_enable gdbm)
 		$(use_enable gui edwin)