gentoo resync : 20.10.2021

5 files changed, 2 insertions, 97 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e0625fc39ec1..6d9f934d7dac 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 206d844db51b..c9c37dae8dd3 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,13 +1,10 @@
 AUX gauche-0.9.10-srfi-134.patch 2281 BLAKE2B 5854b345162f319092090578afa8899d129e865ed75e5902d3518cd736e7268453dc4f4043fbdac5d90073026e8fcd28e2a42b911021da0dc44047dfd7cd9e18 SHA512 797267d2276b90736c0824566b1c9218399d0e68e972fa53830dfb85ad6946b2a6ad2a19aaabbba9aa63c1c36b5628856318a4d3b328b1cbed0ca3ac5f73c8b5
-AUX gauche-0.9.9-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
 AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
 AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1248 BLAKE2B 8c87339d3739da774da858f43345bb6063fe2fafdfda3e791a67aee7773be4c1312c11aa37f1532203a7e1d4805cf3fa0ec80ce28f52d05c43df8536efa199a2 SHA512 7cbbfc17ef28aaa29dffe03d2d8afa01cc92897f5c08c9ba1ddd7926d45207100a44ccb8efd745f2f98c8d9a83ca0ca20a6c611329c3a80dea5692002467c52b
 DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
-DIST Gauche-0.9.9.tgz 7244347 BLAKE2B 843fe0c7341c7020ad9130edfc41f02eeda0bc2e1f8983f83faf443f69073e132a9a2f37e6a6260334ab9aacc3e976a2df68d4c43f17f6ea07531c14e783efec SHA512 ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210
 DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed
-EBUILD gauche-0.9.10-r1.ebuild 1459 BLAKE2B 33c286bf6e4570a0b6697121bf139b43e569419d7c3d34881a848ee2c4c97edf6344821686df602090b3b20f65aeb28a38e5c9c6c171f6f4c718aee48cdb914f SHA512 21df43f60357dd9cefdc94f2d229496445e88d5f2c0f27a9f6919b106dd83e41e8d01529e94b58c2ba49f2b5f308d92cfb0b7f0d0a7465b7c4bf47747f2a3619
-EBUILD gauche-0.9.9-r1.ebuild 1316 BLAKE2B de13080f72dcd6b2b177febd87de0962325f40e8742a4ad772bebe7e60a5e7211740b4ea8d67946881adb5c548fd7632b67243693c61be683186d3ad16563236 SHA512 f5f5cf91fb8a55d3b16d70cd916c242deac31958f4c9e11ceba160a2939c1b93e39211167a9b1b3bf3a739e50e84a86f76ab681d757b69bbb9d7297aca3d66a5
+EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B d1e08267cb94f5b45041af19a97ef6132d4aed73e2c07ad90d8a42817bef0aca0ebcc3aabcdce978efa2c0d86bb11bf02cfadb7c9bc240ba602307d56f9acdff SHA512 ddbea54c152b3d02473fb804000cc01f8e569e158a662555b89e8b4da6e82049dba8e7a532153e15a88dc668af4ea64004322df6fbf1a87cc23bc2d40790cb10
 MISC metadata.xml 910 BLAKE2B e521ff4a434554441bb94b2c2246a02f5f1d976b77cde7fd8f8364108cb6c000c794f8413d636b8b13bbb89ec03b3042d3ccb0599a25c6894aef4e5282544c50 SHA512 6a3d126f858bd4b8eb9cf2475fb5d25f9f23c5caf62406941ef3646a5b36c7c8143f83d8dfabb6aa36abd2cce31e65a11a5451ec2f33964c3d51662e09bd37a0
diff --git a/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch b/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch
deleted file mode 100644
index e55f53606005..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/lib/gauche/interactive/info.scm
-+++ b/lib/gauche/interactive/info.scm
-@@ -137,7 +137,8 @@
-                             :paths paths
-                             :pred (^p (or (file-is-readable? p)
-                                           (file-is-readable? #"~|p|.gz")
--                                          (file-is-readable? #"~|p|.bz2"))))
-+                                          (file-is-readable? #"~|p|.bz2")
-+                                          (file-is-readable? #"~|p|.xz"))))
-         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
-     ))
- 
---- a/lib/text/info.scm
-+++ b/lib/text/info.scm
-@@ -64,6 +64,7 @@
- 
- ;; Find bzip2 location
- (define bzip2  (find-file-in-paths "bzip2"))
-+(define xz     (find-file-in-paths "xz"))
- 
- ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\u001f)
- ;; If FILE is not found, look for compressed one.
-@@ -78,6 +79,8 @@
-                      (close-input-port zp)))))]
-           [(and bzip2 (file-exists? #"~|file|.bz2"))
-            (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)]
-+          [(and xz (file-exists? #"~|file|.xz"))
-+           (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)]
-           [else (error "can't find info file" file)]))
-   (with-input-from-info
-    (lambda ()
diff --git a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
index 0b07cfba042a..06bbf39e6e53 100644
--- a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)7"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 mbedtls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-scheme/gauche/gauche-0.9.9-r1.ebuild b/dev-scheme/gauche/gauche-0.9.9-r1.ebuild
deleted file mode 100644
index f352c5b1acad..000000000000
--- a/dev-scheme/gauche/gauche-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)7"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 mbedtls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/gdbm
-	virtual/libcrypt:=
-	mbedtls? ( net-libs/mbedtls:= )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/openssl:0
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${P}-xz-info.patch
-)
-DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
-
-src_prepare() {
-	default
-	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--with-libatomic-ops=no \
-		--with-slib="${EPREFIX}"/usr/share/slib \
-		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-pkg install-doc
-	einstalldocs
-}