gentoo resync : 20.03.2022

4 files changed, 3 insertions, 99 deletions

diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 510f3f8acb44..6851ec222ceb 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,7 +1,4 @@
-AUX stklos-1.10-gentoo.patch 1090 BLAKE2B aed70b104b1f28e59feafd9b04ae687244e96dff3656b4aa893e46a3af398189d4b0721ff59ffc4aedf9f81d5271899b5488544f4b13e41bd6ad6797c9de6560 SHA512 cddb0f5be61cf4bc3a55c79a576aedf99583ebe0f7a6cfc883bc8991d4e1c78678b853f9a4f65dcceb53477fabe0d9c53acb60e0957f35f45be16dc6c32bc642
 AUX stklos-1.70-gentoo.patch 1937 BLAKE2B 42c534b6d84bc1c3a541bcb8e68ba0abf097f4ad0a1012df1a153ebed918bf2ea37e0c505c33cbdf07ab9dc57372df37a3fdefb3864201497f1cca6bfe888b64 SHA512 05f9c3263e46902c149cd4131c32092b24e4d2499596faa9c6d0d448a1e92a06eac466458e3cca5e688fa4a07e5e870ff81ca4d5a4171c50217b942ebf4850df
-DIST stklos-1.10.tar.gz 6097807 BLAKE2B bfb957c54626d29cc1ecba553a0b982022b1ed0b89f333d763937e8c5f84b5c6b80ebc1e6531d968f4b33d72427a4f9957c010932308672907e105d37828ee50 SHA512 64877dec82b4c19bcaea95f6c60a4b9dff19c11bf11792fa5204d0ca3bb6f6962cc9250b35dcd5f01015e430b9a027add4f40c6a7169858893cab3e8c8df0bbb
 DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9dcccc47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f
-EBUILD stklos-1.10-r2.ebuild 937 BLAKE2B 0754fe68a803e9e821bc4918f67631eb86510fd233b7918fc12ace0d4c5ebebd5e7f131b5e5080f459f664e567d436664321ccf4b5b325676ef0907c737e448b SHA512 4d27df2b8cc80f31caf554aa0de568dd28d143a9353ae8ca9e8fb8181aaac22e312acfec75d7d83286d3a5f1b51b56dc911a65f7dfa5b3ee912a256783cc76db
-EBUILD stklos-1.70.ebuild 1012 BLAKE2B 2424a767067de671080bd94175d44297e3e3956e0b9f0a3d3a925a0b08c1961ab27f220518b4c82a141d8ef49125c3c608781140f00cfea6378d8ae772000841 SHA512 42859e74c39709de5e7ef00fbac67c3c4e1a7a4afc6ba55dbb6758a1e1b0a8acf883f8f9a64e9691679e974dacb7190b30debaea3ee6c2ca92e9243547f268d0
+EBUILD stklos-1.70.ebuild 1010 BLAKE2B 16443bb3410300e26513ca3b932726452216904d3343c52f7fc78f2315684eca1b82956414d7d5ca85146f407113d7b9ce7db1ef64bd55ca5d295792768203c1 SHA512 9890fbafa369de3b458747a38ae63744bd9e2641fac6c9657f7d5a75cd1005bb069218de5943da9b02dad1c0250981b85080fd0d6c36ebda79eb994c4ce51a64
 MISC metadata.xml 603 BLAKE2B 631cd06bdc3a5b14371ffd07f6cde777eb99506a4383720a11395e4633f1fdb74d271b1a0e561e1b5bf64e55328186c2ca25870381e0283b46a5868550d5c925 SHA512 89db69dcb36c87b58587aef86590de1391e215213b444e135aa144fd78bf9b9ddbd366a07562e5de2f000e6b66f387ec24e0a56698ce076b8304288868a25859
diff --git a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch
deleted file mode 100644
index 56f5440cf1dc..000000000000
--- a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -4,7 +4,6 @@
- #    Creation date: 11-Apr-2000 10:30 (eg)
- # Last file update: 23-Oct-2010 11:52 (eg)
- 
--mandir	      = $(prefix)/share/man
- man_MANS      = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \
- 	        stklos-pkg.1
- EXTRA_DIST    = $(man_MANS)
-@@ -16,15 +16,13 @@
- schemedir   = $(prefix)/share/@PACKAGE@/@VERSION@
- scheme_DATA = DOCDB
- 
--doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@
--
--docpdfdir   = $(doclocation)/pdf
-+docpdfdir   = $(pdfdir)
- docpdf_DATA = pdf/stklos-ref.pdf
- 
--dochtmldir  = $(doclocation)/html
-+dochtmldir  = $(htmldir)
- dochtml_DATA= $(wildcard html/stklos-ref*.html) $(wildcard html/*.css)
- 
--docimgdir   = $(doclocation)/html/images
-+docimgdir   = $(htmldir)/images
- docimg_DATA = $(wildcard html/images/*)
- 
- 
---- a/pkgman/Makefile.am
-+++ b/pkgman/Makefile.am
-@@ -4,7 +4,7 @@
- # Last file update:  4-Dec-2011 16:48 (eg)
- 
- 
--makefiledir=  $(prefix)/etc/stklos
-+makefiledir=  $(prefix)/share/@PACKAGE@/@VERSION@/etc
- makefile_DATA= etc/Makefile-scmpkg.tmpl
- 
- bin_SCRIPTS = stklos-pkg
diff --git a/dev-scheme/stklos/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild
deleted file mode 100644
index 72aa6c496083..000000000000
--- a/dev-scheme/stklos/stklos-1.10-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="https://www.stklos.net/"
-SRC_URI="https://www.${PN}.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads"
-
-RDEPEND="dev-libs/boehm-gc[threads?]
-	dev-libs/gmp:=
-	dev-libs/libffi:=
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-DOCS=( AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS )
-
-src_prepare() {
-	rm -rf {ffi,gc,gmp,pcre}
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-threads=$(usex threads pthreads none) \
-		--without-gmp-light \
-		--without-provided-ffi \
-		--without-provided-gc \
-		--without-provided-regexp
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	einstalldocs
-}
diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70.ebuild
index 74b2eb58dcf5..d138654b1211 100644
--- a/dev-scheme/stklos/stklos-1.70.ebuild
+++ b/dev-scheme/stklos/stklos-1.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="https://www.${PN}.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="threads"
 
 RDEPEND="dev-libs/boehm-gc[threads?]