[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/files/, app-shells/scsh/

[Maciej Barć]

commit:     ca8c43d3d9c60c241f8d91205901ec3de7d100ca
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 19:54:29 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 20:39:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca8c43d3

app-shells/scsh: bump to 0.7_pre20160820

Closes: https://github.com/gentoo/gentoo/pull/22703
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-shells/scsh/Manifest                           |  2 +
 .../scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch  | 18 ++++++
 app-shells/scsh/files/scsh-0.7-test-packages.patch |  9 +++
 app-shells/scsh/scsh-0.7_pre20160820.ebuild        | 69 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest
index 5c815ea83efb..ede7ef03f689 100644
--- a/app-shells/scsh/Manifest
+++ b/app-shells/scsh/Manifest
@@ -1 +1,3 @@
 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

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
+}