* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-01-06 22:31 Fabian Groffen
0 siblings, 0 replies; 6+ messages in thread
From: Fabian Groffen @ 2021-01-06 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 18d93c57547c6738003514317ddb91fda520e599
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 22:31:25 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 22:31:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d93c57
dev-scheme/scheme48: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
index 0fce39d5a32..971ae3a1906 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc emacs"
DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-11-06 9:21 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-06 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 3f33a4f294ba654fd5cf2584c9defba2d3ca2b44
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 09:15:33 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 09:20:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f33a4f2
dev-scheme/scheme48: do not call ar and ranlib directly
Closes: https://bugs.gentoo.org/724034
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
index cc25b461daf..f8c9cd599d6 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-inherit elisp-common epatch flag-o-matic
+inherit elisp-common epatch flag-o-matic toolchain-funcs
DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
HOMEPAGE="https://www.s48.org/"
@@ -21,7 +21,11 @@ SITEFILE=50scheme48-gentoo.el
src_prepare() {
epatch "${FILESDIR}"/CVE-2014-4150.patch
- sed -i "/# Cygwin/,/fi/d" Makefile.in
+ sed -i \
+ -e "/# Cygwin/,/fi/d" \
+ -e "s/\tar /\t$(tc-getAR) /" \
+ -e "s/\tranlib/\t$(tc-getRANLIB) /" \
+ Makefile.in
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-11-06 9:21 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-06 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 13879fa1a69dd8bceee60c7755ef9f1c503d1053
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 09:11:30 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 09:20:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13879fa1
dev-scheme/scheme48: update HOMEPAGE and SRC_URI
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
index ab6fbfde0f6..defcff5691d 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=5
inherit elisp-common epatch flag-o-matic
DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
-HOMEPAGE="http://www.s48.org/"
-SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
+HOMEPAGE="https://www.s48.org/"
+SRC_URI="https://www.s48.org/${PV}/${P}.tgz"
LICENSE="BSD"
SLOT="0"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-11-06 9:21 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-06 9:21 UTC (permalink / raw
To: gentoo-commits
commit: 16fc3e3f9809bbd732700deaf42838374a10e326
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 09:20:00 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 09:20:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16fc3e3f
dev-scheme/scheme48: update to EAPI 8
Closes: https://bugs.gentoo.org/819600
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/scheme48/metadata.xml | 19 ++++----
...48-1.9.2-r1.ebuild => scheme48-1.9.2-r2.ebuild} | 53 +++++++++++-----------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index c3094c04edf..a1a67089712 100644
--- a/dev-scheme/scheme48/metadata.xml
+++ b/dev-scheme/scheme48/metadata.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>scheme@gentoo.org</email>
- <name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription lang="en">
-Scheme 48 is an implementation of Scheme written by Richard Kelsey and Jonathan
-Rees. It is based on a byte-code interpreter and is designed to be used as a
-testbed for experiments in implementation techniques and as an expository tool.
-</longdescription>
+ <maintainer type="project">
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Scheme 48 is an implementation of Scheme written by Richard Kelsey and
+ Jonathan Rees. It is based on a byte-code interpreter and is designed
+ to be used as a testbed for experiments in implementation techniques
+ and as an expository tool.
+ </longdescription>
</pkgmetadata>
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
similarity index 60%
rename from dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
rename to dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
index f8c9cd599d6..16a05163890 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="8"
-inherit elisp-common epatch flag-o-matic toolchain-funcs
+inherit elisp-common flag-o-matic toolchain-funcs
DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
HOMEPAGE="https://www.s48.org/"
@@ -14,29 +14,36 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc emacs"
-DEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
-SITEFILE=50scheme48-gentoo.el
+PATCHES=( "${FILESDIR}"/CVE-2014-4150.patch )
+
+SITEFILE="50${PN}-gentoo.el"
src_prepare() {
- epatch "${FILESDIR}"/CVE-2014-4150.patch
+ default
+
+ append-cflags -fno-strict-aliasing
+
sed -i \
-e "/# Cygwin/,/fi/d" \
-e "s/\tar /\t$(tc-getAR) /" \
-e "s/\tranlib/\t$(tc-getRANLIB) /" \
+ -e "/\/COPYING/d" \
+ -e "/for .*html/,/done/d" \
Makefile.in
}
src_configure() {
- append-cflags -fno-strict-aliasing
econf --docdir=/usr/share/doc/${PF}
}
src_compile() {
- emake
+ default
+
if use emacs; then
- elisp-compile "${S}"/emacs/cmuscheme48.el
+ elisp-compile emacs/*.el
fi
}
@@ -44,28 +51,20 @@ src_install() {
# weird parallel failures!
emake -j1 DESTDIR="${D}" install
- if use emacs; then
- elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- dodoc README
if use doc; then
- dodoc doc/*.txt
- docinto src
- dodoc doc/src/*
- pushd "${ED}/usr/share/doc/${P}" > /dev/null
- install -dm755 html
- mv *.html *.css *.gif html/
- popd > /dev/null
+ DOCS=( README doc/*.txt )
+ HTML_DOCS=( doc/html/. )
else
- pushd "${ED}/usr/share/doc/${P}" > /dev/null
- rm -f *.html *.css *.gif
- rm -f manu*
- popd > /dev/null
+ rm -f "${ED}"/usr/share/doc/${PF}/man*
+ fi
+ einstalldocs
+
+ if use emacs; then
+ elisp-install ${PN} emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
fi
- #this symlink clashes with gambit
+ # this symlink clashes with gambit
rm "${ED}"/usr/bin/scheme-r5rs || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-11-06 9:21 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-06 9:21 UTC (permalink / raw
To: gentoo-commits
commit: a574b6a2233d7c5dc0b5350ae649e1cea957b707
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 09:13:15 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 09:20:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a574b6a2
dev-scheme/scheme48: fix build with sys-devel/binutils[multitarget]
Closes: https://bugs.gentoo.org/579552
Closes: https://bugs.gentoo.org/591436
Closes: https://bugs.gentoo.org/725476
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
index defcff5691d..cc25b461daf 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -21,6 +21,7 @@ SITEFILE=50scheme48-gentoo.el
src_prepare() {
epatch "${FILESDIR}"/CVE-2014-4150.patch
+ sed -i "/# Cygwin/,/fi/d" Makefile.in
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/
@ 2021-11-06 14:45 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2021-11-06 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 221034311da554c4753ed04d5e1bbf0727670e08
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 14:44:21 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 14:44:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22103431
dev-scheme/scheme48: update metadata.xml
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/scheme48/metadata.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index a1a67089712..6a5fffa960e 100644
--- a/dev-scheme/scheme48/metadata.xml
+++ b/dev-scheme/scheme48/metadata.xml
@@ -6,9 +6,9 @@
<name>Gentoo Scheme Project</name>
</maintainer>
<longdescription lang="en">
- Scheme 48 is an implementation of Scheme written by Richard Kelsey and
- Jonathan Rees. It is based on a byte-code interpreter and is designed
- to be used as a testbed for experiments in implementation techniques
- and as an expository tool.
+ Scheme 48 is an implementation of Scheme written by Richard Kelsey and
+ Jonathan Rees. It is based on a byte-code interpreter and is designed
+ to be used as a testbed for experiments in implementation techniques
+ and as an expository tool.
</longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-06 14:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-06 9:21 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/scheme48/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2021-11-06 14:45 Akinori Hattori
2021-11-06 9:21 Akinori Hattori
2021-11-06 9:21 Akinori Hattori
2021-11-06 9:21 Akinori Hattori
2021-01-06 22:31 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox