gentoo resync : 20.03.2022

4 files changed, 101 insertions, 0 deletions

diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest
index c19f6b21ea84..aac013cb1e38 100644
--- a/app-shells/scsh/Manifest
+++ b/app-shells/scsh/Manifest
@@ -3,6 +3,11 @@ AUX 0.6.7-Makefile.in-LDFLAGS.patch 373 BLAKE2B 233142e105597caa0bd898bb0d50091f
 AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4100 BLAKE2B f1409dfbd0ff5c4cd67fe1e22ebcefffc0bf19a5cee27dfecbdad010bb794affc34ca32dbe0f919b092085f17ae2e21006900fa3360f1a99bcf30b20fff6794c SHA512 e2b647cb89f6972aece5172eea7f186bc9181b80138c7860972deb615959256eed4e99a5ff939a4e50ee6fae1de6e5cd870592f468749fc0df8d2a24e0ad0ee0
 AUX 0.6.7-Missing-includes.patch 583 BLAKE2B 59b0a0de190bb633696cb6c48f3cba48fe24b7561aca3af56e25cca68d1d4bdcbebf3bdc94836e46ddb0ec507dc1ddcba273b3c53046157c9e3c01a289aecc55 SHA512 dfe27f640d0b8c1e430be67ee0ca326720063ea3254d2c7ad91a9dc1de17cc32fac4158897250744de219b35665d1e74aa4ab3b64d3b323cf1bef1f560ffbc02
 AUX 0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch 298 BLAKE2B d1af7be2ab2e0a4322ca2f1b4111268e235fd0b8947bd843ea689c7fac9b15fd8549e9d12bd56c366a535812886ee652b3417f9d70c0db9050915335d84af4ef SHA512 61ccdecbb9f5b1c2a006d68df045a89c2e8299d24fca8e3ae8b96486fcae9af995dbb235d314ee573be2984df6fabcb44130b63abe62b7b30bd724b090d480ab
+AUX scsh-0.7-Makefile.in-LDFLAGS.patch 474 BLAKE2B 8f801b7c2e6883d41ca539e8bde0352caa5189d1398a7ef1138b13f7275f9a8fd20c5b2d83b3e9baa32005e8947f908cdbfc134d44427e5dee6855297459e4aa SHA512 0243c0b8378d5ebad2625a84c268f051fca6f836ca46bf0099b4163722eb29d8c24b9e9b125a37670a87873f03119387bcbafea072f8d9e86ad9f0dab392cbdf
+AUX scsh-0.7-test-packages.patch 246 BLAKE2B 7b7ac23a1af9a465137affb197413e87731e4dcde9fbb6a74fb6df7988a86ac4ab2f48824954d70fff02a2cbd584cfb08d5dcdcf5b0dd9cb029be62f0ada4dad SHA512 f646b447cd0f834191474b6a6ade50e23ee6c2f8ca1e7d0a5d1ab1026bf22533f79cc35226f00c45a0c1437bcb106e8f115bc89c2f5e748b4590b7a0bfb22564
 DIST scsh-0.6.7.tar.gz 4367439 BLAKE2B 40231f7744bea9efd58c10c042db7f3e8f4248726ebdc23e482590b53639e7f403b3a1ba9510fdda16a1216d26d71a692fc2ad42615d0a90161debbfdff34841 SHA512 d769b3d70afe813a3d25ef1b77d8dbc549b379ca41b0748cd90791408a36b33ed3ce08937bfd925bab411785aa671761d79bbf2edd9caf0c3ea6c44d90f4b6ea
+DIST scsh-0.7_pre20160820.tar.gz 227203 BLAKE2B 888a52a4866bfe4f8245fff4ca449a82cd67485aa8a3e8f67d20805f7120e62ed8dd37b7fe6139712652785d0d9f064bbeab0010722e9ce0b58bc59e44b054b3 SHA512 e2c223f64eb2a19dde19382dacad01aa04f8faabeeb15e1c1b3e28b2f675f4184825372f7aa281141797cd56f5ef999b4977dd7e68ae0a3b23631fd76182fba1
+DIST scsh-0.7_pre20160820_rx.tar.gz 46869 BLAKE2B 4be965c558cc21bde5fc24dee2ddc68a3e1d83d6b9701a7e484eb47c928ecdedfa896b944bbb1d709d014d9848a066a67a0d53f6dd86f435ea665ef99da1d40e SHA512 bc300f596b611ae296327b3046aa01cfb6b2be182c69abfe56e3e504573607d3dee55723b1d48951aa8534f450a0184fc7da0c1370fcffb9adba866ace3665b4
 EBUILD scsh-0.6.7-r3.ebuild 1307 BLAKE2B 47267f75e56be2fa181e9d17ee314a05280f8edd0a091956d5dc716fc852f8bf7f6a6aa608c3e71b34a439ac916b3395595e5182c709a00aacf7dd6f35c1b1c4 SHA512 e5caafd5cc80fc4741c49e0fa35831201bbb1e6103356410f2d6c5be362e2daeb0f03679046862c07ec3e87316b7f76c3f7e26db1469afb0f7f226fd42a4f24c
