dev-scheme/guile: SLOT, EAPI7, add pre-3.0 releases, cleanup

app-admin/eselect-guile: Drop package
package.mask: Update masks for guile

18 files changed, 259 insertions, 835 deletions

diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 6d3e1be9..29930c03 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,16 +1,7 @@
-AUX 0001-Fix-configure.in-macro-for-automake-1.13.patch 1043 BLAKE2B 7851185e3c55eb67ff86ceb86899f18578f5d05f6982e56de3e22077b79535bb3ae926f39cc1889611db15508c8c41f1c8584cbc1bfa5832cbc8c82f0be5d6df SHA512 88543aacf4e86cfef1a5e2fc2f65ba3b1229339c51361ff75049894cebcfcf60fa922fd4596473c22492476de6bdb9e579cb6408311724bc2362e974f67bcbbc
-AUX 0002-Rename-guile-readline-configure-from-.in-to-.ac.patch 6154 BLAKE2B b9294e31a3cfa3e19f8b699d0ae060699819553358bf92d5fe38ce57e9578cbd242232d1b1cddaab07858cc0d7fedc192227ee0fb71c240d919e18248146f2b8 SHA512 62dbce19217b7afd7388cc7931663a58eb5edb1f173608938ef26a57bb5bdb91c9678a410dc932e01e254b5b365649ed86367fcd7a5aecc27837a1da1cdc3ed6
-AUX 3742d778fbc6ea879437c19aeebe09179dceffdf.patch 1502 BLAKE2B 9409497db22cd92a2a9cbb17f095cf9c6373382b73e7b7d2869472e0e447769ef36c41cc0ab5a4ef4f9652859a64893efdac91a0c40c84ede45beb8bc01cc862 SHA512 2f5f440f04bb9e75a9cf133af85f3db4f712dd2a21acf40e93813baf268a2225b56e10eeab65bb7b7de41303d591183439c85e1f5f59be7f798c99b980411ecb
-AUX 50guile-gentoo.el 74 BLAKE2B b26bda59659d0c29bf31f6f3918c98b89e44f624efb515b81a56c42d5247101278e040cd4c0565cf2e2295bb83aa9b5fd0220b92064bf6e543fe322fc26f060d SHA512 ae5622013d03217afa73d9244f1845a674a22f98c219f562a3e4e620d5ab4ccd6364d2986401f90d225a8a2bcf280408bf558b3600aefa5efff1cdacecf94284
-AUX guile-1.8.8-config-with-readline.patch 1039 BLAKE2B 8a1cd0975f75c1c9b5c59e8a983b3ef7ae3dc9ea1fa56ba1e22c558244c5b91051921907b69d9f5bbfe693684ff9206519ebc4c07beac1e560ca926000456830 SHA512 de495f6b8273405c2dea905ebf08c14a2943b3a52a8ff6e734b59d7823416e4a4d23ac1c004f1a418e28ccaeaecd0be350d6b86cb1faf6ef6e1b7127bec4b802
-AUX guile-1.8.8-fix_guile-config.patch 494 BLAKE2B e7cf0fe161b83e0561c0eac26889c407ed7fba41a79944a1fe060881e31217c40554f1bcc708940102b80dbf27edf3ba8de58850889bb9e3707166e04195f01d SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970
-AUX guile-1.8.8-fix_stack-grow-direction-check.patch 1427 BLAKE2B a8d0ef92b89a97a32dcb650c72ada9ff0ea4401d8062d7af80cc718c863ccf2ebb3791e4dbc74e3341677ad4dda53fcae7d5386a5aab7e5dc67fc34452f1b131 SHA512 5f264a11e8e5de72a6082daea17d62a0822b6cbad157e537aeaead643bf9da69eaa6ba6dff244c34b8bd61f82512448f847f164a4365b73a1fde5885c59fbbb2
-AUX guile-1.8.8-makeinfo-5.patch 2361 BLAKE2B 3720979563cba33c9d5058d070717e6c433b1c1e3e0e41a34d83179f1c2ae5bb5cb8a1a445d0da52f714aea18418d492a482d1dcf11ffe689c092a50d8f0191a SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09
-DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533ea8db15e6d1b759c33edec094a1a4bdc3e09ccae61f1b271d63565063746feea242a90c18cd575775444a42ef SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
-DIST guile-2.0.11.tar.gz 7516053 BLAKE2B c72d5c6836ebe2f0fa6094e3ca8f9ae08a4bcec9e9cec042a2af7374efb13e588b1f8b33071b82c06855f1affcf7fc34dea4d7e303dbd3a214ae665f5f689c87 SHA512 dc1a30d44e6d432fab2407d72385e959af863f6feba6cca5813b4de24c92200c78b44f336d1f4fa8c7b4058dea880982787c69888c91a2236fd2fb1d313137fd
-DIST guile-2.0.9.tar.gz 7335306 BLAKE2B a47f399f4be117875ba0fd86151184aa23a23154f2b0f3cc8d2fd193ce14c2af839a10298f6dfd1cc04d8816d6e1e4d853b58d4375990def0e2f1586f554198a SHA512 bc6dc05733085f807d6f6ef77b0565025d3fbd3fcbb8862a0cae54ca83fa731ba76fb3f33747eacfd01991ff4a5b996c73496df32dfaa56e21246a7094a4a83b
-EBUILD guile-1.8.8-r3.ebuild 3318 BLAKE2B 9bc2b3678d2355ecb652f007541da76a105a469def04ed57a53566ef0ba9021aa037c02e348d96005dbe7b271ad5cd782acb1df010a2365705a040aacf2c62c0 SHA512 2ea133137147eec9a5555e77b67c9aa91b69df92c18989ffbaa2319635ae61be71bbc2c5e6fc6738c35b1206e85029934135ba0b7c3f990acf3385a76971fa62
-EBUILD guile-2.0.11.ebuild 1199 BLAKE2B 7f3bed179ef8ad386b2e5804fb5a3703fd797d86334985e2e1320fe65ac735fd32ff3811915c539fffb715b349cf1d54bd55a6cae5e4ffae1719766e669759c6 SHA512 278318a50d9de0ef1736ca889bc4c678405f60f6fb7dffdc67e7aec57fd4c29a2993a8e24b0ab4d08a9f318f66fdcd55a0a8e8f1c38928da22da74132f77203a
-EBUILD guile-2.0.9-r1.ebuild 2031 BLAKE2B 8d4fb541b404f17dfa9c41fe133b49a75f156a1f4143f1cc1331ab9853889a89243dd52ebd43bd453c219a383d97aeaff43b020af065ac998851c2b355e389da SHA512 1bb3a45ad9fbdfdd0cbcff0747a6c27cbc009ec62904326b665aac9195d8f3ba2f642e937798202af3e7f2af3a9009eac9e5b00d6def9dfead1f91a550d01fd5
-EBUILD guile-999.ebuild 2214 BLAKE2B 2a4300d72e0cfa38b36a2bff0da56536df9d7e86c979e6a75d6aa34d79faa0fefc5a7571b084bf16a9af6cacbd0b1c99db1f2115b14ed0fac235d5175c9e9105 SHA512 3250661e3324f741157ebe038926b67840debd808a784efc180e590edbe1b7588bbf99534bc3b30593b0ea0e39e8ef042ced3286c49e10493b1eb26076cb1fe0
-MISC metadata.xml 1002 BLAKE2B 8d9592f9893cc380df13396db3763ddfae6ef5b4ba3e3f333e4a5ff394a622cc677d06b3217acdbeb812f103675ca254b3e58c803031947e79c5dee6beb7a127 SHA512 80ad93f051ef2de4f4201d9cb23d169e78641f4983407bbcc408e8a6894d4f3aa63e373199280c16030dfb3c79d3086751937105f27778bdda4e8d48ff442b98
+AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420c858f964b8587bed523d95fadedbf9981dd9c196934299413db9c23e940a4b88e798e4fff65cdea1507968494338313ba SHA512 450f44cbd2b3f0c7c02963c35e58e8d0e4a7192239993215b69713d8a1109692ab1e153efe685c27681069477a56e7bc52b34ebd8717a2c8695be8c6b8abe673
+DIST guile-2.2.4.tar.gz 18094974 BLAKE2B 36e9219bbe675b7ad8a73607a3acddae244a71cac1aff8dac77433da76ecb9f073df723ca3d22a15cf769b2fe5a981aa968bd0983020b3926f08f0b497bdf80e SHA512 a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e
+DIST guile-2.9.2.tar.gz 21564297 BLAKE2B 23ef2f2036bffe908d2aa6f9c9528d4883a58e9223d30bc8bb9c0159a7c6ca12b2580b6d1c698fba99265731d6fa4b00db141ef64351347348aa9c6d6641c5c3 SHA512 91dfb47bfaa20a53e961cec4f4ea29a81a2da5e5118726c003379e3202a5e5dad6c5dd6f0f4d9e17119c9431f59c0ae61ed2142628b2221029831e7e99d5587b
+EBUILD guile-2.2.4-r1.ebuild 2291 BLAKE2B 6942d1f69d5567dbaa48749047aabc92a48a734511c5582e650a835c7147a3f3c89287a954b3057b72030d0eedad01e1bef7ec721521a5e966e8d2534d75e534 SHA512 e172a31c2ec2240036f217d5e6c06ea366c3f4f9361ffc305fc8ce26f8a395616947f4c3c6465e926db335b692e61e5bcf9be9aa632855a87fcb9a0435757cfa
+EBUILD guile-2.9.2.ebuild 2252 BLAKE2B 6fdf0cfdd2d6642d9f14b4839ef74a6795f1915912d13f275c1a75cdecea1b8a1d9dd88fa087ab3b6551f4f70a8df090562c7158a8e9d5e2e5aa3f90113130b0 SHA512 0211d9cffa819251739ea7e12cb750241374be00911690d298ffd9391596717f38a62350617e7e14923d9debab181212f3dddac416e738679ffcdf0216da049a
+EBUILD guile-9999.ebuild 2179 BLAKE2B 1520bdf578967de0577b91aeab15df03d3200ffb5bb23ea0c13f9e453cfc2215b337459b1ee3ddab0af76e722107609ff43eb476d21c71d8e7ed59a841a5c2d9 SHA512 354c0493cce1b640bedf3eb4cfbdee3cf8b1580b529bafd87926dec16ef927b96a36e40de2042d8e3da515c4335411d027a763de0561c9bdda6a322d6c89850f
+MISC metadata.xml 853 BLAKE2B 14e193fda4ff6397d2ab6aedaeab4320883da005e869491072deb1a38a0afab199692466dd7321cf0e6ca79c3f198f64efbb3a611dcd653ce514cc81d78a78e1 SHA512 958758b1ff1a2fc0a4fe9931b74fa38450b52a2081738f2dfc3b6310433ab01ed68752e256ecb9c4f23db7a22d14e0e72da1f99208be012550c62e308b349667
diff --git a/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch b/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch
deleted file mode 100644
index d738f0b1..00000000
--- a/dev-scheme/guile/files/0001-Fix-configure.in-macro-for-automake-1.13.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 80a8464c41ca1f30a19936d5524104c5297cc95b Mon Sep 17 00:00:00 2001
-From: Cyprien Nicolas <cyprien@nicolas.tf>
-Date: Thu, 25 Apr 2013 00:15:40 +0200
-Subject: [PATCH 1/2] Fix configure.in macro for automake-1.13
-
-Reported through https://bugs.gentoo.org/show_bug.cgi?id=467064
-Fix by Arfrever Frehtes Taifersar Arahesis
-
-* Replace AM_CONFIG_HEADER by AC_CONFIG_HEADERS, the former
-  being deprecated since automake-1.13
-
----
- guile-readline/configure.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/guile-readline/configure.in b/guile-readline/configure.in
-index 7c9d3d9..c17bee6 100644
---- a/guile-readline/configure.in
-+++ b/guile-readline/configure.in
-@@ -9,14 +9,13 @@ AC_INIT(guile-readline,
- 
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_SRCDIR(readline.c)
--AM_CONFIG_HEADER([guile-readline-config.h])
-+AC_CONFIG_HEADERS([guile-readline-config.h])
- AM_INIT_AUTOMAKE([foreign no-define])
- 
- . $srcdir/../GUILE-VERSION
- 
- AC_PROG_INSTALL
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- 
--- 
-1.7.11.7
-
diff --git a/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch b/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch
deleted file mode 100644
index 0723c6d2..00000000
--- a/dev-scheme/guile/files/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 19be2c9fcf92b6ec92fd051e114d074b496cce70 Mon Sep 17 00:00:00 2001
-From: Cyprien Nicolas <cyprien@nicolas.tf>
-Date: Thu, 25 Apr 2013 00:17:13 +0200
-Subject: [PATCH 2/2] Rename guile-readline/configure from .in to .ac
-
-* Rename guile-readline/configure.in to guile-readline/configure.ac.
-  Since automake-1.13, configure.in file produce a warning. 
-
----
- guile-readline/configure.ac | 86 +++++++++++++++++++++++++++++++++++++++++++++
- guile-readline/configure.in | 86 ---------------------------------------------
- 2 files changed, 86 insertions(+), 86 deletions(-)
- create mode 100644 guile-readline/configure.ac
- delete mode 100644 guile-readline/configure.in
-
-diff --git a/guile-readline/configure.ac b/guile-readline/configure.ac
-new file mode 100644
-index 0000000..c17bee6
---- /dev/null
-+++ b/guile-readline/configure.ac
-@@ -0,0 +1,86 @@
-+AC_PREREQ(2.50)
-+
-+dnl Don't use "echo -n", which is not portable (e.g., not available on
-+dnl MacOS X).  Instead, use `patsubst' to remove the newline.
-+AC_INIT(guile-readline,
-+        patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [
-+]),
-+	[bug-guile@gnu.org])
-+
-+AC_CONFIG_AUX_DIR([.])
-+AC_CONFIG_SRCDIR(readline.c)
-+AC_CONFIG_HEADERS([guile-readline-config.h])
-+AM_INIT_AUTOMAKE([foreign no-define])
-+
-+. $srcdir/../GUILE-VERSION
-+
-+AC_PROG_INSTALL
-+AC_PROG_CC
-+AC_LIBTOOL_WIN32_DLL
-+AC_PROG_LIBTOOL
-+
-+dnl
-+dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
-+dnl
-+AC_CYGWIN
-+AC_MINGW32
-+EXTRA_DEFS=""
-+if test "$MINGW32" = "yes" ; then
-+    if test $enable_shared = yes ; then
-+      EXTRA_DEFS="-DSCM_IMPORT"
-+    fi
-+fi
-+AC_SUBST(EXTRA_DEFS)
-+
-+for termlib in ncurses curses termcap terminfo termlib ; do
-+   AC_CHECK_LIB(${termlib}, tgoto,
-+                [LIBS="-l${termlib} $LIBS"; break])
-+done
-+
-+AC_CHECK_LIB(readline, readline)
-+if test $ac_cv_lib_readline_readline = no; then
-+  AC_MSG_WARN([libreadline was not found on your system.])
-+fi
-+
-+AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal)
-+
-+dnl Check for modern readline naming
-+AC_CHECK_FUNCS(rl_filename_completion_function)
-+
-+dnl Check for rl_get_keymap.  We only use this for deciding whether to
-+dnl install paren matching on the Guile command line (when using
-+dnl readline for input), so it's completely optional.
-+AC_CHECK_FUNCS(rl_get_keymap)
-+
-+AC_CACHE_CHECK([for rl_getc_function pointer in readline],
-+		 ac_cv_var_rl_getc_function,
-+		 [AC_TRY_LINK([
-+#include <stdio.h>
-+#include <readline/readline.h>],
-+			      [printf ("%ld", (long) rl_getc_function)],
-+			      [ac_cv_var_rl_getc_function=yes],
-+			      [ac_cv_var_rl_getc_function=no])])
-+if test "${ac_cv_var_rl_getc_function}" = "yes"; then
-+  AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1,
-+    [Define if your readline library has the rl_getc_function variable.])
-+fi
-+
-+if test $ac_cv_lib_readline_readline = yes \
-+        -a $ac_cv_var_rl_getc_function = no; then
-+  AC_MSG_WARN([*** libreadline is too old on your system.])
-+  AC_MSG_WARN([*** You need readline version 2.1 or later.])
-+fi
-+
-+AC_CHECK_FUNCS(strdup)
-+
-+. $srcdir/LIBGUILEREADLINE-VERSION
-+AC_SUBST(LIBGUILEREADLINE_MAJOR)
-+AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT)
-+AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION)
-+AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE)
-+AC_SUBST(LIBGUILEREADLINE_INTERFACE)
-+
-+AC_SUBST(GUILE_EFFECTIVE_VERSION)
-+
-+AC_CONFIG_FILES(Makefile ice-9/Makefile)
-+AC_OUTPUT
-diff --git a/guile-readline/configure.in b/guile-readline/configure.in
-deleted file mode 100644
-index c17bee6..0000000
---- a/guile-readline/configure.in
-+++ /dev/null
-@@ -1,86 +0,0 @@
--AC_PREREQ(2.50)
--
--dnl Don't use "echo -n", which is not portable (e.g., not available on
--dnl MacOS X).  Instead, use `patsubst' to remove the newline.
--AC_INIT(guile-readline,
--        patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [
--]),
--	[bug-guile@gnu.org])
--
--AC_CONFIG_AUX_DIR([.])
--AC_CONFIG_SRCDIR(readline.c)
--AC_CONFIG_HEADERS([guile-readline-config.h])
--AM_INIT_AUTOMAKE([foreign no-define])
--
--. $srcdir/../GUILE-VERSION
--
--AC_PROG_INSTALL
--AC_PROG_CC
--AC_LIBTOOL_WIN32_DLL
--AC_PROG_LIBTOOL
--
--dnl
--dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
--dnl
--AC_CYGWIN
--AC_MINGW32
--EXTRA_DEFS=""
--if test "$MINGW32" = "yes" ; then
--    if test $enable_shared = yes ; then
--      EXTRA_DEFS="-DSCM_IMPORT"
--    fi
--fi
--AC_SUBST(EXTRA_DEFS)
--
--for termlib in ncurses curses termcap terminfo termlib ; do
--   AC_CHECK_LIB(${termlib}, tgoto,
--                [LIBS="-l${termlib} $LIBS"; break])
--done
--
--AC_CHECK_LIB(readline, readline)
--if test $ac_cv_lib_readline_readline = no; then
--  AC_MSG_WARN([libreadline was not found on your system.])
--fi
--
--AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal)
--
--dnl Check for modern readline naming
--AC_CHECK_FUNCS(rl_filename_completion_function)
--
--dnl Check for rl_get_keymap.  We only use this for deciding whether to
--dnl install paren matching on the Guile command line (when using
--dnl readline for input), so it's completely optional.
--AC_CHECK_FUNCS(rl_get_keymap)
--
--AC_CACHE_CHECK([for rl_getc_function pointer in readline],
--		 ac_cv_var_rl_getc_function,
--		 [AC_TRY_LINK([
--#include <stdio.h>
--#include <readline/readline.h>],
--			      [printf ("%ld", (long) rl_getc_function)],
--			      [ac_cv_var_rl_getc_function=yes],
--			      [ac_cv_var_rl_getc_function=no])])
--if test "${ac_cv_var_rl_getc_function}" = "yes"; then
--  AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1,
--    [Define if your readline library has the rl_getc_function variable.])
--fi
--
--if test $ac_cv_lib_readline_readline = yes \
--        -a $ac_cv_var_rl_getc_function = no; then
--  AC_MSG_WARN([*** libreadline is too old on your system.])
--  AC_MSG_WARN([*** You need readline version 2.1 or later.])
--fi
--
--AC_CHECK_FUNCS(strdup)
--
--. $srcdir/LIBGUILEREADLINE-VERSION
--AC_SUBST(LIBGUILEREADLINE_MAJOR)
--AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT)
--AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION)
--AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE)
--AC_SUBST(LIBGUILEREADLINE_INTERFACE)
--
--AC_SUBST(GUILE_EFFECTIVE_VERSION)
--
--AC_CONFIG_FILES(Makefile ice-9/Makefile)
--AC_OUTPUT
--- 
-1.7.11.7
-
diff --git a/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch b/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch
deleted file mode 100644
index 051469f9..00000000
--- a/dev-scheme/guile/files/3742d778fbc6ea879437c19aeebe09179dceffdf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3742d778fbc6ea879437c19aeebe09179dceffdf Mon Sep 17 00:00:00 2001
-From: Ludovic Courtès <ludo@gnu.org>
-Date: Mon, 14 May 2012 17:21:35 +0000
-Subject: Honor $(program_transform_name) for the `guile-tools' symlink.
-
-Fixes <http://bugs.gnu.org/11451>.
-Reported by Cyprien Nicolas <c.nicolas@gmail.com>.
-
-* meta/Makefile.am (install-data-hook): Honor $(program_transform_name).
----
-diff --git a/meta/Makefile.am b/meta/Makefile.am
-index f26fc44..a05730d 100644
---- a/meta/Makefile.am
-+++ b/meta/Makefile.am
-@@ -1,7 +1,8 @@
- ## Process this file with Automake to create Makefile.in
- ## Jim Blandy <jimb@red-bean.com> --- September 1997
- ##
--##  	Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+##  	Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
-+##        2012 Free Software Foundation, Inc.
- ##
- ##   This file is part of GUILE.
- ##   
-@@ -28,8 +29,12 @@ EXTRA_DIST= \
- 
- # What we now call `guild' used to be known as `guile-tools'.
- install-data-hook:
--	cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \
--	$(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT)
-+	guild="`echo $(ECHO_N) guild				\
-+	   | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ;	\
-+	guile_tools="`echo $(ECHO_N) guile-tools		\
-+	   | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ;	\
-+	cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&	\
-+	$(LN_S) "$$guild" "$$guile_tools"
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = guile-2.0.pc
---
-cgit v0.9.0.2
diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
deleted file mode 100644
index d7098b12..00000000
--- a/dev-scheme/guile/files/50guile-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-
-;;; guile site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
diff --git a/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch b/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch
deleted file mode 100644
index 31637bb7..00000000
--- a/dev-scheme/guile/files/guile-1.8.8-config-with-readline.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur guile-1.8.8.orig/configure.in guile-1.8.8/configure.in
---- guile-1.8.8.orig/configure.in	2013-02-03 19:54:05.000000000 +0100
-+++ guile-1.8.8/configure.in	2013-02-03 19:56:37.000000000 +0100
-@@ -57,7 +57,13 @@
- #
- #--------------------------------------------------------------------
- 
--AC_CONFIG_SUBDIRS(guile-readline)
-+GUILE_READLINE
-+if test "x$with_readline" = xyes; then
-+  AC_CONFIG_SUBDIRS(guile-readline)
-+  GUILE_READLINE="guile-readline"
-+fi
-+
-+AC_SUBST([GUILE_READLINE])
- 
- #--------------------------------------------------------------------
- 
-diff -Nur guile-1.8.8.orig/Makefile.am guile-1.8.8/Makefile.am
---- guile-1.8.8.orig/Makefile.am	2013-02-03 19:54:06.000000000 +0100
-+++ guile-1.8.8/Makefile.am	2013-02-03 19:55:14.000000000 +0100
-@@ -24,7 +24,7 @@
- #
- AUTOMAKE_OPTIONS = 1.10
- 
--SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
-+SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \
- 	  scripts srfi doc examples test-suite benchmark-suite lang am
- 
- bin_SCRIPTS = guile-tools
diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
deleted file mode 100644
index 2b04426e..00000000
--- a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN 1/configure.in 2/configure.in
---- 1/configure.in	2010-12-13 17:24:39.000000000 +0000
-+++ 2/configure.in	2011-04-29 11:53:39.000000000 +0000
-@@ -1522,8 +1522,8 @@
- #######################################################################
- 
- dnl Tell guile-config what flags guile users should compile and link with.
--GUILE_LIBS="$LDFLAGS $LIBS"
--GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
-+GUILE_LIBS="$LIBS"
-+GUILE_CFLAGS="$PTHREAD_CFLAGS"
- AC_SUBST(GUILE_LIBS)
- AC_SUBST(GUILE_CFLAGS)
- 
diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch b/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch
deleted file mode 100644
index a9fe2265..00000000
--- a/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94 Mon Sep 17 00:00:00 2001
-From: Ludovic Courtès <ludo@gnu.org>
-Date: Sun, 01 Jul 2012 15:32:03 +0000
-Subject: Fix stack growth direction check.
-
-Backport of 236f901b0e2b18093421e2e440cf80d00fb98757 from `stable-2.0'.
-Fixes <http://bugs.gnu.org/11845>.
-Reported by Cyprien Nicolas <c.nicolas@gmail.com>.
-
-* configure.in: Pull stack growth direction check from upstream
-  Autoconf.  See
-  http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00035.html
-  for a discussion.
----
-diff --git a/configure.in b/configure.in
-index f058841..682e31f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1244,23 +1244,20 @@ SCM_I_GSC_STACK_GROWS_UP=0
- AC_RUN_IFELSE([AC_LANG_SOURCE(
- [AC_INCLUDES_DEFAULT
- int
--find_stack_direction ()
-+find_stack_direction (int *addr, int depth)
- {
--  static char *addr = 0;
--  auto char dummy;
--  if (addr == 0)
--    {
--      addr = &dummy;
--      return find_stack_direction ();
--    }
--  else
--    return (&dummy > addr) ? 1 : -1;
-+  int dir, dummy = 0;
-+  if (! addr)
-+    addr = &dummy;
-+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-+  return dir + dummy;
- }
- 
- int
--main ()
-+main (int argc, char **argv)
- {
--  return find_stack_direction () < 0;
-+  return find_stack_direction (0, argc + !argv + 20) < 0;
- }])],
- 	       [SCM_I_GSC_STACK_GROWS_UP=1],
- 	       [],
---
-cgit v0.9.0.2
diff --git a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
deleted file mode 100644
index 9f3a02c1..00000000
--- a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001
-From: Cyprien Nicolas <cyp@fulax.fr>
-Date: Thu, 18 Apr 2013 23:45:23 +0200
-Subject: [PATCH] Fix texinfo files for makeinfo-5.1
-
----
- doc/ref/api-options.texi | 2 +-
- doc/ref/api-utility.texi | 2 +-
- doc/ref/fdl.texi         | 2 +-
- doc/ref/gh.texi          | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi
-index 7b7a6e0..6ce7291 100644
---- a/doc/ref/api-options.texi
-+++ b/doc/ref/api-options.texi
-@@ -377,9 +377,9 @@ configure @emph{reading}, @emph{printing}, @emph{debugging} or
- * User level options interfaces::
- * Reader options::
- * Printing options::
--* Debugger options::
- * Evaluator options::
- * Evaluator trap options::
-+* Debugger options::
- * Examples of option use::
- @end menu
- 
-diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi
-index 4a90212..9a4f3cc 100644
---- a/doc/ref/api-utility.texi
-+++ b/doc/ref/api-utility.texi
-@@ -657,7 +657,7 @@ Return 1 if @var{x} is a Scheme-level hook, 0 otherwise.
- @end deftypefn
- 
- 
--@subsubsection Handling Scheme-level hooks from C code
-+@subsubheading Handling Scheme-level hooks from C code
- 
- Here is an example of how to handle Scheme-level hooks from C code using
- the above functions.
-diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi
-index 17fe148..4866055 100644
---- a/doc/ref/fdl.texi
-+++ b/doc/ref/fdl.texi
-@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundation.
- @end enumerate
- 
- @page
--@appendixsubsec ADDENDUM: How to use this License for your documents
-+@appendixsec ADDENDUM: How to use this License for your documents
- 
- To use this License in a document you have written, include a copy of
- the License in the document and put the following copyright and
-diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi
-index 95dfd92..bbd3af1 100644
---- a/doc/ref/gh.texi
-+++ b/doc/ref/gh.texi
-@@ -995,8 +995,8 @@ These correspond to the Scheme @code{(cons a b)} and @code{(list l0 l1
- 
- @deftypefun SCM gh_car (SCM @var{obj})
- @deftypefunx SCM gh_cdr (SCM @var{obj})
--@dots{}
--
-+@deftypefunx SCM gh_c[ad][ad]r (SCM @var{obj})
-+@deftypefunx SCM gh_c[ad][ad][ad]r (SCM @var{obj})
- @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
- These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
- @end deftypefun
--- 
-1.8.2.1
-
diff --git a/dev-scheme/guile/files/guile-2.2.3-gentoo-sandbox.patch b/dev-scheme/guile/files/guile-2.2.3-gentoo-sandbox.patch
new file mode 100644
index 00000000..1cded2d2
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.3-gentoo-sandbox.patch
@@ -0,0 +1,10 @@
+diff --git a/test-suite/standalone/test-out-of-memory b/test-suite/standalone/test-out-of-memory
+index 2216512..0ed6079 100755
+--- a/test-suite/standalone/test-out-of-memory
++++ b/test-suite/standalone/test-out-of-memory
+@@ -5,2 +5,5 @@ exec guile -q -s "$0" "$@"
+ 
++; Gentoo's sandbox does not handle OOM gracefully
++(exit 77)
++
+ (unless (defined? 'setrlimit)
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
deleted file mode 100644
index eca8a997..00000000
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs +networking nls +readline +regex +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	app-admin/eselect-guile
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_guile-config.patch"
-	epatch "${FILESDIR}/${P}-fix_stack-grow-direction-check.patch"
-	epatch "${FILESDIR}/${P}-config-with-readline.patch"
-	epatch "${FILESDIR}/${P}-makeinfo-5.patch"
-	epatch "${FILESDIR}/0001-Fix-configure.in-macro-for-automake-1.13.patch"
-	epatch "${FILESDIR}/0002-Rename-guile-readline-configure-from-.in-to-.ac.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--program-suffix="-${MAJOR}" \
-		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable emacs elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		$(use_with readline) \
-		--with-modules \
-		EMACS=no
-}
-
-src_compile()  {
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
-
-	# Maybe there is a proper way to do this? Symlink handled by eselect
-	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	fi
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-	eselect guile update ifunset
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	eselect guile update ifunset
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-2.0.11.ebuild b/dev-scheme/guile/guile-2.0.11.ebuild
deleted file mode 100644
index 832e1202..00000000
--- a/dev-scheme/guile/guile-2.0.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Scheme interpreter. Also The GNU extension language"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64"
-# Work in progress. No keywords.
-# TODO: 
-# 1. Emacs support 
-# 2. Testing agains revdeps
-# 3. Check file placing
-# 4. ...
-KEYWORDS=""
-IUSE="networking +regex +deprecated nls debug-malloc debug +threads static"
-
-RDEPEND="
-	dev-libs/gmp
-	virtual/libiconv
-	virtual/libintl
-	sys-devel/libtool
-	dev-libs/boehm-gc
-	dev-libs/libunistring
-	dev-libs/libffi"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		$(use_enable static) \
-		--disable-error-on-warning \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use_enable deprecated) \
-		$(use_enable nls) \
-		$(use_with threads) \
-		--with-modules
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-}
diff --git a/dev-scheme/guile/guile-2.0.9-r1.ebuild b/dev-scheme/guile/guile-2.0.9-r1.ebuild
deleted file mode 100644
index 122d0d28..00000000
--- a/dev-scheme/guile/guile-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit flag-o-matic
-
-WANT_AUTOMAKE=1.12
-
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug debug-malloc +deprecated +networking nls +regex +threads"
-
-RDEPEND="
-	app-admin/eselect-guile
-	>=dev-libs/boehm-gc-7.0[threads?]
-	dev-libs/gmp
-	dev-libs/libffi
-	>=dev-libs/libunistring-0.9.3
-	sys-devel/gettext
-	>=sys-devel/libtool-1.5.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2"
-MAJOR="2.0"
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--program-suffix="-${MAJOR}" \
-		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use_enable deprecated) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-}
-
-src_compile()  {
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
-
-	# Maybe there is a proper way to do this? Symlink handled by eselect
-	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	eselect guile update ifunset
-}
-
-pkg_postrm() {
-	eselect guile update ifunset
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-2.2.4-r1.ebuild b/dev-scheme/guile/guile-2.2.4-r1.ebuild
new file mode 100644
index 00000000..8a2a06f1
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.4-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MAJOR="2.2"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+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"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	virtual/libffi:=
+	dev-libs/libltdl:=
+	dev-libs/libunistring:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/libtool
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--program-suffix="-${MAJOR}" \
+		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libltdl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable networking) \
+		$(use_enable nls) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+src_install() {
+	default
+
+	# Maybe there is a proper way to do this? Symlink handled by eselect
+	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
+
+	# From Novell
+	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-scheme/guile/guile-2.9.2.ebuild b/dev-scheme/guile/guile-2.9.2.ebuild
new file mode 100644
index 00000000..18703848
--- /dev/null
+++ b/dev-scheme/guile/guile-2.9.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MAJOR="3.0"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+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"
+IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream recommended +networking
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.2:=[threads?]
+	>=dev-libs/gmp-4.2:=
+	virtual/libffi:=
+	>=dev-libs/libltdl-1.5.6:=
+	>=dev-libs/libunistring-0.9.3:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/libtool
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--program-suffix="-${MAJOR}" \
+		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libltdl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable networking) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+src_install() {
+	default
+
+	# Maybe there is a proper way to do this? Symlink handled by eselect
+	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
+
+	# From Novell
+	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-scheme/guile/guile-999.ebuild b/dev-scheme/guile/guile-999.ebuild
deleted file mode 100644
index af840540..00000000
--- a/dev-scheme/guile/guile-999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-inherit git-2
-
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-#SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-EGIT_REPO_URI="git://git.sv.gnu.org/guile.git"
-
-LICENSE="LGPL-3"
-KEYWORDS=""
-IUSE="networking +regex +deprecated nls debug-malloc debug +threads"
-
-RDEPEND="
-	app-admin/eselect-guile
-	>=dev-libs/boehm-gc-7.0[threads?]
-	dev-libs/gmp
-	dev-libs/libffi
-	dev-libs/libunistring
-	sys-devel/gettext
-	>=sys-devel/libtool-1.5.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Not 2.2; File colisions with 2.0 on libguilereadline-v-18
-SLOT="2"
-MAJOR="2.2"
-
-src_prepare() {
-	# for live ebuilds
-	if [ -x autogen.sh ]; then
-		./autogen.sh || die
-	fi
-}
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--program-suffix="-${MAJOR}" \
-		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use_enable deprecated) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-}
-
-src_compile()  {
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
-
-	# Maybe there is a proper way to do this? Symlink handled by eselect
-	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	eselect guile update ifunset
-}
-
-pkg_postrm() {
-	eselect guile update ifunset
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-9999.ebuild b/dev-scheme/guile/guile-9999.ebuild
new file mode 100644
index 00000000..8ae5dfd8
--- /dev/null
+++ b/dev-scheme/guile/guile-9999.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic git-r3
+
+MAJOR="3.0"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+#SRC_URI="mirror://gnu-alpha/guile/${P}.tar.gz"
+EGIT_REPO_URI="git://git.sv.gnu.org/guile.git"
+
+LICENSE="LGPL-3+"
+SLOT="3.0"
+KEYWORDS=""
+IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream recommended +networking
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.2:=[threads?]
+	>=dev-libs/gmp-4.2:=
+	virtual/libffi:=
+	>=dev-libs/libltdl-1.5.6:=
+	>=dev-libs/libunistring-0.9.3:0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/libtool
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_prepare() {
+	default
+
+	./autogen.sh || die
+}
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--program-suffix="-${MAJOR}" \
+		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--disable-static \
+		--enable-posix \
+		--without-libgmp-prefix \
+		--without-libiconv-prefix \
+		--without-libintl-prefix \
+		--without-libltdl-prefix \
+		--without-libreadline-prefix \
+		--without-libunistring-prefix \
+		$(use_enable debug guile-debug) \
+		$(use_enable debug-malloc) \
+		$(use_enable deprecated) \
+		$(use_enable networking) \
+		$(use_enable regex) \
+		$(use_with threads)
+}
+
+src_install() {
+	default
+
+	# Maybe there is a proper way to do this? Symlink handled by eselect
+	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
+
+	# From Novell
+	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+	dodir /usr/share/gdb/auto-load/$(get_libdir)
+	mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+	# necessary for registering slib, see bug 206896
+	keepdir /usr/share/guile/site
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
index 77fb31d7..5b78ec86 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
-	<maintainer>
-		<email>hkBst@gentoo.org</email>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
 	</maintainer>
 	<longdescription lang="en">
 Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
 	</longdescription>
 	<use>
-	<flag name='debug-freelist'>Include garbage collector freelist debugging
-	code</flag>
 	<flag name='debug-malloc'>Include malloc debugging code</flag>
 	<flag name='deprecated'>Enable deprecated features</flag>
-	<flag name='discouraged'> (implied by deprecated) enable merely discouraged
-	features</flag>
 	<flag name='networking'>Include networking interfaces</flag>
 	<flag name='regex'> Include regular expression interfaces</flag>
 	</use>