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>[email protected]</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>[email protected]</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 }