+EBUILD scsh-0.7_pre20160820.ebuild 1610 BLAKE2B 6744137e9b60ff25f8877801ee98a58f779455f263bcf95b09bbffb867ddbd9960eeefb54aa36a1bcdfa48e420a00854ca094bc0a784d705442d85f79228dc14 SHA512 abe41fd41b69471c53d86611ae18d611cd592176ef412dc65dfe8b604255d8c6f1629ab01f4ffd9ef46632858e2d03182e41d1d3ddf21189bc71afaf70da4747
 MISC metadata.xml 1014 BLAKE2B feb5ca286e21124c68dffd37b49b066b5b88e70a9aa23dd2995bdc19c78534eacf8da4854db415e6db9babeb143f20d2a64297c6e68d6408fb9e5f9d274b1df9 SHA512 db09274d5bd4e28c4fc000a189885143ffeaf988c09b910af679b3f6542b14e744b249755bcc9f40c511993acbd0586c29ca68d33c93eebb937044ec757e3ef2
diff --git a/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch
new file mode 100644
index 000000000000..b2431c908922
--- /dev/null
+++ b/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -126,13 +126,13 @@ SCHEME = scheme/command-line.scm \
+ 	 rx/regress.scm
+ 
+ go: c/scsh-tramp.c
+-	$(CC) -o $@ $(CFLAGS) \
++	$(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(SCHEME48VM)\" \
+ 	-DIMAGE=\"scsh.image\" \
+ 	$(srcdir)/c/scsh-tramp.c
+ 
+ scsh: c/scsh-tramp.c
+-	$(CC) -o $@ $(CFLAGS) \
++	$(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(SCHEME48VM)\" \
+ 	-DIMAGE=\"$(LIB)/scsh.image\" \
+ 	$(srcdir)/c/scsh-tramp.c
diff --git a/app-shells/scsh/files/scsh-0.7-test-packages.patch b/app-shells/scsh/files/scsh-0.7-test-packages.patch
new file mode 100644
index 000000000000..c16f9da1ab54
--- /dev/null
+++ b/app-shells/scsh/files/scsh-0.7-test-packages.patch
@@ -0,0 +1,9 @@
+--- a/test/test-packages.scm
++++ b/test/test-packages.scm
+@@ -112,6 +112,5 @@
+         file-name-maniplation-test
+         read-delimited-strings-test
+         bitwise-ops-test
+-        user-and-group-db-access-test
+         file-system-test))
+ 
diff --git a/app-shells/scsh/scsh-0.7_pre20160820.ebuild b/app-shells/scsh/scsh-0.7_pre20160820.ebuild
new file mode 100644
index 000000000000..f43099505e28
--- /dev/null
+++ b/app-shells/scsh/scsh-0.7_pre20160820.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_cut 1-2)
+
+# For snapshots: keep the hashes in sync with dev-scheme/scsh-lib
+SCSH_H=114432435e4eadd54334df6b37fcae505079b49f
+RX_H=d3231ad13de2b44e3ee173b1c9d09ff165e8b6d5
+
+# compatible scheme48 version
+SCHEME48V=1.9.2
+
+inherit autotools
+
+DESCRIPTION="Unix shell embedded in Scheme"
+HOMEPAGE="https://www.scsh.net/"
+SRC_URI="
+	https://github.com/scheme/scsh/archive/${SCSH_H}.tar.gz -> ${P}.tar.gz
+	https://github.com/scheme/rx/archive/${RX_H}.tar.gz -> ${P}_rx.tar.gz
+"
+S="${WORKDIR}/scsh-${SCSH_H}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# older versions were in conflict with scheme48's files, on the other hand,
+# new 2016 version uses scheme48
+RDEPEND="~dev-scheme/scsh-lib-${PV}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/scsh-${MY_PV}-Makefile.in-LDFLAGS.patch
+	"${FILESDIR}"/scsh-${MY_PV}-test-packages.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	tar xf "${DISTDIR}/${P}_rx.tar.gz" --strip-components 1 -C "${S}/rx/" ||
+		die "Failed to unpack ${P}_rx.tar.gz"
+}
+
+src_prepare() {
+	SCHEME48VM=/usr/$(get_libdir)/scheme48-${SCHEME48V}/scheme48vm
+	export SCHEME48VM
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-scheme48=${SCHEME48VM}
+}
+
+src_compile() {
+	emake SCHEME48VM=${SCHEME48VM}
+}
+
+src_install() {
+	emake SCHEME48VM=${SCHEME48VM} DESTDIR="${T}/install" \
+		  enough dirs install-scsh install-scsh-image
+
+	dobin "${T}"/install/usr/bin/scsh
+	insinto /usr/$(get_libdir)/scsh-${MY_PV}/
+	doins "${T}"/install/usr/$(get_libdir)/scsh-${MY_PV}/scsh.image
+}