gentoo resync : 13.11.2021

3 files changed, 45 insertions, 40 deletions

diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index 860b941b3cce..f45bc1e8e570 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,5 +1,5 @@
 AUX 50scheme48-gentoo.el 198 BLAKE2B 48b8efe86b0392d03a5456680f05b7dcc810757a80bab44a6af5adc43d97179b41880a2f4910bed5c408e5162c9498cc3b3a9fd865629cc230032aade98eb4b7 SHA512 874355b78d5ddcc55add22d7171ae92e4115c8e84883a89e76848ad362c070c00d8ec12e1841eabd1bc0d2a786d789e36f3f109b0d3e5dd879a9faca1fb8e4b7
 AUX CVE-2014-4150.patch 407 BLAKE2B 7f71707166eaaf668c28b5af41cfd50c73790962cc70630ddc4ac6a615943f399eaecc9a1719d72f4679eefdde035c1bde6e5c57b1680f45b871a89008adb4c2 SHA512 b15b5c9ccc1cf2fba1c15244a4ec0a08d49188fc3476ee1abea74d4415cbd59e94d1a5ad7be39b73fd82a393e29a13569a8178017b6ca82320646a1ac9260eb7
 DIST scheme48-1.9.2.tgz 3951356 BLAKE2B 5a021c80d9986d51e9a9be9a469aa21f4e782e6464e5ccd51d3fdc3e7bd58f5151cafe5f81ec5f48ceeabfc235de6e8412dc18462a417932eb98db9e82d26045 SHA512 a854e3c6f5b02c585fa125899dee276500b91e21cc773202fd4cb84f2e0566a0e19cc34b5f96a3265fab6bf06422e869a2e48433eb2d8fac83a1179fda62e2d1
-EBUILD scheme48-1.9.2-r1.ebuild 1451 BLAKE2B b00533095c20e65cf4f49121ddf2f1abe12069f8b677cf9ef6cbf6908e7f1384bffbe1bcb36bfed09a8fee6a892c4f1415a7a93e60d2336e9b611c22d232316b SHA512 a21b45e2bad4d6913f728d51ad8f4bdd0bc31db430ee050ed5b755b9a3f2c94e14e6b07c124c94af0639e13fea76dc80dc6b79d2086e12a5b91f11a63ad951dd
-MISC metadata.xml 536 BLAKE2B 5f1bfcd15449b0c92dc1a90d0701ba9e5a1d59113ee05fc98377eba6f897cb7e7b64051d0a36457d37facffc103b6bb6005cde24015fa5ed7817825fa57b4304 SHA512 20948dc24f25bceb2baa30381f8aa4d466d5df6e134cc8324ffb5a1794bf9c25703b17fe0f492273b68fe60d920c7eaf5b6091510de7f78ae4cdad9773098f62
+EBUILD scheme48-1.9.2-r2.ebuild 1445 BLAKE2B e45c30c04c25e4bad65d0a22d396d0e5d63e6dceb20b27d4b1e0173c410b3be1bb80b2b7dd93a7cb52c98c5a6e34228b3fb73432b1874e65d443ab4feced6288 SHA512 a8fd46738acdb29e1cc1ac179e3c03c054603b3ea51f472300bbe836a1cc9131c12d6b78711dcaec3dc7004a68cde291258a86c1aaaa074e956ffe98d15c1801
+MISC metadata.xml 550 BLAKE2B e568bc7acb3481317aa5b19dce8ab41272eec5ffaa7dbf8657c8b050ab3ae39e9fced2ba41f6e98be93f3daab3ee84f62fc0e25efa395b35e51125968b35d83a SHA512 598c84b6594c45d50431658f69028ca824645d5fd007d7e4b98b07678f59048e9967e5c68b234e947710e6e25246bdd43fec25593a5bec353b9cbc1bdd716134
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index c3094c04edfa..6a5fffa960e3 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
index ab6fbfde0f60..16a051638906 100644
--- a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r2.ebuild
@@ -1,37 +1,49 @@
 # 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
+inherit elisp-common flag-o-matic toolchain-funcs
 
 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"
 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
 }
 
@@ -39,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
 }