dev-scheme/guile: Remove old, bump to 2.2.7

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Cyprien Nicolas <cyprien@nicolas.tf>

8 files changed, 34 insertions, 120 deletions

diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index debf901d..52f1c13f 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,3 +1,3 @@
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
-DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
+DIST guile-2.2.7.tar.gz 18129833 BLAKE2B 03c88d753f83e5a797f12808b7b053c9cf6c51f87fb8f3c3db89e54528aafb0e54de2eb951cc622e98fada82a558932bb074a8e739f4175144d4b06ba42f7d60 SHA512 ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773
 DIST guile-2.9.4.tar.gz 21830201 BLAKE2B 1b367c10db734d603ba8e6cf008a68fa81972495c5018a81793b57cc691cdbbec0954682e47dbf1961ef6585cec76908b340062114cb23579ed4ada770aa6aa9 SHA512 c62a9ed6bc5d20d4d37f995499d086974f1e14801e8e3ad62a280fd2903c4bf8a940e05d9e9d8afe0a1c0687973a1a903aa973e2faa806b18a766e74b9a46de3
diff --git a/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch b/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
deleted file mode 100644
index c368f98a..00000000
--- a/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9073deba0..92966ce34 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1688,7 +1688,7 @@ do
- done
- 
- GUILE_CFLAGS="$GUILE_CFLAGS $PTHREAD_CFLAGS"
--GUILE_LIBS="$LDFLAGS $LIBS"
-+GUILE_LIBS="$LIBS"
- 
- AC_SUBST(GUILE_LIBS)
- AC_SUBST(GUILE_CFLAGS)
diff --git a/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch b/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
deleted file mode 100644
index 37c7e298..00000000
--- a/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- guile-2.2.6/test-suite/tests/00-repl-server.test.old	2017-04-14 23:26:40.000000000 +0200
-+++ guile-2.2.6/test-suite/tests/00-repl-server.test	2019-07-07 15:14:59.681831790 +0200
-@@ -105,47 +105,48 @@
- ;;; Since we call 'primitive-fork', these tests must run before any
- ;;; tests that create threads.
- 
--(with-test-prefix "repl-server"
-+(if (provided? 'socket)
-+    (with-test-prefix "repl-server"
- 
--  (pass-if-equal "simple expression"
--      "scheme@(repl-server)> $1 = 42\n"
--    (with-repl-server socket
--      (read-until-prompt socket %last-line-before-prompt)
--
--      ;; Wait until 'repl-reader' in boot-9 has written the prompt.
--      ;; Otherwise, if we write too quickly, 'repl-reader' checks for
--      ;; 'char-ready?' and doesn't print the prompt.
--      (match (select (list socket) '() (list socket) 3)
--        (((_) () ())
--         (display "(+ 40 2)\n(quit)\n" socket)
--         (read-string socket)))))
--
--  (pass-if "HTTP inter-protocol attack"           ;CVE-2016-8606
--    (with-repl-server socket
--      ;; Avoid SIGPIPE when the server closes the connection.
--      (sigaction SIGPIPE SIG_IGN)
--
--      (read-until-prompt socket %last-line-before-prompt)
--
--      ;; Simulate an HTTP inter-protocol attack.
--      (write-request (build-request (string->uri "http://localhost"))
--                     socket)
--
--      ;; Make sure the server reacts by closing the connection.  If it
--      ;; fails to do that, this test hangs.
--      (catch 'system-error
--        (lambda ()
--          (let loop ((n 0))
--            (display "(+ 40 2)\n(quit)\n" socket) ;trigger EPIPE
--            (read-string socket)
--            (if (> n 5)
--                #f                                ;failure
--                (begin
--                  (sleep 1)
--                  (loop (+ 1 n))))))
--        (lambda args
--          (->bool (memv (system-error-errno args)
--                        (list ECONNRESET EPIPE ECONNABORTED))))))))
-+      (pass-if-equal "simple expression"
-+          "scheme@(repl-server)> $1 = 42\n"
-+        (with-repl-server socket
-+          (read-until-prompt socket %last-line-before-prompt)
-+
-+          ;; Wait until 'repl-reader' in boot-9 has written the prompt.
-+          ;; Otherwise, if we write too quickly, 'repl-reader' checks for
-+          ;; 'char-ready?' and doesn't print the prompt.
-+          (match (select (list socket) '() (list socket) 3)
-+            (((_) () ())
-+             (display "(+ 40 2)\n(quit)\n" socket)
-+             (read-string socket)))))
-+
-+      (pass-if "HTTP inter-protocol attack"           ;CVE-2016-8606
-+        (with-repl-server socket
-+          ;; Avoid SIGPIPE when the server closes the connection.
-+          (sigaction SIGPIPE SIG_IGN)
-+
-+          (read-until-prompt socket %last-line-before-prompt)
-+
-+          ;; Simulate an HTTP inter-protocol attack.
-+          (write-request (build-request (string->uri "http://localhost"))
-+                         socket)
-+
-+          ;; Make sure the server reacts by closing the connection.  If it
-+          ;; fails to do that, this test hangs.
-+          (catch 'system-error
-+            (lambda ()
-+              (let loop ((n 0))
-+                (display "(+ 40 2)\n(quit)\n" socket) ;trigger EPIPE
-+                (read-string socket)
-+                (if (> n 5)
-+                    #f                                ;failure
-+                    (begin
-+                      (sleep 1)
-+                      (loop (+ 1 n))))))
-+            (lambda args
-+              (->bool (memv (system-error-errno args)
-+                            (list ECONNRESET EPIPE ECONNABORTED)))))))))
- 
- ;;; Local Variables:
- ;;; eval: (put 'with-repl-server 'scheme-indent-function 1)
diff --git a/dev-scheme/guile/files/guile-2.2.7-stack-up.patch b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
new file mode 100644
index 00000000..de291421
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
@@ -0,0 +1,17 @@
+This patch (dropping an obsolete extra parameter to grow_stack) landed post
+2.2.7 and we're not likely to ever see a 2.2.8, as development has moved
+on to 3.x now.
+
+https://bugs.gentoo.org/747049
+https://www.mail-archive.com/guile-devel@gnu.org/msg15502.html
+--- a/libguile/continuations.c
++++ b/libguile/continuations.c
+@@ -302,7 +302,7 @@
+ 
+ #if SCM_STACK_GROWS_UP
+   if (dst + continuation->num_stack_items >= &stack_top_element)
+-    grow_stack (cont, mra);
++    grow_stack (cont);
+ #else
+   dst -= continuation->num_stack_items;
+   if (dst <= &stack_top_element)
diff --git a/dev-scheme/guile/guile-2.0.14-r4.ebuild b/dev-scheme/guile/guile-2.0.14-r4.ebuild
index f68b2613..0971ef6c 100644
--- a/dev-scheme/guile/guile-2.0.14-r4.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic autotools ltprune
+inherit flag-o-matic autotools
 
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
@@ -18,7 +18,7 @@ REQUIRED_USE="regex"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
-	virtual/libffi:=
+	dev-libs/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-devel/libtool
@@ -74,7 +74,7 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	# From Novell
 	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.7.ebuild
index 09bb768e..af7ad600 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2.2/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
@@ -21,7 +21,7 @@ RDEPEND="
 	!>=dev-scheme/guile-2.2:12
 	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
-	virtual/libffi:=
+	dev-libs/libffi:=
 	dev-libs/libltdl:=
 	dev-libs/libunistring:0=
 	sys-libs/ncurses:0=
@@ -34,8 +34,9 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
-	"${FILESDIR}/${P}-configure-ldflags.patch" # bug 590904
-	"${FILESDIR}/${P}-tests-00-repl-server.patch" # bug 629004
+#	"${FILESDIR}/${P}-configure-ldflags.patch" # bug 590904
+	"${FILESDIR}/${P}-stack-up.patch" # bug 747049
+#	"${FILESDIR}/${P}-tests-00-repl-server.patch" # bug 629004
 )
 DOCS=( GUILE-VERSION HACKING README )
 
diff --git a/dev-scheme/guile/guile-2.9.4.ebuild b/dev-scheme/guile/guile-2.9.4.ebuild
index 989fa372..7868f439 100644
--- a/dev-scheme/guile/guile-2.9.4.ebuild
+++ b/dev-scheme/guile/guile-2.9.4.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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream recommended +networking
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
@@ -20,7 +20,7 @@ RESTRICT="strip"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.2:=[threads?]
 	>=dev-libs/gmp-4.2:=
-	virtual/libffi:=
+	dev-libs/libffi:=
 	>=dev-libs/libltdl-1.5.6:=
 	>=dev-libs/libunistring-0.9.3:0=
 	sys-libs/ncurses:0=
diff --git a/dev-scheme/guile/guile-9999.ebuild b/dev-scheme/guile/guile-9999.ebuild
index f571ceed..568c7ba8 100644
--- a/dev-scheme/guile/guile-9999.ebuild
+++ b/dev-scheme/guile/guile-9999.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=7
@@ -21,7 +21,7 @@ RESTRICT="strip"
 RDEPEND="
 	>=dev-libs/boehm-gc-7.2:=[threads?]
 	>=dev-libs/gmp-4.2:=
-	virtual/libffi:=
+	dev-libs/libffi:=
 	>=dev-libs/libltdl-1.5.6:=
 	>=dev-libs/libunistring-0.9.3:0=
 	sys-libs/ncurses:0=