| 1 |
commit: 431e9641a774c22027a6ddfd9e65143495fc2ee5 |
| 2 |
Author: Maciej Barć <xgqt <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Thu Jun 24 20:35:19 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 24 20:35:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=431e9641 |
| 7 |
|
| 8 |
dev-scheme/chez: update with tweaks from the "src_prepare-overlay" |
| 9 |
|
| 10 |
Signed-off-by: Maciej Barć <xgqt <AT> riseup.net> |
| 11 |
|
| 12 |
dev-scheme/chez/Manifest | 2 +- |
| 13 |
dev-scheme/chez/chez-9.5.4.ebuild | 41 ++++++++++++++++++++++++++------------- |
| 14 |
dev-scheme/chez/files/tinfo.patch | 26 +++++++++++++++++++++++++ |
| 15 |
3 files changed, 54 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest |
| 18 |
index 25b85f466..ea8a4b91e 100644 |
| 19 |
--- a/dev-scheme/chez/Manifest |
| 20 |
+++ b/dev-scheme/chez/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST csv9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123 |
| 23 |
+DIST chez-9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123 |
| 24 |
|
| 25 |
diff --git a/dev-scheme/chez/chez-9.5.4.ebuild b/dev-scheme/chez/chez-9.5.4.ebuild |
| 26 |
index 3276978f7..f8640fadb 100644 |
| 27 |
--- a/dev-scheme/chez/chez-9.5.4.ebuild |
| 28 |
+++ b/dev-scheme/chez/chez-9.5.4.ebuild |
| 29 |
@@ -3,40 +3,53 @@ |
| 30 |
|
| 31 |
EAPI=7 |
| 32 |
|
| 33 |
-MY_PN="csv" |
| 34 |
-MY_P="${MY_PN}${PV}" |
| 35 |
+CSV="csv${PV}" |
| 36 |
+ |
| 37 |
+inherit multilib |
| 38 |
|
| 39 |
DESCRIPTION="A programming language based on R6RS" |
| 40 |
HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme" |
| 41 |
-SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${MY_P}.tar.gz" |
| 42 |
+SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz" |
| 43 |
|
| 44 |
# Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2), |
| 45 |
# Nanopass (MIT), stex (MIT), and zlib (ZLIB). |
| 46 |
LICENSE="Apache-2.0 BSD-2 MIT ZLIB" |
| 47 |
SLOT="0" |
| 48 |
KEYWORDS="~amd64" |
| 49 |
-IUSE="examples threads" |
| 50 |
+IUSE="X examples ncurses threads" |
| 51 |
+ |
| 52 |
+S="${WORKDIR}/${CSV}" |
| 53 |
|
| 54 |
-S="${WORKDIR}"/${MY_P} |
| 55 |
+src_prepare() { |
| 56 |
+ default |
| 57 |
+ |
| 58 |
+ if use ncurses; then |
| 59 |
+ eapply "${FILESDIR}/tinfo.patch" |
| 60 |
+ fi |
| 61 |
+} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
local myconfargs=( |
| 65 |
- --64 |
| 66 |
+ $(usex threads '--threads' '') |
| 67 |
+ $(usex ncurses '' '--disable-curses') |
| 68 |
+ $(usex X '' '--disable-x11') |
| 69 |
+ --installprefix="/usr" |
| 70 |
+ --installbin="/usr/$(get_libdir)/${CSV}" |
| 71 |
+ --installlib="/usr/$(get_libdir)" |
| 72 |
+ --installman="/usr/share/man" |
| 73 |
+ --temproot="${D}" |
| 74 |
--installschemename=chezscheme |
| 75 |
--installpetitename=chezscheme-petite |
| 76 |
--installscriptname=chezscheme-script |
| 77 |
- --installprefix="${EPREFIX}"/usr |
| 78 |
--nogzip-man-pages |
| 79 |
- --disable-curses # TODO: ncurses USE flag. |
| 80 |
- --disable-x11 # TODO: X USE flag. |
| 81 |
) |
| 82 |
- |
| 83 |
- use threads && myconfargs+=(--threads) |
| 84 |
- |
| 85 |
./configure "${myconfargs[@]}" || die |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
- emake install TempRoot="${D}" |
| 90 |
- use examples || rm -r "${D}"/usr/lib/${MY_P}/examples || die |
| 91 |
+ default |
| 92 |
+ |
| 93 |
+ if ! use examples; then |
| 94 |
+ rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die |
| 95 |
+ fi |
| 96 |
} |
| 97 |
|
| 98 |
diff --git a/dev-scheme/chez/files/tinfo.patch b/dev-scheme/chez/files/tinfo.patch |
| 99 |
new file mode 100644 |
| 100 |
index 000000000..8393710cc |
| 101 |
--- /dev/null |
| 102 |
+++ b/dev-scheme/chez/files/tinfo.patch |
| 103 |
@@ -0,0 +1,26 @@ |
| 104 |
+diff --git a/c/Mf-a6le b/c/Mf-a6le |
| 105 |
+index 1564cce..0cf0bd4 100644 |
| 106 |
+--- a/c/Mf-a6le |
| 107 |
++++ b/c/Mf-a6le |
| 108 |
+@@ -16,7 +16,7 @@ |
| 109 |
+ m = a6le |
| 110 |
+ Cpu = X86_64 |
| 111 |
+ |
| 112 |
+-mdclib = -lm -ldl ${ncursesLib} -lrt -luuid |
| 113 |
++mdclib = -lm -ldl ${ncursesLib} -lrt -luuid -ltinfo |
| 114 |
+ C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS} |
| 115 |
+ o = o |
| 116 |
+ mdsrc = i3le.c |
| 117 |
+diff --git a/c/Mf-ta6le b/c/Mf-ta6le |
| 118 |
+index 6adb83f..7f4d805 100644 |
| 119 |
+--- a/c/Mf-ta6le |
| 120 |
++++ b/c/Mf-ta6le |
| 121 |
+@@ -16,7 +16,7 @@ |
| 122 |
+ m = ta6le |
| 123 |
+ Cpu = X86_64 |
| 124 |
+ |
| 125 |
+-mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid |
| 126 |
++mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid -ltinfo |
| 127 |
+ C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS} |
| 128 |
+ o = o |
| 129 |
+ mdsrc = i3le.c |
Archives