* [gentoo-commits] repo/proj/guru:dev commit in: dev-scheme/chez/, dev-scheme/chez/files/
@ 2021-06-24 20:38 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2021-06-24 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 431e9641a774c22027a6ddfd9e65143495fc2ee5
Author: Maciej Barć <xgqt <AT> riseup <DOT> net>
AuthorDate: Thu Jun 24 20:35:19 2021 +0000
Commit: Maciej Barć <xgqt <AT> riseup <DOT> net>
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-scheme/chez/, dev-scheme/chez/files/
@ 2021-11-25 17:43 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2021-11-25 17:43 UTC (permalink / raw
To: gentoo-commits
commit: f7787d9c77fcbe88cd8470809fd17b6d7da6f87a
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 17:43:38 2021 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 17:43:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f7787d9c
dev-scheme: move chez to ::gentoo
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-scheme/chez/Manifest | 2 --
dev-scheme/chez/chez-9.5.4-r1.ebuild | 62 ------------------------------------
dev-scheme/chez/chez-9.5.6-r1.ebuild | 62 ------------------------------------
dev-scheme/chez/files/tinfo.patch | 26 ---------------
dev-scheme/chez/metadata.xml | 29 -----------------
5 files changed, 181 deletions(-)
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
deleted file mode 100644
index 905f42a92..000000000
--- a/dev-scheme/chez/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST chez-9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123
-DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
diff --git a/dev-scheme/chez/chez-9.5.4-r1.ebuild b/dev-scheme/chez/chez-9.5.4-r1.ebuild
deleted file mode 100644
index a08526e78..000000000
--- a/dev-scheme/chez/chez-9.5.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}/${CSV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${CSV}"
-
-# 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="X examples ncurses threads"
-
-DEPEND="
- X? ( x11-libs/libX11 )
- ncurses? ( sys-libs/ncurses )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- tc-export AR CC CXX LD RANLIB
-
- if use ncurses; then
- eapply "${FILESDIR}/tinfo.patch"
- fi
-
- default
-}
-
-src_configure() {
- local myconfargs=(
- $(usex threads '--threads' '')
- $(usex ncurses '' '--disable-curses')
- $(usex X '' '--disable-x11')
- --installprefix="/usr"
- --installbin="/usr/bin"
- --installlib="/usr/$(get_libdir)"
- --installman="/usr/share/man"
- --temproot="${D}"
- --installschemename=chezscheme
- --installpetitename=chezscheme-petite
- --installscriptname=chezscheme-script
- --nogzip-man-pages
- )
- sh ./configure "${myconfargs[@]}" || die
-}
-
-src_install() {
- default
-
- if ! use examples; then
- rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
- fi
-}
diff --git a/dev-scheme/chez/chez-9.5.6-r1.ebuild b/dev-scheme/chez/chez-9.5.6-r1.ebuild
deleted file mode 100644
index a08526e78..000000000
--- a/dev-scheme/chez/chez-9.5.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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}/${CSV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${CSV}"
-
-# 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="X examples ncurses threads"
-
-DEPEND="
- X? ( x11-libs/libX11 )
- ncurses? ( sys-libs/ncurses )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- tc-export AR CC CXX LD RANLIB
-
- if use ncurses; then
- eapply "${FILESDIR}/tinfo.patch"
- fi
-
- default
-}
-
-src_configure() {
- local myconfargs=(
- $(usex threads '--threads' '')
- $(usex ncurses '' '--disable-curses')
- $(usex X '' '--disable-x11')
- --installprefix="/usr"
- --installbin="/usr/bin"
- --installlib="/usr/$(get_libdir)"
- --installman="/usr/share/man"
- --temproot="${D}"
- --installschemename=chezscheme
- --installpetitename=chezscheme-petite
- --installscriptname=chezscheme-script
- --nogzip-man-pages
- )
- sh ./configure "${myconfargs[@]}" || die
-}
-
-src_install() {
- 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
deleted file mode 100644
index 8393710cc..000000000
--- a/dev-scheme/chez/files/tinfo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
diff --git a/dev-scheme/chez/metadata.xml b/dev-scheme/chez/metadata.xml
deleted file mode 100644
index 1eeae5775..000000000
--- a/dev-scheme/chez/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>matt@offtopica.uk</email>
- <name>Matt Smith</name>
- </maintainer>
- <maintainer type="person">
- <email>xgqt@riseup.net</email>
- <name>Maciej Barć</name>
- </maintainer>
- <longdescription lang="en">
- Chez Scheme is both a programming language and an implementation
- of that language, with supporting tools and documentation.
-
- As a superset of the language described in the Revised6 Report on
- the Algorithmic Language Scheme (R6RS), Chez Scheme supports all
- standard features of Scheme, including first-class procedures,
- proper treatment of tail calls, continuations, user-defined
- records, libraries, exceptions, and hygienic macro expansion.
-
- Chez Scheme also includes extensive support for interfacing with C
- and other languages, support for multiple threads possibly running
- on multiple cores, non-blocking I/O, and many other features.
- </longdescription>
- <upstream>
- <remote-id type="github">cisco/ChezScheme</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-25 17:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-25 17:43 [gentoo-commits] repo/proj/guru:dev commit in: dev-scheme/chez/, dev-scheme/chez/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2021-06-24 20:38 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox