[gentoo-commits] repo/proj/guru:master commit in: dev-scheme/chez/files/, dev-scheme/chez/

[gentoo-commits] repo/proj/guru:master commit in: dev-scheme/chez/files/, dev-scheme/chez/

[Andrew Ammerlaan]

commit:     431e9641a774c22027a6ddfd9e65143495fc2ee5
Author:     Maciej Barć <xgqt <AT> riseup <DOT> net>
AuthorDate: Thu Jun 24 20:35:19 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 20:35:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=431e9641

dev-scheme/chez: update with tweaks from the "src_prepare-overlay"

Signed-off-by: Maciej Barć <xgqt <AT> riseup.net>

 dev-scheme/chez/Manifest          |  2 +-
 dev-scheme/chez/chez-9.5.4.ebuild | 41 ++++++++++++++++++++++++++-------------
 dev-scheme/chez/files/tinfo.patch | 26 +++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index 25b85f466..ea8a4b91e 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1 +1 @@
-DIST csv9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123
+DIST chez-9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123

diff --git a/dev-scheme/chez/chez-9.5.4.ebuild b/dev-scheme/chez/chez-9.5.4.ebuild
index 3276978f7..f8640fadb 100644
--- a/dev-scheme/chez/chez-9.5.4.ebuild
+++ b/dev-scheme/chez/chez-9.5.4.ebuild
@@ -3,40 +3,53 @@
 
 EAPI=7
 
-MY_PN="csv"
-MY_P="${MY_PN}${PV}"
+CSV="csv${PV}"
+
+inherit multilib
 
 DESCRIPTION="A programming language based on R6RS"
 HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
-SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
 
 # Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
 # Nanopass (MIT), stex (MIT), and zlib (ZLIB).
 LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples threads"
+IUSE="X examples ncurses threads"
+
+S="${WORKDIR}/${CSV}"
 
-S="${WORKDIR}"/${MY_P}
+src_prepare() {
+	default
+
+	if use ncurses; then
+		eapply "${FILESDIR}/tinfo.patch"
+	fi
+}
 
 src_configure() {
 	local myconfargs=(
-		--64
+		$(usex threads '--threads' '')
+		$(usex ncurses '' '--disable-curses')
+		$(usex X '' '--disable-x11')
+		--installprefix="/usr"
+		--installbin="/usr/$(get_libdir)/${CSV}"
+		--installlib="/usr/$(get_libdir)"
+		--installman="/usr/share/man"
+		--temproot="${D}"
 		--installschemename=chezscheme
 		--installpetitename=chezscheme-petite
 		--installscriptname=chezscheme-script
-		--installprefix="${EPREFIX}"/usr
 		--nogzip-man-pages
-		--disable-curses # TODO: ncurses USE flag.
-		--disable-x11 # TODO: X USE flag.
 	)
-
-	use threads && myconfargs+=(--threads)
-
 	./configure "${myconfargs[@]}" || die
 }
 
 src_install() {
-	emake install TempRoot="${D}"
-	use examples || rm -r "${D}"/usr/lib/${MY_P}/examples || die
+	default
+
+	if ! use examples; then
+		rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
+	fi
 }

diff --git a/dev-scheme/chez/files/tinfo.patch b/dev-scheme/chez/files/tinfo.patch
new file mode 100644
index 000000000..8393710cc
--- /dev/null
+++ b/dev-scheme/chez/files/tinfo.patch
@@ -0,0 +1,26 @@
+diff --git a/c/Mf-a6le b/c/Mf-a6le
+index 1564cce..0cf0bd4 100644
+--- a/c/Mf-a6le
++++ b/c/Mf-a6le
+@@ -16,7 +16,7 @@
+ m = a6le
+ Cpu = X86_64
+ 
+-mdclib = -lm -ldl ${ncursesLib} -lrt -luuid
++mdclib = -lm -ldl ${ncursesLib} -lrt -luuid -ltinfo
+ C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS}
+ o = o
+ mdsrc = i3le.c
+diff --git a/c/Mf-ta6le b/c/Mf-ta6le
+index 6adb83f..7f4d805 100644
+--- a/c/Mf-ta6le
++++ b/c/Mf-ta6le
+@@ -16,7 +16,7 @@
+ m = ta6le
+ Cpu = X86_64
+ 
+-mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid
++mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid -ltinfo
+ C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS}
+ o = o
+ mdsrc = i3le.c