gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-scheme
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
218 files changed, 4711 insertions, 580 deletions
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 2f919b6e4536..dad2c6da8f9a 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bytestructures-1.0.1 b/dev-scheme/bytestructures-1.0.1
deleted file mode 100644
index 3ad0b11b1e34..000000000000
--- a/dev-scheme/bytestructures-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-scheme/guile-2.0.0:=
-DESCRIPTION=Structured access to bytevector contents
-EAPI=6
-HOMEPAGE=https://github.com/TaylanUB/scheme-bytestructures/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.0:=
-SLOT=0
-SRC_URI=https://github.com/TaylanUB/scheme-bytestructures/releases/download/v1.0.1/bytestructures-1.0.1.tar.gz
-_md5_=856a57feaee03196bf761f9cf6ea9885
diff --git a/dev-scheme/bytestructures/Manifest b/dev-scheme/bytestructures/Manifest
new file mode 100644
index 000000000000..d66867954982
--- /dev/null
+++ b/dev-scheme/bytestructures/Manifest
@@ -0,0 +1,3 @@
+DIST bytestructures-1.0.1.tar.gz 98322 BLAKE2B cede9e127582e1f114bf9f0d9f4bdcacc6bd10c3d5b0a3d2ec70e0a03e0064f0765043adf89b2ae03012248f473a9668eca4e4ac852685082284517df4c629aa SHA512 93414f1c99c6463313aaa401c30b38e917f937644413c38ae7e6cdcc77fb380bf2df1eefe9720f01f35a386a0d428f87a51b028a77551e70c8076a8b2bb290d1
+EBUILD bytestructures-1.0.1.ebuild 463 BLAKE2B aa8b36d5510a0c1c8384c06f9b72356e2433ea2979e1d488476696a73de010190f59bf24e56be0e417f711b9cf0f6f6094b7ea2e4be4871bb394773a48eeb184 SHA512 5845b674c43152bb0ed52dc814bcb887b43edfef5fc73d822cd097f40692ab1272e3800fb23d9f5ecae6e0453b215d07e15320743ce32d87253af5a7ab5571fe
+MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/bytestructures/bytestructures-1.0.1.ebuild b/dev-scheme/bytestructures/bytestructures-1.0.1.ebuild
new file mode 100644
index 000000000000..810721ecfa91
--- /dev/null
+++ b/dev-scheme/bytestructures/bytestructures-1.0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Structured access to bytevector contents"
+HOMEPAGE="https://github.com/TaylanUB/scheme-bytestructures/"
+SRC_URI="https://github.com/TaylanUB/scheme-bytestructures/releases/download/v${PV}/bytestructures-${PV}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.0:="
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/bytestructures/metadata.xml b/dev-scheme/bytestructures/metadata.xml
new file mode 100644
index 000000000000..2907abeb0c42
--- /dev/null
+++ b/dev-scheme/bytestructures/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>slyfox@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/c-wrapper-0.6.1-r1 b/dev-scheme/c-wrapper-0.6.1-r1
deleted file mode 100644
index 1c4bc631edd4..000000000000
--- a/dev-scheme/c-wrapper-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-scheme/gauche virtual/libffi >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Foreign function interface for C and Objective-C libraries
-EAPI=6
-HOMEPAGE=http://www.koguro.net/prog/c-wrapper/
-IUSE=examples
-KEYWORDS=~amd64 ~ia64 x86
-LICENSE=MIT
-RDEPEND=dev-scheme/gauche virtual/libffi
-SLOT=0
-SRC_URI=http://www.koguro.net/prog/c-wrapper/c-wrapper-0.6.1.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b897ea7e89f3859baddc3d7aa131008c
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
new file mode 100644
index 000000000000..60192b34c424
--- /dev/null
+++ b/dev-scheme/c-wrapper/Manifest
@@ -0,0 +1,7 @@
+AUX c-wrapper-closure.patch 205 BLAKE2B b633bbf97b3d76ab58b9a332ddc56f976b54f9eb3df0b235e7784e27141dda051e5d637839bf3be49c580845ad6898d9d526169abb14e6329642105dd5416c11 SHA512 284f08b6a8164d129dfe5e26500ca4946c037d0661614dfcab7caf4d5ce189ee299dbb70fa6a4d0f2ec5b0fdf9f1926891d07ce019fade329a0909c10586c790
+AUX c-wrapper-gcc-5.patch 1883 BLAKE2B 089f5b8427b13ff6ca8d9c9b5181724f691bfbf58cfd84b365a5cdc36efc9ea2582e973887d4da30e2ce52a91e5a1d0a6d9461a7b4d31b886c699e7805827969 SHA512 9c6d588f9246f5e80e1639ecadb0b4e1be1a1fe85ba4163592fa74dfec30dca2c61934d072f880fb031aad506387e463a8d399058ad45934bd4c7b16289bef07
+AUX c-wrapper-gentoo.patch 2015 BLAKE2B fedf622537151079df07aaa1091fe377b1e1ee8ebf95a4c8b290ca983376211e6897ddb14c8d3c8f38fc1a23073d5282c447b8e8d66578235b17bb3cddce76f1 SHA512 4184d3a4953478ff19374ff230bd7376eb8a8d7d90e1e91b1903b30af49f124d18b816639024a9b54a7099965ea2c5c8244ca64a7ce4db8f3fde32cbc13578d3
+AUX c-wrapper-glibc-2.25.patch 727 BLAKE2B 0c0dce0bfb78a92ff4c2cf6176a7b7de129e143737be897a074f06f88b6923915ec36a9e3ddb5410010c662e8e11bb17b89742349c2a01a3066c1c49c08cc57a SHA512 769c92156395f121d8ba3776904c279c5b97f791f7606b74c682264430ed71f1af31ce8655286cae7dfebb75ea8addc2fb304a87eb5972314c5ab082700921ee
+DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
+EBUILD c-wrapper-0.6.1-r1.ebuild 834 BLAKE2B beeabb062993090ba0d462be5302682b28d1b8e9ac985fdaa4a5a225627eaa6930d3385d2bde19b5103ae1e51ca1a799f2f455c562e0b4ee5ec875c30ad0733f SHA512 067e958eee7fa751a79e8fd38cd57094fd212762966f4ba68a0e9ae5ede7ab4eaa2629941f57c01d464df3638f6386e567ff0097120148ccdba0ca095d750c5a
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..cd0348a0133a
--- /dev/null
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Foreign function interface for C and Objective-C libraries"
+HOMEPAGE="http://www.koguro.net/prog/c-wrapper/"
+SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 x86"
+IUSE="examples"
+
+RDEPEND="dev-scheme/gauche
+	virtual/libffi"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-closure.patch
+	"${FILESDIR}"/${PN}-gcc-5.patch
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-glibc-2.25.patch
+)
+HTML_DOCS=( doc/${PN}-ref{e,j}.html )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-closure.patch b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
new file mode 100644
index 000000000000..24be1d052fd7
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
@@ -0,0 +1,10 @@
+--- a/src/closure_alloc.c
++++ b/src/closure_alloc.c
+@@ -100,6 +100,7 @@
+             ++(node->n);
+             return;
+         }
++        node = node->next;
+     }
+ 
+     node = malloc(sizeof(FreeNode));
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
new file mode 100644
index 000000000000..091b1e2da105
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -0,0 +1,45 @@
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -1668,6 +1668,7 @@
+ {
+     static ScmObj trigger_line = SCM_FALSE;
+     ScmObj line_str;
++    ScmObj regexp = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
+ 
+     /* skip the first line '# 1 "<stdin>"' */
+     Scm_ReadLineUnsafe(SCM_PORT(in));
+@@ -1682,16 +1683,26 @@
+         }
+     }
+ 
+-    while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+-        if (SCM_NULLP(macro_list)) {
++    line_str = SCM_NIL;
++    while (!SCM_NULLP(macro_list)) {
++        ScmObj body_str = line_str;
++        if (SCM_NULLP(body_str)
++            && SCM_EOFP(body_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+             Scm_Error("[bug] lost macro body");
+-        } else {
+-            ScmObj pos_name_args = SCM_CDAR(macro_list);
+-            macro_list = SCM_CDR(macro_list);
+-            Scm_FilenameSet(SCM_CAAR(pos_name_args));
+-            Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
+-            parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
+         }
++        while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++            && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++            if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
++                Scm_Error("[bug] unexpected EOF while parsing macro body");
++            }
++            body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
++            line_str = SCM_NIL;
++        }
++        ScmObj pos_name_args = SCM_CDAR(macro_list);
++        macro_list = SCM_CDR(macro_list);
++        Scm_FilenameSet(SCM_CAAR(pos_name_args));
++        Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
++        parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
+     }
+ 
+     SCM_RETURN(SCM_UNDEFINED);
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
new file mode 100644
index 000000000000..e94d55fa0d21
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
@@ -0,0 +1,51 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@
+ 
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
++PKG_CHECK_MODULES([FFI], [libffi])
+ 
+ dnl Platform-dependent configuration.
+ AC_ARG_ENABLE(objc, [  --enable-objc           turn on Objective-C support])
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,9 +20,10 @@
+ GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
+ INSTALL        = @GAUCHE_INSTALL@
+ 
+-CPPFLAGS       = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
++CPPFLAGS       = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
++CFLAGS         = @CFLAGS@
+ LDFLAGS        = @LDFLAGS@
+-LIBS           = libffi/.libs/libffi.a @LIBS@
++LIBS           = @FFI_LIBS@ @LIBS@
+ 
+ YACC           = @YACC@
+ 
+@@ -38,7 +39,7 @@
+ SCMFILES  = 
+ HEADERS   = 
+ 
+-TARGET    = libffi/.libs/libffi.a $(ARCHFILES)
++TARGET    = $(ARCHFILES)
+ GENERATED = libffi
+ CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
+ 
+@@ -62,13 +63,13 @@
+ 	cd libffi; $(MAKE)
+ 
+ c-ffi.$(SOEXT): $(ffi_SRCS)
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
+ 
+ c-lex.$(SOEXT): $(clex_SRCS)
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
+ 
+ c-parser.$(SOEXT): $(cparser_SRCS) y.tab.c
+-	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
++	$(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
+ 
+ c-grammar.y: c-grammar.scm genyacc.scm
+ 	$(GOSH) genyacc.scm --outfile=c-grammar.y $<
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
new file mode 100644
index 000000000000..0776b255bbac
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
@@ -0,0 +1,13 @@
+--- a/lib/c-wrapper/c-parser.scm
++++ b/lib/c-wrapper/c-parser.scm
+@@ -1115,7 +1115,9 @@
+                 (raise e))))
+      (call-with-gcc-io include-dirs headers options
+                        (lambda (in out)
+-                         (let ((macro-list (queue->list (macro-queue))))
++                         (let ((macro-list (filter (lambda (m)
++                                                     (not (string-prefix?  "__glibc_macro_warning" (car m))))
++                                                   (queue->list (macro-queue)))))
+                            (for-each (lambda (macro-def)
+                                        (display (car macro-def) out)
+                                        (newline out))
diff --git a/dev-scheme/c-wrapper/metadata.xml b/dev-scheme/c-wrapper/metadata.xml
new file mode 100644
index 000000000000..7ffc4339bc56
--- /dev/null
+++ b/dev-scheme/c-wrapper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/chicken-4.13.0-r1 b/dev-scheme/chicken-4.13.0-r1
deleted file mode 100644
index 82969e242cd0..000000000000
--- a/dev-scheme/chicken-4.13.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DESCRIPTION=Scheme interpreter and native Scheme to C compiler
-EAPI=6
-HOMEPAGE=http://www.call-cc.org/
-IUSE=doc
-KEYWORDS=alpha amd64 ppc ppc64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://code.call-cc.org/releases/4.13.0/chicken-4.13.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9082693385e50ca4c701c54f60866c61
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
new file mode 100644
index 000000000000..03bc5fd1db4c
--- /dev/null
+++ b/dev-scheme/chicken/Manifest
@@ -0,0 +1,3 @@
+DIST chicken-4.13.0.tar.gz 4244358 BLAKE2B c40a28346fb6cd144e33605235ed022d48103edd1db1ae35e109e266989caaa0bf8fabf75e8b9cb740ac8bf4e3fba74218763573485127acacd001b8767cd088 SHA512 02c2035b4f81da6f4af2d246361ce8debdc9d9c663c3f43b7afb9abbf1ff591a2bb8fa144511b4d747a373dea4dcd9c10cac48466bf97032db76f3830c08709d
+EBUILD chicken-4.13.0-r1.ebuild 1705 BLAKE2B a7a2776b55a6fbdd138c97d19dee33da35c318a702bc5111d7f2cd00ce51092c3d48d4e20d1bb3d73ad312f9ea47e25bde8109c88f9a683cd8681f6dfe05dcd9 SHA512 13ef326edf1f30542962c0c00f45bcab8649fdbc996602113af1494ac0b12c4a10c4a7f23b89163eb44b81fd899432758c75ec3ff1a251f85163f283b7e3a551
+MISC metadata.xml 936 BLAKE2B 96cbe24b66ac44357e600e229b2253fafb8812aa374903295f4eb252c32d5f7db20e18f22fe8cd8e150c9ab5deb9a92b5a8ff5c086e569db4f0f3853a9f8290f SHA512 089503adb17c643f2f28b90102eae6c706e3f187c1cc060bfc86626fc6e5bea03b6ec53c7f799586b61e107ed295a6b416358df12f8434f2e3caf3b0ace061ea
diff --git a/dev-scheme/chicken/chicken-4.13.0-r1.ebuild b/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
new file mode 100644
index 000000000000..79869531ff47
--- /dev/null
+++ b/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_PV=$(get_version_component_range 1-3)
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="http://www.call-cc.org/"
+SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	#Because chicken's Upstream is in the habit of using variables that
+	#portage also uses :( eg. $ARCH and $A
+	sed "s,A\(\s?=\|)\),chicken&," \
+		-i Makefile.cross-linux-mingw defaults.make rules.make || die
+	sed "s,ARCH,zARCH," \
+		-i Makefile.* defaults.make rules.make || die
+	sed -e "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," \
+		-e "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${PF}," \
+		-i defaults.make || die
+
+	if ! use doc; then
+		rm -rf manual || die
+		# Without this Makefile tries to re-bootstrap the compiler
+		touch build-version.c
+	fi
+}
+
+src_compile() {
+	emake -j1 PLATFORM=linux PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		HOSTSYSTEM="${CBUILD}"
+}
+
+src_test() {
+	cd tests
+	./runtests.sh || die
+}
+
+src_install() {
+	# still can't run make in parallel for the install target
+	emake -j1 PLATFORM=linux PREFIX=/usr DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" install
+
+	rm "${D}"/usr/share/doc/${PF}/LICENSE || die
+
+	# README is installed by Makefile
+	dodoc NEWS
+
+	# Let portage track this file (created later)
+	touch "${D}"/usr/$(get_libdir)/chicken/8/modules.db || die
+}
+
+pkg_postinst() {
+	# Create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
new file mode 100644
index 000000000000..0d1a5690eef1
--- /dev/null
+++ b/dev-scheme/chicken/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>ewfalor@gmail.com</email>
+	<name>Erik Falor</name>
+</maintainer>
+<maintainer type="person">
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+<maintainer type="project">
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
+portable, efficient C, supports almost all of the current Scheme language
+standard, the Revised5 Report on the Algorithmic Language Scheme (R5RS ), and
+includes many enhancements and extensions. CHICKEN runs on MacOS X, Windows, and
+many Unix flavours.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/elk-3.99.8 b/dev-scheme/elk-3.99.8
deleted file mode 100644
index 194ebf19bdab..000000000000
--- a/dev-scheme/elk-3.99.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=Scheme implementation designed to be embeddable extension to C/C++ applications
-EAPI=4
-HOMEPAGE=http://sam.zoy.org/elk
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://sam.zoy.org/elk/elk-3.99.8.tar.bz2
-_md5_=1006e4b60db72c9858ca63617d8275cc
diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest
new file mode 100644
index 000000000000..e95adfb7cda0
--- /dev/null
+++ b/dev-scheme/elk/Manifest
@@ -0,0 +1,3 @@
+DIST elk-3.99.8.tar.bz2 701206 BLAKE2B 93105702c2d8796fe0d1f7f4c1d0f4b128f01755d6f4366840978ed2224a2a3c27d261dc0cb6a3f8d0e199e9ba9c2ff1a5a61dbc5d593b122b40585c0fe631d8 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49
+EBUILD elk-3.99.8.ebuild 672 BLAKE2B 5dd2afd9246b2a40aa3f6418efe185fce7173e0a6ff0586f835d6bbc8cc18ba569f2d0852d754ad05b34777c7967f70f237af88c8179d273486429d43003d5d5 SHA512 d10c9e5cb66947d1768a467841803140fefb03196025ea5dea7b86e90087deda61620d10d593556a96ef495c8492f10bb875eedfec95803dfefb38e07f28e40a
+MISC metadata.xml 547 BLAKE2B dc640059cc4b8319dc041faf3e23d9d538621594783e8f4ed11083fc4cda5dcd85c1668f4bf48eb7eeea7de7e4765ed6db88a5543d4185db20aea06d82e1d548 SHA512 e1b074c8d4c1757696aeebf4baaf6f81dea9ea5d7c26aeabf08165be1db955556e77ff96d384557b22f6d508bc3393931b66e7690f3541bd702880827342a9d4
diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild
new file mode 100644
index 000000000000..cf741d71b8c2
--- /dev/null
+++ b/dev-scheme/elk/elk-3.99.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications"
+HOMEPAGE="http://sam.zoy.org/elk"
+SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	# parallel build is broken
+	emake -j1 || die "Make failed!"
+}
+
+# tests are run automatically during make and fail with default src_test
+src_test() {
+	echo "Tests already run during compile"
+}
+
+src_install() {
+	# parallel install is broken
+	emake -j1 DESTDIR="${D}" install || die "Install failed"
+}
diff --git a/dev-scheme/elk/metadata.xml b/dev-scheme/elk/metadata.xml
new file mode 100644
index 000000000000..77f00b6bf41b
--- /dev/null
+++ b/dev-scheme/elk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+Elk is an implementation of the Scheme programming language. In contrast to existing, stand-alone Scheme systems Elk has been designed specifically as an embeddable, reusable extension language subsystem for applications written in C or C++. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/escm-1.1-r1 b/dev-scheme/escm-1.1-r1
deleted file mode 100644
index 45865532cab0..000000000000
--- a/dev-scheme/escm-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=escm - Embedded Scheme Processor
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/vault/escm.html
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=BSD
-RDEPEND=|| ( dev-scheme/gauche dev-scheme/guile )
-SLOT=0
-SRC_URI=http://practical-scheme.net/vault/escm-1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bd10aac6509aa872e5df1adc8422b7f1
diff --git a/dev-scheme/escm/Manifest b/dev-scheme/escm/Manifest
new file mode 100644
index 000000000000..11eaf68743fd
--- /dev/null
+++ b/dev-scheme/escm/Manifest
@@ -0,0 +1,3 @@
+DIST escm-1.1.tar.gz 22344 BLAKE2B 4b1ee5a2e002cf0908c1cba58d39dc454cfcedcb11ff7f24344824947103d7670108263d210e020b7d0189f3745a002bb4345d8b50a9f334d89850baa30c9ae9 SHA512 7df97d8b9e7c4b46b412e3dd24a2b0b3f4028d45b1940d12b09f0801c93ab1868ef5c239d8f1bfb18d5c86f473aa543d9b735eb1f05b4bb3e4b17177d2ed9102
+EBUILD escm-1.1-r1.ebuild 645 BLAKE2B 545844fe9195db6ef4e55a5864b9631b3a05d0ba2faabcf047babd2c8f0f3c5e4a1da64b80363c7757470f1106f206295ceabb065f45dec19e4a5b218660963f SHA512 897f3e028752f2e573739211b7a9db42f54906baf606518d76db67da44883d333930a05b78774a2e4b3ce9891524a8c33763810e98a8a75dc05b6306e9abe64e
+MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-scheme/escm/escm-1.1-r1.ebuild b/dev-scheme/escm/escm-1.1-r1.ebuild
new file mode 100644
index 000000000000..2881ec1fb9fa
--- /dev/null
+++ b/dev-scheme/escm/escm-1.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="escm - Embedded Scheme Processor"
+HOMEPAGE="http://practical-scheme.net/vault/escm.html"
+SRC_URI="http://practical-scheme.net/vault/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 x86"
+IUSE=""
+
+RDEPEND="|| (
+		dev-scheme/gauche
+		dev-scheme/guile
+	)"
+S="${WORKDIR}/${PN}"
+
+HTML_DOCS=( ${PN}.html )
+
+src_prepare() {
+	sed -i -e "6s/scm, snow/scm gosh, gosh/" configure.in
+
+	default
+	eautoconf
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
+}
diff --git a/dev-scheme/escm/metadata.xml b/dev-scheme/escm/metadata.xml
new file mode 100644
index 000000000000..21dc8fdf43ff
--- /dev/null
+++ b/dev-scheme/escm/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/gambit-4.8.8 b/dev-scheme/gambit-4.8.8
deleted file mode 100644
index 7e8a7d2fbdfe..000000000000
--- a/dev-scheme/gambit-4.8.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=emacs? ( virtual/emacs )
-DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
-EAPI=6
-HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
-IUSE=emacs static
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=|| ( Apache-2.0 LGPL-2.1 )
-SLOT=0
-SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fef98abc7858c148405dc53f68335bb4
diff --git a/dev-scheme/gambit-4.8.8-r1 b/dev-scheme/gambit-4.8.8-r1
deleted file mode 100644
index 578c01093873..000000000000
--- a/dev-scheme/gambit-4.8.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=ssl? ( dev-libs/openssl:0 ) emacs? ( virtual/emacs )
-DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
-EAPI=6
-HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
-IUSE=emacs ssl static
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=|| ( Apache-2.0 LGPL-2.1 )
-RDEPEND=ssl? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b6e61021d5d858d62e20919fc8a4389
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
new file mode 100644
index 000000000000..09cd77d48570
--- /dev/null
+++ b/dev-scheme/gambit/Manifest
@@ -0,0 +1,5 @@
+AUX 50gambit-gentoo.el 386 BLAKE2B bf791e4b89573dcc5a4da472cb198dc9fb5f43f88f420089ffe543016e4f8483fc3a5ad4e1f7752d6a6d5a006556b268bd1a7360afc470c436fec96156b2e13d SHA512 acf956bd70c176b4cccbdab2dd1611ef5a30b7899d51b32341509168fdac52312f0f543c5c519ed005049a2e40d9dcfc67284adaebedd9a781fe12a3ea974e97
+DIST gambit-v4_8_8.tgz 13272335 BLAKE2B d15bf944c8da3050c1fee6854044d904712075f070d75797c463a5510590514a06a4f05a81697d4bcd814adc5c00693f27b09834624909356049c02bbad02419 SHA512 99367cf5726d0d3aa59e39f1ef8b69347d92b7f3055e0656d66cbadb69ed4d8e499825395eddd41a4409b9cc57c2d2242ac5b8c29c37b84950b57468b5d92909
+EBUILD gambit-4.8.8-r1.ebuild 1262 BLAKE2B eab93729c4a70ede0c25aee2cce40342718f39adec2c4a913775871f0fe08baa4a7a69c331d8c53e191251d8930e9e504c75b6cfdc6f60fb072a1793abe1c4df SHA512 ae4f5b4df3d72634074c882b76f73a7261a46a6978a5fe2387a91d94c3ca56ee1d99042b84e0adf78568938246a8ebb023f809a07eceeb0cda15facc844698b3
+EBUILD gambit-4.8.8.ebuild 1188 BLAKE2B b3e23d0375a5685da7d30c78b0cd90a555fbac4d41764eedc000e971d885e80c442750b2b8f7d9509bce69e443cf8d3c046dc7c503e5daec847f832edaf3b8b7 SHA512 b0f01ac4dc050fbfbe0943369039efbc483e570123c58ce3ebcdddd250dd73889f6283edc7cfaee74c294ec634ac8fa736356e41bf7cebb8aaf4af9035255115
+MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
diff --git a/dev-scheme/gambit/files/50gambit-gentoo.el b/dev-scheme/gambit/files/50gambit-gentoo.el
new file mode 100644
index 000000000000..2e8e196ba04d
--- /dev/null
+++ b/dev-scheme/gambit/files/50gambit-gentoo.el
@@ -0,0 +1,10 @@
+
+;;; gambit site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'gambit-inferior-mode "gambit" "Hook Gambit mode into cmuscheme.")
+(autoload 'gambit-mode "gambit" "Hook Gambit mode into scheme.")
+
+;; (add-hook 'inferior-scheme-mode-hook (function gambit-inferior-mode))
+;; (add-hook 'scheme-mode-hook (function gambit-mode))
+;; (setq scheme-program-name "gsi -:t")
diff --git a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
new file mode 100644
index 000000000000..3922406eab4c
--- /dev/null
+++ b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils elisp-common
+
+MY_PV="${PV//./_}"
+MY_P="${PN}-v${MY_PV}"
+
+DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter"
+HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
+SRC_URI="http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/source/${MY_P}.tgz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="ssl? ( dev-libs/openssl:0 )"
+DEPEND="
+	${RDEPEND}
+	emacs? ( virtual/emacs )
+"
+
+SITEFILE="50gambit-gentoo.el"
+
+S="${WORKDIR}/${MY_P}" #-devel
+
+IUSE="emacs ssl static"
+
+src_configure() {
+	econf $(use_enable !static shared) \
+		$(use_enable ssl openssl) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--enable-gnu-gcc-specific-options \
+		--enable-gnu-gcc-no-strict-aliasing \
+		--enable-single-host \
+		--disable-absolute-shared-libs \
+		--enable-type-checking
+}
+
+src_compile() {
+	emake bootstrap
+
+	if use emacs; then
+		elisp-compile misc/*.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /usr/share/"${MY_PN}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/gambit/gambit-4.8.8.ebuild b/dev-scheme/gambit/gambit-4.8.8.ebuild
new file mode 100644
index 000000000000..999cda7fb2eb
--- /dev/null
+++ b/dev-scheme/gambit/gambit-4.8.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils elisp-common
+
+MY_PV="${PV//./_}"
+MY_P="${PN}-v${MY_PV}"
+
+DESCRIPTION="Gambit-C is a native Scheme to C compiler and interpreter"
+HOMEPAGE="http://www.iro.umontreal.ca/~gambit/"
+SRC_URI="http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/source/${MY_P}.tgz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND=""
+
+SITEFILE="50gambit-gentoo.el"
+
+S="${WORKDIR}/${MY_P}" #-devel
+
+IUSE="emacs static"
+
+src_configure() {
+	econf $(use_enable !static shared) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--enable-gnu-gcc-specific-options \
+		--enable-gnu-gcc-no-strict-aliasing \
+		--enable-single-host \
+		--disable-absolute-shared-libs \
+		--enable-type-checking
+}
+
+src_compile() {
+	emake bootstrap
+
+	if use emacs; then
+		elisp-compile misc/*.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /usr/share/"${MY_PN}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/gambit/metadata.xml b/dev-scheme/gambit/metadata.xml
new file mode 100644
index 000000000000..8703fdc61595
--- /dev/null
+++ b/dev-scheme/gambit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-0.9.5 b/dev-scheme/gauche-0.9.5
deleted file mode 100644
index 24d8baa0b4cd..000000000000
--- a/dev-scheme/gauche-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm test? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Unix system friendly Scheme Interpreter
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=ipv6 libressl test
-KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/gdbm
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.5.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=38c03abb06b889349f206c7e87610adb
diff --git a/dev-scheme/gauche-0.9.6 b/dev-scheme/gauche-0.9.6
deleted file mode 100644
index 15885ff1959c..000000000000
--- a/dev-scheme/gauche-0.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls ) test? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Unix system friendly Scheme Interpreter
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=ipv6 libressl mbedtls test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls )
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.6.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b4b56419b21d6dc67f7ff2ce65406c05
diff --git a/dev-scheme/gauche-cdb-0.3.1-r1 b/dev-scheme/gauche-cdb-0.3.1-r1
deleted file mode 100644
index 2433e8a31f51..000000000000
--- a/dev-scheme/gauche-cdb-0.3.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-scheme/gauche dev-db/tinycdb >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=CDB binding for Gauche
-EAPI=4
-HOMEPAGE=http://sourceforge.jp/projects/gauche/
-KEYWORDS=ia64 x86
-LICENSE=BSD
-RDEPEND=dev-scheme/gauche dev-db/tinycdb
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/gauche/8407/Gauche-cdb-0.3.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b080bddcaa8299d969574fd90ced2c0
diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
new file mode 100644
index 000000000000..acf3017016e9
--- /dev/null
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -0,0 +1,5 @@
+AUX gauche-cdb-0.3.1-gauche-package.diff 3751 BLAKE2B 622fe297d0230387861592c65ebefbc9d46c281378199589765782793599565a97ad4e878fb6fa36ad0a526be98119e10f6730ffc8f166d62f4a23e20a996773 SHA512 8c7e95615e1a54125d972d0ad88ae58964cc72d1d7a993e5e04ef8cac6c12e146f01248d0de3879e1633c6335e2077e1a4b4071684b6e20490bcd163ff9accf4
+AUX gauche-cdb-0.3.1-undefined-reference.diff 709 BLAKE2B 0f3332a6599c0b1d698a81f144c685de75505f3d9b7b68ab5a298e0aba4e0221aea1372c30ae737f3eb2b6893877efd35149023cb0f783a3409d48deb3f20b58 SHA512 9f4aa26b4ca3196e683eba79dfd719f291a45fd0a5783718bfe6ffb1cd70d2067d4181df17dc100a128552cadd721b8c82a777a481b7c008d92cafc764441587
+DIST Gauche-cdb-0.3.1.tar.gz 72048 BLAKE2B f4363ec9893e3f365c34965414620b46c08edcfdf5ed95a5934aeedd3af6e58f1cdedb7c4df90e95fa5a93ce3f95aeeb08fca0f3a440990d3383cd72bef8aa87 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68
+EBUILD gauche-cdb-0.3.1-r1.ebuild 580 BLAKE2B be24c4a876da31bb8d422d86fafda86f069db7858258cf6bf4d3ac9607732322e1fc29a81ef114e907a9c920fee98823b89253ae194db7f466dbe68bde900b28 SHA512 107348b757fa9fa4b5d01a1a9610f9a832311ab43124c9fe8920fe9415cd2952ec18f8cbef881110741f3153713ae7f920bbf344073f74118218f4f607e4a9d5
+MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff
new file mode 100644
index 000000000000..ae093062243d
--- /dev/null
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff
@@ -0,0 +1,133 @@
+--- Gauche-cdb-0.3.1.orig/Makefile.in
++++ Gauche-cdb-0.3.1/Makefile.in
+@@ -10,76 +10,57 @@
+ VPATH       = $(srcdir)
+ 
+ # These may be overridden by make invocators
+-DESTDIR  =
+-OPTFLAGS = @OPTFLAGS@
+-CC       = @CC@
+-LIBS     = @LIBS@
+-CFLAGS   = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
+-LDFLAGS  = @LDFLAGS@
+-INSTALL  = @INSTALL@
+-INSTALL_TYPE = @INSTALL_TYPE@
+-
+-# Set by configure
+-GOSH     = @GOSH@
+-GAUCHE_CONFIG = @GAUCHE_CONFIG@
++DESTDIR        =
++CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++GOSH           = "@GOSH@"
++GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
++INSTALL        = "@GAUCHE_INSTALL@"
++
++# Other parameters
++SOEXT    = @SOEXT@
+ OBJEXT   = @OBJEXT@
+-DSOEXT   = @SOEXT@
++EXEEXT   = @EXEEXT@
+ 
+-MODULE   = cdb
++# Module-specific stuff
++PACKAGE   = cdb
+ 
+-ARCHFILES = $(MODULE).$(DSOEXT)
+-SCMFILES  = $(MODULE).scm
++ARCHFILES = $(PACKAGE).$(SOEXT)
++SCMFILES  = $(PACKAGE).scm
+ HEADERS   =
+ 
+ TARGET    = $(ARCHFILES)
+-OBJS      = $(MODULE)_head.$(OBJEXT) \
+-            cdb.$(OBJEXT) \
+-            $(MODULE)_tail.$(OBJEXT)
+-GENERATED = cdb.c $(MODULE)_head.c $(MODULE)_tail.c
++GENERATED =
+ CONFIG_GENERATED = Makefile config.cache config.log config.status \
+-		   configure.lineno autom4te*.cache
+-
+-HEADER_INSTALL_DIR  = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
+-SCM_INSTALL_DIR     = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`/dbm
+-ARCH_INSTALL_DIR    = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
+-
+-all : $(TARGET)
+-
+-.SUFFIXES: .o .stub
++		   configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
+ 
+-.c.o:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++HEADER_INSTALL_DIR  = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
++SCM_INSTALL_DIR     = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
++ARCH_INSTALL_DIR    = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
+ 
+-.stub.c:
+-	$(GOSH) genstub $<
++cdb_SRCS = cdb.stub
++cdb_LIBS = @LIBCDB@
+ 
+-$(MODULE).$(DSOEXT): $(OBJS)
+-	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBCDB@
++all : $(TARGET)
+ 
+-$(MODULE)_head.c $(MODULE)_tail.c :
+-	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
++$(PACKAGE).$(SOEXT): $(cdb_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose \
++	    --libs="$(cdb_LIBS)" --cppflags="$(CPPFLAGS)" \
++	    $(PACKAGE) $(cdb_SRCS)
+ 
+ check : all
+ 	@rm -f test.log
+ 	$(GOSH) -I. test.scm > test.log
+ 
+ install : all
+-	if test ! -z "$(HEADERS)"; then \
+-	  $(INSTALL) -d $(HEADER_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(HEADERS) $(HEADER_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(SCMFILES)"; then \
+-	  $(INSTALL) -d $(SCM_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(SCMFILES) $(SCM_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(ARCHFILES)"; then \
+-	  $(INSTALL) -d $(ARCH_INSTALL_DIR); \
+-	  $(INSTALL) -m 555 $(ARCHFILES) $(ARCH_INSTALL_DIR); \
+-	fi
++	$(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/dbm $(SCMFILES)
++	$(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd
+ 
+ clean :
+-	rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations
++	$(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(cdb_SRCS)
++	rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
+--- Gauche-cdb-0.3.1.orig/configure.ac
++++ Gauche-cdb-0.3.1/configure.ac
+@@ -4,18 +4,11 @@
+ AC_INIT(Gauche-cdb, 0.3.1)
+ AC_CONFIG_SRCDIR(cdb.stub)
+ 
+-AC_CANONICAL_SYSTEM
+-
+ AC_GAUCHE_INIT_EXT
+-AC_GAUCHE_INSTALL_TYPE(site)
+ AC_GAUCHE_CC
+-AC_GAUCHE_FLAGS
+-
+-AC_PROG_INSTALL
+ 
+ AC_LIB_LINKFLAGS(cdb)
+ 
+-AC_GAUCHE_FIX_LIBS
+-
++AC_GAUCHE_MAKE_GPD
+ echo $PACKAGE_VERSION > VERSION
+ AC_OUTPUT(Makefile)
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff
new file mode 100644
index 000000000000..b63a68ddbda2
--- /dev/null
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff
@@ -0,0 +1,22 @@
+--- Gauche-cdb-0.3.1.orig/cdb.scm
++++ Gauche-cdb-0.3.1/cdb.scm
+@@ -60,7 +60,7 @@
+   (unless (slot-bound? self 'path)
+     (error "path must be set to open cdb database"))
+   (when (cdb-file-of self)
+-    (errorf "cdb ~S already opened" cdb))
++    (errorf "cdb ~s already opened" (cdb-file-of self)))
+   (let ((path (slot-ref self 'path))
+         (rwmode (slot-ref self 'rw-mode)))
+     (case rwmode
+--- Gauche-cdb-0.3.1.orig/cdb.stub
++++ Gauche-cdb-0.3.1/cdb.stub
+@@ -69,7 +69,7 @@
+ 
+  static void cdb_finalize(ScmObj obj, void *data)
+  {
+-   ScmCdb *cdb = SCM_CDB(cdb);
++   ScmCdb *cdb = SCM_CDB(obj);
+    switch (cdb->status) {
+    case OPEN_QUERY:
+      cdb_free(&cdb->cdb); close(cdb_fileno(&cdb->cdb));
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..04f12d3afa76
--- /dev/null
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+MY_P="${P/g/G}"
+
+DESCRIPTION="CDB binding for Gauche"
+HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="ia64 x86"
+IUSE=""
+
+RDEPEND="dev-scheme/gauche
+	dev-db/tinycdb"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gauche-package.diff
+	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	eautoreconf
+}
diff --git a/dev-scheme/gauche-cdb/metadata.xml b/dev-scheme/gauche-cdb/metadata.xml
new file mode 100644
index 000000000000..c30645235ea2
--- /dev/null
+++ b/dev-scheme/gauche-cdb/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">gauche</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-gl-0.6 b/dev-scheme/gauche-gl-0.6
deleted file mode 100644
index 19be14c5c5a0..000000000000
--- a/dev-scheme/gauche-gl-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-scheme/gauche-0.9.4 media-libs/freeglut virtual/opengl x11-libs/libXmu cg? ( media-gfx/nvidia-cg-toolkit )
-DESCRIPTION=OpenGL binding for Gauche
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=cg examples
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=>=dev-scheme/gauche-0.9.4 media-libs/freeglut virtual/opengl x11-libs/libXmu cg? ( media-gfx/nvidia-cg-toolkit )
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-gl-0.6.tgz
-_md5_=fc945bfbafe3c0f82562426822223fba
diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
new file mode 100644
index 000000000000..d9261c5d427b
--- /dev/null
+++ b/dev-scheme/gauche-gl/Manifest
@@ -0,0 +1,4 @@
+AUX gauche-gl-0.6-simple.viewer.patch 806 BLAKE2B a2e3e35f704a108ec6bf7a809558db14daddb972487aa11dbbca01d894ba5752822ea4f2f869722a96043543fd3c794c2b92bcc2091184a957059b4c2f90afc4 SHA512 ed9d08b02e7035b5415cefb501b323a86e434389149f49ec3612e00a282c5b709da2f900768749577387537189f68e2ac32320ecae118dd32ec4fed5ea40407f
+DIST Gauche-gl-0.6.tgz 1369790 BLAKE2B b077eeee7a2d64908b36e1d279a1131eef40e98104a983e581856320529207682d17e2c9577ff892c873492f4b78631d86a4c642b1e4f8ecd364acb4ee41482e SHA512 60f763ba832048f9932cabd2e8ce8595ba2a1f0b86f1212b1f6919d6b9b8ba33ed1076f119e53059ceac7f6e46a6ead3ba0e23cce81af3097355cd97b3b4b673
+EBUILD gauche-gl-0.6.ebuild 982 BLAKE2B 77b819cd9a4a400b2d5ce6f87c81062fe2c96295335f4d02101ffb9bb10e74050e6886930789fd0762184a3eaa1f4ffdfeab33e457c99375cd8dafedffbcf273 SHA512 ab2f53872ff4e5a3716d1f964b3e44c008b9a05a53bace9d19322a27cda9d0cb8989f4c182adc7a2fb044a6299efd1e246a874850ebe95b4b92458ecf32a9d34
+MISC metadata.xml 511 BLAKE2B 7f30786edc8a2494edd39bb70eb224120d66f403d44a90df2f6c64a5522ecfef0664b0bb9483eb8d03407bb820f95bf4ef7a1f60a56aa47dcd41ba446b358f8c SHA512 0d55a838abec8b2f819168db7bd079defa5e4b0c4e7737a6fb3e913b030faacfec52825c4d55edbae8b6fdd6f782b7640bf9fc2bbf992993249f85d1353f50d4
diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.patch
new file mode 100644
index 000000000000..1f5cf8ecacf2
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-simple.viewer.patch
@@ -0,0 +1,25 @@
+From 723309ac3e7aa031e2ebd6c9b059d94e42006de3 Mon Sep 17 00:00:00 2001
+From: Shiro Kawai <shiro@acm.org>
+Date: Sat, 9 Aug 2014 22:19:04 -1000
+Subject: [PATCH] Fix incorrect macro definition
+
+---
+ lib/gl/simple/viewer.scm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/gl/simple/viewer.scm b/lib/gl/simple/viewer.scm
+index 857b8d7..9a464ce 100644
+--- a/lib/gl/simple/viewer.scm
++++ b/lib/gl/simple/viewer.scm
+@@ -381,7 +381,7 @@
+        (match opts
+          [() (set! default3-var proc)]
+          [(':perspective)  (set! default3-var proc)]
+-         [(':orthographic) (set! default3-var proc)]
++         [(':orthographic) (set! default2-var proc)]
+          [(name)
+           (cond [(name->window name) => (^[win] (ref win'closure) 'key proc)]
+                 [else
+-- 
+2.0.3
+
diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
new file mode 100644
index 000000000000..17f401405eb6
--- /dev/null
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="${P^g}"
+
+DESCRIPTION="OpenGL binding for Gauche"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cg examples"
+
+RDEPEND=">=dev-scheme/gauche-0.9.4
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXmu
+	cg? ( media-gfx/nvidia-cg-toolkit )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch )
+
+src_configure() {
+	econf $(usex cg --enable-cg "")
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.scm
+		# install simple
+		dodoc -r examples/simple
+		# install glbook
+		dodoc -r examples/glbook
+		dodoc -r examples/images
+		# install slbook
+		dodoc -r examples/slbook
+		# install cg examples
+		use cg && dodoc -r examples/cg
+	fi
+}
diff --git a/dev-scheme/gauche-gl/metadata.xml b/dev-scheme/gauche-gl/metadata.xml
new file mode 100644
index 000000000000..1cf61eefae9c
--- /dev/null
+++ b/dev-scheme/gauche-gl/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<longdescription>
+		OpenGL binding of Gauche
+	</longdescription>
+	<use>
+		<flag name="cg">Enable NVidia Cg binding</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">shirok/Gauche-gl</remote-id>
+		<remote-id type="sourceforge">gauche</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-gtk-0.6_pre1 b/dev-scheme/gauche-gtk-0.6_pre1
deleted file mode 100644
index 7ae3734600d6..000000000000
--- a/dev-scheme/gauche-gtk-0.6_pre1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK2 binding for Gauche
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=examples glgd nls opengl
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=x11-libs/gtk+:2 dev-scheme/gauche opengl? ( x11-libs/gtkglext dev-scheme/gauche-gl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/shirok/Gauche-gtk2/archive/6fca535f7bb950f81db066bd1afdca9d55e9b460.tar.gz -> Gauche-gtk-0.6_pre1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=e347e4086b4ba1789237e0f43db6b409
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
new file mode 100644
index 000000000000..8a57b6728499
--- /dev/null
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST Gauche-gtk-0.6_pre1.tar.gz 205235 BLAKE2B 90f2c69c7521817fd81bee007618fe35c6a20678812139f2f99964cccb953e6ceaa301886a703702ac67184526d5cb3d24db786ef0869f54490acbcb6e3745f3 SHA512 5d47af94f3683c25787bb31b2b077ab5526f84e67db49b95a04d59ee57d1249a9b6666a9223305fe47597a2fa77a6e8d81507a05b1a83a4a76ac5f867738f228
+EBUILD gauche-gtk-0.6_pre1.ebuild 1390 BLAKE2B 0de1649be822ec57f2eb0096f3a0a02c55c43234f5f5afb0b98ce63709a3070f3385b6bd84cd845a667a8fa4647b11df28cc44dce7ba8c36bb4af8c0a3f3afd7 SHA512 e41c093a915947b78468c57dc02d8c2fb7c30fff7e036bcceea39fe80c3a31097df8181cc9858bc7e69877b7dc169dca7d51d5bf5315d7b0ac85eca48f1728d9
+MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
new file mode 100644
index 000000000000..258e582076d3
--- /dev/null
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools vcs-snapshot
+
+MY_P="${P/g/G}"
+MY_PN="${PN/g/G}2"
+PV_COMMIT="6fca535f7bb950f81db066bd1afdca9d55e9b460"
+
+DESCRIPTION="GTK2 binding for Gauche"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${MY_PN}/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="examples glgd nls opengl"
+RESTRICT="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="x11-libs/gtk+:2
+	dev-scheme/gauche
+	opengl? (
+		x11-libs/gtkglext
+		dev-scheme/gauche-gl
+	)"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	local myconf=()
+	if use opengl; then
+		if use glgd; then
+			if use nls; then
+				myconf+=( --enable-glgd-pango )
+			else
+				myconf+=( --enable-glgd )
+			fi
+		else
+			myconf+=( --enable-gtkgl )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake stubs
+	emake
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.scm
+		# install gtk-tutorial
+		docinto examples/gtk-tutorial
+		dodoc examples/gtk-tutorial/*
+		if use opengl; then
+			# install gtkglext
+			dodoc -r examples/gtkglext
+			if use glgd; then
+				# install glgd
+				dodoc -r examples/glgd
+			fi
+		fi
+	fi
+}
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
new file mode 100644
index 000000000000..4dd4d4ed3fd8
--- /dev/null
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<longdescription>
+		Gauche extension module to use GTK.
+	</longdescription>
+	<use>
+		<flag name="glgd">Enable GL graph draw</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">shirok/Gauche-gtk2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-kakasi-0.1 b/dev-scheme/gauche-kakasi-0.1
deleted file mode 100644
index a48097ffc14a..000000000000
--- a/dev-scheme/gauche-kakasi-0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-scheme/gauche-0.8 >=app-i18n/kakasi-2.3.4
-DESCRIPTION=Kakasi binding for Gauche
-EAPI=0
-HOMEPAGE=http://gauche.sf.net/
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=>=dev-scheme/gauche-0.8 >=app-i18n/kakasi-2.3.4
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-kakasi-0.1.tgz
-_md5_=72e82a1eee90ba0dbd34b4482534a251
diff --git a/dev-scheme/gauche-kakasi/Manifest b/dev-scheme/gauche-kakasi/Manifest
new file mode 100644
index 000000000000..76bcce205cb3
--- /dev/null
+++ b/dev-scheme/gauche-kakasi/Manifest
@@ -0,0 +1,3 @@
+DIST Gauche-kakasi-0.1.tgz 56568 BLAKE2B 965c59918da2005b14c127ea23bf1b7e001809889a1caa9cde5af97b22ea23952dcc269e8860f37354e98264c659f222826cc6e3f7f9db49701c33c3e898246a SHA512 761fb704482f4e6705ca80b894b245391efee92d409e9438e59afae56d0b7d9907ed40ab3a5bcc3ec9f2a8115bdbc622c48eaec3b0ed38c99677bf1f9f0f7bed
+EBUILD gauche-kakasi-0.1.ebuild 526 BLAKE2B 60888ca0e53fd8581eb5adfc9334bbfb385890eeff800cf934031ceee9f6127c03f55c11a628c8764f916e5d74029487b3dad6d0a96d4384f94e6a15fe59507a SHA512 cc49b0f8d98694f90e8e634451485a27990ab3e13417692c457e6f34f1a3380be5bc5e98b77ad78325170c9b837ebf6137f826f5601dfe98bec435096fd77438
+MISC metadata.xml 293 BLAKE2B 20c14387d27ce02863cad327186a68c286d39e41ac1ac6ce6644e275b9ff212fbb772b5135ff16dfec167e29a035230c2d4f433a97905af1f46da5c027a2509b SHA512 68d1c85bbeadabc482cf7953834f7fe7f8b78b063fbb9418a0359b3d877a68e59d548fb546efce013f525e60c288fa9a0a0b58b899af3a1cc4934581957fbae9
diff --git a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
new file mode 100644
index 000000000000..fd5ecde1baa4
--- /dev/null
+++ b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+IUSE=""
+
+MY_P="${P/g/G}"
+
+DESCRIPTION="Kakasi binding for Gauche"
+HOMEPAGE="http://gauche.sf.net/"
+SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="x86"
+SLOT="0"
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=">=dev-scheme/gauche-0.8
+	>=app-i18n/kakasi-2.3.4"
+
+src_compile() {
+
+	econf || die
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog README*
+
+}
diff --git a/dev-scheme/gauche-kakasi/metadata.xml b/dev-scheme/gauche-kakasi/metadata.xml
new file mode 100644
index 000000000000..5a36f36510cd
--- /dev/null
+++ b/dev-scheme/gauche-kakasi/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gauche</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche-qdbm-0.2-r1 b/dev-scheme/gauche-qdbm-0.2-r1
deleted file mode 100644
index db533667e4c2..000000000000
--- a/dev-scheme/gauche-qdbm-0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-scheme/gauche dev-db/qdbm >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=QDBM binding for Gauche
-EAPI=4
-HOMEPAGE=http://sourceforge.jp/projects/gauche/
-KEYWORDS=~sparc x86
-LICENSE=BSD
-RDEPEND=dev-scheme/gauche dev-db/qdbm
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/gauche/6988/Gauche-qdbm-0.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ae32b1a28cfbc512262e89b3938ff17
diff --git a/dev-scheme/gauche-qdbm/Manifest b/dev-scheme/gauche-qdbm/Manifest
new file mode 100644
index 000000000000..51acfe90d2b6
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/Manifest
@@ -0,0 +1,5 @@
+AUX gauche-qdbm-0.2-gauche-package.diff 3815 BLAKE2B 3ec79da0df5f1d4b2f4908b1ad871b0bc1b9314c156f691afa72f85867da343ac618b0aa5aee50ac70922db0541f649f791f3560362f9b4610ea461ee96028cc SHA512 353ac7479a64f3fc1dcf4ced2ca686e81abfb886d17a8b936df84147dea529a419225741a33beb7f098d4b3bd1083d91eb8adbdbde78969a2aa547088ae2607a
+AUX gauche-qdbm-0.2-undefined-reference.diff 422 BLAKE2B fcc8551676e6e3867f9fd4b8fa00a15d292eb79128e1c4224d1ee479db0554ad3b884beffcd7c5b1a4e23e4e02b7cae1933018189fbe97b498ecb9869f4f5e48 SHA512 856346d2c45bea79bb606c751fd48afb8677412a7f17910de4c9f948f6bdeca6b06100bb5e346dcd2a12ae0038043d55ac9d1f930705a1d9b7acf4e7649f78d1
+DIST Gauche-qdbm-0.2.tar.gz 73311 BLAKE2B d8937147368416ef17ca5e953d91a6e906f16e65b73c87d01515346c0be5e5bb3646e7b26a8847d4b29bcf7abd4e7114fdbfd74a122f5fd1cc6205768e1789eb SHA512 9286d22f1ad32f213c34670ca0a3fef4d43da8d7e0bed019cd5891400eb7337cd3adfb7cc788350e1f1ab535b87af0fa0a6096d33fa73da6049888ce0006e821
+EBUILD gauche-qdbm-0.2-r1.ebuild 580 BLAKE2B e1d6aed7431f0e74bcf570600d9c269ab8ce06e1933a10e8ca99f2298f4fa4f0eaa4cb27df34cf33eb7d1696c5edde5447539c5cc632c5c3a59a9c3ad251b3b6 SHA512 2eb7e9ce9df8d696284d5f03bd76d12cfbf62ff0f9a9d54ef1db5dcc791b293014ea5d0737eb8f18967997c0f2542770cde17763883a7302d058791a748bbb61
+MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
new file mode 100644
index 000000000000..a4e305600423
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
@@ -0,0 +1,136 @@
+--- Gauche-qdbm-0.2.orig/Makefile.in
++++ Gauche-qdbm-0.2/Makefile.in
+@@ -10,79 +10,57 @@
+ VPATH       = $(srcdir)
+ 
+ # These may be overridden by make invocators
+-DESTDIR  =
+-OPTFLAGS = @OPTFLAGS@
+-CC       = @CC@
+-LIBS     = @LIBS@
+-CFLAGS   = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
+-LDFLAGS  = @LDFLAGS@
+-INSTALL  = @INSTALL@
+-INSTALL_TYPE = @INSTALL_TYPE@
+-
+-# Set by configure
+-GOSH     = @GOSH@
+-GAUCHE_CONFIG = @GAUCHE_CONFIG@
++DESTDIR        =
++CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++GOSH           = "@GOSH@"
++GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
++INSTALL        = "@GAUCHE_INSTALL@"
++
++# Other parameters
++SOEXT    = @SOEXT@
+ OBJEXT   = @OBJEXT@
+-DSOEXT   = @SOEXT@
++EXEEXT   = @EXEEXT@
+ 
+-MODULE   = qdbm
++# Module-specific stuff
++PACKAGE   = qdbm
+ 
+-ARCHFILES = $(MODULE).$(DSOEXT)
+-SCMFILES  = $(MODULE).scm
++ARCHFILES = $(PACKAGE).$(SOEXT)
++SCMFILES  = $(PACKAGE).scm
+ HEADERS   =
+ 
+ TARGET    = $(ARCHFILES)
+-OBJS      = $(MODULE)_head.$(OBJEXT) \
+-            qdbm.$(OBJEXT) \
+-	    depot.$(OBJEXT) \
+-            $(MODULE)_tail.$(OBJEXT)
+-GENERATED = depot.c $(MODULE)_head.c $(MODULE)_tail.c
++GENERATED =
+ CONFIG_GENERATED = Makefile config.cache config.log config.status \
+-		   configure.lineno autom4te*.cache
+-
+-HEADER_INSTALL_DIR  = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
+-SCM_INSTALL_DIR     = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`/dbm
+-ARCH_INSTALL_DIR    = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
+-
+-all : $(TARGET)
++		   configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
+ 
+-.SUFFIXES: .o .stub
++HEADER_INSTALL_DIR  = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
++SCM_INSTALL_DIR     = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
++ARCH_INSTALL_DIR    = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
+ 
+-.c.o:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++qdbm_SRCS = qdbm.c depot.stub
++qdbm_LIBS = @LIBQDBM@
+ 
+-.stub.c:
+-	$(GOSH) genstub $<
+-
+-depot.c : depot.stub
+-
+-$(MODULE).$(DSOEXT): $(OBJS)
+-	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBQDBM@
++all : $(TARGET)
+ 
+-$(MODULE)_head.c $(MODULE)_tail.c :
+-	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
++$(PACKAGE).$(SOEXT): $(qdbm_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose \
++	    --libs="$(qdbm_LIBS)" --cppflags="$(CPPFLAGS)" \
++	    $(PACKAGE) $(qdbm_SRCS)
+ 
+ check : all
+ 	@rm -f test.log
+ 	$(GOSH) -I. test.scm > test.log
+ 
+ install : all
+-	if test ! -z "$(HEADERS)"; then \
+-	  $(INSTALL) -d $(HEADER_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(HEADERS) $(HEADER_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(SCMFILES)"; then \
+-	  $(INSTALL) -d $(SCM_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(SCMFILES) $(SCM_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(ARCHFILES)"; then \
+-	  $(INSTALL) -d $(ARCH_INSTALL_DIR); \
+-	  $(INSTALL) -m 555 $(ARCHFILES) $(ARCH_INSTALL_DIR); \
+-	fi
++	$(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/dbm $(SCMFILES)
++	$(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd
+ 
+ clean :
+-	rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations
++	$(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(qdbm_SRCS)
++	rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
+--- Gauche-qdbm-0.2.orig/configure.ac
++++ Gauche-qdbm-0.2/configure.ac
+@@ -4,18 +4,11 @@
+ AC_INIT(Gauche-qdbm, 0.2)
+ AC_CONFIG_SRCDIR(qdbm.c)
+ 
+-AC_CANONICAL_SYSTEM
+-
+ AC_GAUCHE_INIT_EXT
+-AC_GAUCHE_INSTALL_TYPE(site)
+ AC_GAUCHE_CC
+-AC_GAUCHE_FLAGS
+-
+-AC_PROG_INSTALL
+ 
+ AC_LIB_LINKFLAGS(qdbm)
+ 
+-AC_GAUCHE_FIX_LIBS
+-
++AC_GAUCHE_MAKE_GPD
+ echo $PACKAGE_VERSION > VERSION
+ AC_OUTPUT(Makefile)
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
new file mode 100644
index 000000000000..d6a6efb99b4f
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
@@ -0,0 +1,11 @@
+--- Gauche-qdbm-0.2.orig/qdbm.scm
++++ Gauche-qdbm-0.2/qdbm.scm
+@@ -72,7 +72,7 @@
+   (unless (slot-bound? self 'path)
+     (error "path must be set to open qdbm database"))
+   (when (qdbm-file-of self)
+-    (errorf "qdbm ~S already opened" qdbm))
++    (errorf "qdbm ~s already opened" (qdbm-file-of self)))
+   (let* ((path   (slot-ref self 'path))
+          (rwmode (slot-ref self 'rw-mode))
+          (omode  (case rwmode
diff --git a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
new file mode 100644
index 000000000000..9a99480a7c48
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils
+
+MY_P="${P/g/G}"
+
+DESCRIPTION="QDBM binding for Gauche"
+HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+SRC_URI="mirror://sourceforge.jp/gauche/6988/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~sparc x86"
+IUSE=""
+
+RDEPEND="dev-scheme/gauche
+	dev-db/qdbm"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gauche-package.diff
+	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	eautoreconf
+}
diff --git a/dev-scheme/gauche-qdbm/metadata.xml b/dev-scheme/gauche-qdbm/metadata.xml
new file mode 100644
index 000000000000..c30645235ea2
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">gauche</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
new file mode 100644
index 000000000000..746e2bc16b58
--- /dev/null
+++ b/dev-scheme/gauche/Manifest
@@ -0,0 +1,15 @@
+AUX gauche-0.9-ext-ldflags.patch 384 BLAKE2B 49b80ce3cdac634ba03dc51483ef692cd4ddfecdfd9da9880ddf76b13c49d4fc2c67ac0d7c99ec9636210d11ddb6f68eef3a605f22cf96fd35da47f1665f1e67 SHA512 e38f1c7bc2fa6a1f5f56e20f9818d7f52e98ba8c3e101b642441421f5194bc4223c862e20d3d731da632642dc44545974483459727bb184d9da9b9742504f34d
+AUX gauche-0.9-rfc.tls.patch 401 BLAKE2B 8cc1fca64ebaa0630b9e0f3862bbe4c167977b8a354df3b7f154ff4f1078344b381826f2eafece97825b3454069b09b53c07eea87720684b93897011bd3d79cd SHA512 5b2baafa052208c1843e7d05789bf8a10c63fbb48de66ca7e8b7450a5cb23c1c5641c34a8ff8ee525aa073de21b1f970ba4c310b2678dc1f81293e51c22de321
+AUX gauche-0.9.5-bsd.patch 714 BLAKE2B a52d2fa09af6895db8e605cfc4d88f1537e4f95c800c6c2637fc117c4602686015b85ccf69836b7d290ea3f75131bad0c2e18d405ce33abdc34b11d4f7c3b8f2 SHA512 416aa04f7f3aee310fd0e2c8073caa247e0fa84bb32f32ccadd125a17d26d4410554e2a6643493a3dbaa034fe07b54ae44f0f053238ea909b317551541431bac
+AUX gauche-0.9.5-libressl.patch 707 BLAKE2B ffe38d9ff4637b59786bf338bc918e4cfe8328eee124c1883e9963dcfb06b5b34255bcf3bf80ce911802b3553649e9f050694a75abd241abf6a4ec813f99f22a SHA512 98941e03fa4f96e26d6c0ff85f3e16bcd69aa5c77140e42de86556bfba87b83f340dd6be7e2f23e2d92433e46198cd500ed488546493cdb91c9e8ff13b457fa7
+AUX gauche-0.9.5-unicode.patch 700 BLAKE2B c88e724d483f04863cce892db65f66b6abf9b2d7333bc70b7040c4f6c79fbe7ebd9d135c2c7596f592d4da3a8e09f7324c7deafd2e7e17401f09c68bdf86bc2d SHA512 4c58e2c6fcb5b58f8c130fec7af4c0af187f54c186d6e54ee1787cb8dd4baab51f9dfd776d1d8adbd86da0be0e813f6a82322e7ec22eafda2c626637f14097f8
+AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
+AUX gauche-gauche.m4.patch 592 BLAKE2B ae22e11c85fa4cbae7217a8b632041a9f4241023f38105e906035210bcd82604ac69bb36c5874c4662a32e0cb551a9f59cc96487096c12356f9ef19c6d25de79 SHA512 5082265340c6011d653f20de3a89f1eed1a48b896d521bb42aff1f748cafd3c60953c3b723ab9b053dcd941ed6b61f00f9f69a25f16db74d987228db2318ac68
+AUX gauche-rfc.tls.patch 408 BLAKE2B e4e41272e7b3a1393fc2e07ba90b9c883220447f0c4730e5bc1d268e1198b17a10374451323e181f5eae1e3d2793c8c708d0cc0365ebc2d8e82648804b0bc349 SHA512 457aebafad6fa5f3ad494bfb545e217d043b19c20929be2e067601ffb4b015bcf4654af9295758792c20ebb27dee9315f232a96d1154a56dd88d1baad015046f
+AUX gauche-rpath.patch 215 BLAKE2B 081374abd3272ae10b7614af92c8f16054c1eaa6fb636d9f6300589751197f9b19b706a4fe500e985c25ea250f9a2a2338d903094d9ca95c2622e618ea6ce9ed SHA512 1bda4c2e0bb3928d040eb07d56a9eb0aebd68e52bd0756160ef3eec46ba8c1869b8a37dbb798a712a59918d6bf77e7ca74ec38a4e2e30bb6417f967b5cdc8da6
+AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
+DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
+DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
+EBUILD gauche-0.9.5.ebuild 1264 BLAKE2B 5431d4bca6b19bdaf5097abec31e4ac72799d79de9d694c26480ec0efb116038f4094459963d29612b1e0c85b5a7f20313000e8125fc4f4d8fe4df4dfef2363a SHA512 156a765380e68cbba229cb62423aceeefa040f9089e9059d3d2a02a6e5e2bf0c6abdada8372dca43493fa64148355922567afa00c9fbd6d68257a1eb17e0445f
+EBUILD gauche-0.9.6.ebuild 1218 BLAKE2B 651120d2c2c922f828632fb732c063cc06401d2cf51efd7852cff36e22de864d95ee814a9f2649429f9e782614a99d36cb302537a49f70913fcbf5bf083193ce SHA512 129e0c1e4e81f1d04f599196b8ad445893a7d67d4294d4e90b7046bbcf25f6555591f8f0f015d6e9cb28edef3d1d70693024db6dd233be04dae512e4c90bc2ae
+MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
new file mode 100644
index 000000000000..b4aedef2a316
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/ext/Makefile.ext.in
++++ b/ext/Makefile.ext.in
+@@ -22,7 +22,7 @@
+ LIBS         = $(XLIBS) @LIBS@ 
+ CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
+ CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
+-LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
++LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
+ 
+ # These are set by configure
+ DEFS     = @DEFS@
diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
new file mode 100644
index 000000000000..1e5ef71b6c91
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
@@ -0,0 +1,12 @@
+--- a/ext/tls/ssltest-mod.scm
++++ b/ext/tls/ssltest-mod.scm
+@@ -53,7 +53,8 @@
+      ($ format #t "~a\n" $ regexp-replace-all* line
+         #/\.\.\/ssl\// srcpath-replace
+         #/openssl /    kicker-replace
+-        #/system/      "safe_system")))
++        #/system/      "safe_system"
++        #/(s_server) / "\\1 -4 ")))
+ 
+   (p "#include <errno.h>"
+      "int safe_system(const char *commands)"
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
new file mode 100644
index 000000000000..615020df8dfe
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
@@ -0,0 +1,25 @@
+commit da2ea76503e8f1784d0f0be26435d4c8e0d1b12f
+Author: Shiro Kawai <shiro@acm.org>
+Date:   Sat Oct 15 11:44:28 2016 -1000
+
+    Avoid preprocessor symbols redefinition on OpenBSD
+
+    https://sourceforge.net/p/gauche/mailman/message/35429549/
+
+diff --git a/ext/net/gauche-net.h b/ext/net/gauche-net.h
+index d4f1dcd..decba64 100644
+--- a/ext/net/gauche-net.h
++++ b/ext/net/gauche-net.h
+@@ -362,8 +362,12 @@ extern ScmObj Scm_GetAddrinfo(const char *nodename,
+                               struct addrinfo *hints);
+ extern ScmObj Scm_GetNameinfo(ScmSockAddr *addr, int flags);
+ 
++#ifndef NI_MAXHOST
+ #define NI_MAXHOST  1025
++#endif
++#ifndef NI_MAXSERV
+ #define NI_MAXSERV    32
++#endif
+ 
+ #endif /* HAVE_IPV6 */
+ 
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
new file mode 100644
index 000000000000..7b4c839dccb8
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
@@ -0,0 +1,19 @@
+commit c26a4836e767807dd8c98d280c4d9e742b759edd
+Author: Shiro Kawai <shiro@acm.org>
+Date:   Sun Oct 9 02:04:19 2016 -1000
+
+    rfc.tls - Detect LibreSSL as well
+
+diff --git a/ext/tls/test.scm b/ext/tls/test.scm
+index 63a1d04..efbfbca 100644
+--- a/ext/tls/test.scm
++++ b/ext/tls/test.scm
+@@ -37,7 +37,7 @@
+      [(not gauche.os.windows)
+       (guard (e [(<process-abnormal-exit> e)
+                  (no-openssl "couldn't run openssl command")])
+-        (if-let1 m ($ #/OpenSSL\s+([\d\.]+\w*)/
++        (if-let1 m ($ #/(?:OpenSSL|LibreSSL)\s+([\d\.]+\w*)/
+                       $ process-output->string `(,openssl-cmd "version"))
+           (let1 vers (m 1)
+             (unless (version>=? vers "1.0.1")
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
new file mode 100644
index 000000000000..a87ca5d7c39c
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
@@ -0,0 +1,19 @@
+commit d31eb5c02b65514e695b45c0c01cbd45a36bac4a
+Author: OOHASHI Daichi <dico.leque.comicron@gmail.com>
+Date:   Thu Oct 20 10:48:17 2016 +0900
+
+    (char-general-category #\x20000) should be Lo
+
+diff --git a/src/gauche/char_utf_8.h b/src/gauche/char_utf_8.h
+index 082e764..5f92d13 100644
+--- a/src/gauche/char_utf_8.h
++++ b/src/gauche/char_utf_8.h
+@@ -294,7 +294,7 @@ static inline unsigned char Scm__LookupCharCategory(ScmChar ch)
+ {
+     if (ch == SCM_CHAR_INVALID || ch >= 0x10ffff) {
+         return SCM_CHAR_CATEGORY_Cn;
+-    } else if (ch <= 0x20000) {
++    } else if (ch < 0x20000) {
+         return ucs_general_category_00000[ch];
+     } else {
+         return ucs_general_category_20000(ch);
diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
new file mode 100644
index 000000000000..a5a21532d1ee
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/ext/Makefile.ext.in
++++ b/ext/Makefile.ext.in
+@@ -22,7 +22,7 @@
+ LIBS         = $(XLIBS) @LIBS@
+ CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
+ CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
+-LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
++LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
+ BUILD_GOSH_FLAGS =
+ 
+ # These are set by configure
diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.patch b/dev-scheme/gauche/files/gauche-gauche.m4.patch
new file mode 100644
index 000000000000..1b9947cf5798
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-gauche.m4.patch
@@ -0,0 +1,18 @@
+--- a/m4/gauche.m4
++++ b/m4/gauche.m4
+@@ -103,13 +103,10 @@
+   AS_CASE(["$target"],
+ 	  [i686-*], [I686OPT="-DUSE_I686_PREFETCH"])
+   AS_CASE(["$CC"],
+-	  [gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
++	  [*gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
+ 		  AS_CASE(["$target"],
+ 			  [*mingw*], [],
+-				     [GCCOPT="-fomit-frame-pointer"])
+-		  AS_CASE(["$target"],
+-			  [i586-*], [GCCOPT="$GCCOPT -march=i586"],
+-			  [i686-*], [GCCOPT="$GCCOPT -march=i686"])])])
++				     [GCCOPT="-fomit-frame-pointer"])])])
+ OPTFLAGS="$GCCOPT $I686OPT"
+ AC_SUBST(OPTFLAGS)
+ ])
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
new file mode 100644
index 000000000000..cf570df0ed38
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@@ -0,0 +1,12 @@
+--- a/ext/tls/ssltest-mod.scm
++++ b/ext/tls/ssltest-mod.scm
+@@ -53,7 +53,8 @@
+      ($ format #t "~a\n" $ regexp-replace-all* line
+         #/\.\.\/ssl\// srcpath-replace
+         #/openssl /    kicker-replace
+-        #/system\s*\(/      "safe_system(")))
++        #/system\s*\(/ "safe_system("
++        #/(s_server) / "\\1 -4 ")))
+ 
+   (p "#include <errno.h>"
+      "int safe_system(const char *commands)"
diff --git a/dev-scheme/gauche/files/gauche-rpath.patch b/dev-scheme/gauche/files/gauche-rpath.patch
new file mode 100644
index 000000000000..8774bac7be13
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rpath.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -709,7 +709,6 @@
+   fi
+   if test "$RPATH_FLAG" != ""; then
+     RPATH_TMP=$RPATH_FLAG'`pwd`'
+-    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
+   fi
+ fi
+ AC_SUBST(RPATH_FLAG)
diff --git a/dev-scheme/gauche/files/gauche-xz-info.patch b/dev-scheme/gauche/files/gauche-xz-info.patch
new file mode 100644
index 000000000000..e55f53606005
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-xz-info.patch
@@ -0,0 +1,31 @@
+--- 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.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
new file mode 100644
index 000000000000..2ace0a45f69b
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl test"
+
+RDEPEND="sys-libs/gdbm"
+DEPEND="${RDEPEND}
+	test? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-rpath.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
+	"${FILESDIR}"/${P}-bsd.patch
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-unicode.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING README )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}
diff --git a/dev-scheme/gauche/gauche-0.9.6.ebuild b/dev-scheme/gauche/gauche-0.9.6.ebuild
new file mode 100644
index 000000000000..37e0c2b459d4
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl mbedtls test"
+
+RDEPEND="sys-libs/gdbm
+	mbedtls? ( net-libs/mbedtls )"
+DEPEND="${RDEPEND}
+	test? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl:0 )
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING README )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--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
+}
diff --git a/dev-scheme/gauche/metadata.xml b/dev-scheme/gauche/metadata.xml
new file mode 100644
index 000000000000..b56db088465d
--- /dev/null
+++ b/dev-scheme/gauche/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>
+		Gauche is an R5RS Scheme implementation developed to be a handy script
+		interpreter, which allows programmers and system administrators to write
+		small to large scripts for their daily chores. Quick startup, built-in
+		system interface, native multilingual support are some of my goals.
+
+		Gauche runs on several Unix-like platforms.
+	</longdescription>
+	<use>
+		<flag name="mbedtls">Enable support for <pkg>net-libs/mbedtls</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gauche</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/goosh-1.3-r1 b/dev-scheme/goosh-1.3-r1
deleted file mode 100644
index 29ba12ddcba3..000000000000
--- a/dev-scheme/goosh-1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-scheme/guile-1.6
-DESCRIPTION=Small process-control library for Guile
-EAPI=6
-HOMEPAGE=http://arglist.com/guile/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-scheme/guile-1.6
-SLOT=0
-SRC_URI=http://arglist.com/guile/goosh-1.3/goosh-1.3.tar.gz
-_md5_=bd8b9d497a2120498ae5d7a2e6e6aaf1
diff --git a/dev-scheme/goosh/Manifest b/dev-scheme/goosh/Manifest
new file mode 100644
index 000000000000..a56be4f1f2a1
--- /dev/null
+++ b/dev-scheme/goosh/Manifest
@@ -0,0 +1,3 @@
+DIST goosh-1.3.tar.gz 43503 BLAKE2B 7bc3c907638320889ef2c871acd2e4e9fbd0fdb8e1a3655cb42cc92eea9fe28f01533ecff8e3efa4488dd5f0d2c9cdc6aa5ba7e333a9acb1d430633479c6cc80 SHA512 55fc3b83b5e711453886d6fd47e7e16df329ac7f294c704e3676f7266383fda6ad5e53c3f8a707a7746dd0ccd33647cc5137a73f516396079702df47919ede81
+EBUILD goosh-1.3-r1.ebuild 373 BLAKE2B 0b5b4386796a7594fd2f19166c9c3f668b17ca541d6b305b618208193a98978dac712d8be0275bc1a07b8be62f7b4e5e5619d5a657eeca29abe47b314e4ef5a2 SHA512 be7852be260530b74dcf29565b79c1bc434d590d028b08153bb42767d7a9c2d3312d3b582d8a24817b24604327ef12616ac0bb58db2db5589a75e67ef9ab2edf
+MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/goosh/goosh-1.3-r1.ebuild b/dev-scheme/goosh/goosh-1.3-r1.ebuild
new file mode 100644
index 000000000000..fe51640be163
--- /dev/null
+++ b/dev-scheme/goosh/goosh-1.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Small process-control library for Guile"
+HOMEPAGE="http://arglist.com/guile/"
+SRC_URI="http://arglist.com/guile/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-1.6"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/goosh/metadata.xml b/dev-scheme/goosh/metadata.xml
new file mode 100644
index 000000000000..4ac68c154bb0
--- /dev/null
+++ b/dev-scheme/goosh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/greg-2.0.0-r1 b/dev-scheme/greg-2.0.0-r1
deleted file mode 100644
index 8d4f0ca4c659..000000000000
--- a/dev-scheme/greg-2.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Testing-Framework for guile
-EAPI=5
-HOMEPAGE=http://gna.org/projects/greg/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-scheme/guile-1.8
-SLOT=0
-SRC_URI=http://download.gna.org/greg/greg-2.0.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab47e06ee872aff4d47fd924e9078200
diff --git a/dev-scheme/greg/Manifest b/dev-scheme/greg/Manifest
new file mode 100644
index 000000000000..2965b362baa2
--- /dev/null
+++ b/dev-scheme/greg/Manifest
@@ -0,0 +1,5 @@
+AUX greg-2.0.0-guile2.patch 656 BLAKE2B 3d900d3f54ac8eb728dc34b6d835272310dd1209b85f1750351596bac24ba8b0a5b46e87ccdeb17970ad1dd380716bd314047dde78c374ac16ce4d51c1ee479a SHA512 93c7316960df570a3611dbe1b4ccff9b25ccbaf173c947b1259f158ddfbe52faa47b334ac83af78829ad3ebb10efef40f6e5f8abc4ea1a26c904c4a895823a33
+AUX greg-2.0.0-test.patch 187 BLAKE2B 9e4bf736c1b24f247836226d07aa51598111235c0aa6478d2852a782c1d03007e93ecb0604cc7099ebe9bc980b0ad22101d8fd91277b899454de2791f044652f SHA512 c4de1e03d627964ef907e88b8a361a00298ba967b065aff4351958cd216fa113d89b4152b74eb179e09ab15aee4669186934b62865b67462884eb72a08267a82
+DIST greg-2.0.0.tar.gz 453598 BLAKE2B 8f14f292949c9e252a941fa2fddcdb29efafc6e43edb863d2df72178d77e8d7826cbe7a098110f7ec88e6ca3b2d1b8725f9c7c9623f1ac5c7a5d3a65fbef8b93 SHA512 d20523b4f6fcfcb183615866a3b322dad39579707f6979ad1edf11dac4c93f5c8dda109a4d832aae597b44397befe81afb6ae9be282556228ade1ad48e8a17eb
+EBUILD greg-2.0.0-r1.ebuild 683 BLAKE2B cfb3633a2068f214e2eacfa22e1fc5a60fb6bf678dd235633227365ca01696b13ad31bdaf1221dc2d6f6f5ccfcb58c1bb3dd77f84fccd8b57f79b94ab1fa1389 SHA512 37b13ed227f1462267cde38483e2c566e75e1dc2fd5dcc0a3f57716279f6eb2f7a3062c96ad3c829dde6a0e8e34c5ec8f839bd0ee26ca05fbe925e046f16f330
+MISC metadata.xml 219 BLAKE2B a36027db1fafb2a6fb4952ec04a882494f6f5d3543a1dd71bad734ad49a47a17ac7ebb843960e2b82b0fd2322d71fd76a3d9266e85c82fa66e21770b9030753e SHA512 2d421746cac7e5e6a59e81fdc273cda856245e88c88a489118c94a58c9db3ddde6497be6a8c076309f895c1c0280fe77514332ddcfd5cb884fc255016f66b5b7
diff --git a/dev-scheme/greg/files/greg-2.0.0-guile2.patch b/dev-scheme/greg/files/greg-2.0.0-guile2.patch
new file mode 100644
index 000000000000..7b78fc9dbd79
--- /dev/null
+++ b/dev-scheme/greg/files/greg-2.0.0-guile2.patch
@@ -0,0 +1,14 @@
+--- greg-2.0.0/configure.ac.old	2012-09-23 13:25:24.000000000 +0200
++++ greg-2.0.0/configure.ac	2012-09-23 13:25:31.000000000 +0200
+@@ -48,7 +48,10 @@
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h libguile.h errno.h)
++AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h errno.h)
++
++CFLAGS=`GUILE_AUTOCOMPILE=0 $GUILECONFIG compile`
++AC_CHECK_HEADER(libguile.h)
+ 
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
diff --git a/dev-scheme/greg/files/greg-2.0.0-test.patch b/dev-scheme/greg/files/greg-2.0.0-test.patch
new file mode 100644
index 000000000000..26a6cdf1c0ad
--- /dev/null
+++ b/dev-scheme/greg/files/greg-2.0.0-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 3cda45d..c61b34e 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -23,7 +23,6 @@
+ 
+ 
+ all:
+-	./test.sh
+ 
+ check:
+ 	./test.sh
diff --git a/dev-scheme/greg/greg-2.0.0-r1.ebuild b/dev-scheme/greg/greg-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..81929f005fb6
--- /dev/null
+++ b/dev-scheme/greg/greg-2.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Testing-Framework for guile"
+HOMEPAGE="http://gna.org/projects/greg/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+LICENSE="GPL-2"
+IUSE="static-libs"
+
+RDEPEND=">=dev-scheme/guile-1.8"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${P}-guile2.patch
+	)
+
+src_test() {
+	cd test || die
+	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_DIR}/src/.libs"
+	export GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${BUILD_DIR}/src/"
+	guile -s "${S}"/src/greg || die
+}
diff --git a/dev-scheme/greg/metadata.xml b/dev-scheme/greg/metadata.xml
new file mode 100644
index 000000000000..4028bdb661a0
--- /dev/null
+++ b/dev-scheme/greg/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-1.8.8-r3 b/dev-scheme/guile-1.8.8-r3
deleted file mode 100644
index 82a72c94f37b..000000000000
--- a/dev-scheme/guile-1.8.8-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= emacs? ( virtual/emacs ) readline? ( sys-libs/readline:0= ) sys-apps/texinfo sys-devel/libtool >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Scheme interpreter
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/guile/
-IUSE=debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= emacs? ( virtual/emacs ) readline? ( sys-libs/readline:0= )
-RESTRICT=!regex? ( test )
-SLOT=12/8
-SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80cc2b25eb3a3db78d1e3408c6d1ce1d
diff --git a/dev-scheme/guile-2.0.13-r2 b/dev-scheme/guile-2.0.13-r2
deleted file mode 100644
index 66df42859380..000000000000
--- a/dev-scheme/guile-2.0.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/guile/
-IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
-REQUIRED_USE=regex
-SLOT=12/22
-SRC_URI=mirror://gnu/guile/guile-2.0.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7fdda91dc31863790e6cdd61020edcc
diff --git a/dev-scheme/guile-2.0.14-r3 b/dev-scheme/guile-2.0.14-r3
deleted file mode 100644
index a115fe6e68f4..000000000000
--- a/dev-scheme/guile-2.0.14-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/guile/
-IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
-REQUIRED_USE=regex
-SLOT=12/22
-SRC_URI=mirror://gnu/guile/guile-2.0.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63ea4ebbc1f9e7d835695c69085fc88f
diff --git a/dev-scheme/guile-2.2.3 b/dev-scheme/guile-2.2.3
deleted file mode 100644
index 00dacb7cb355..000000000000
--- a/dev-scheme/guile-2.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext
-DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/guile/
-IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
-REQUIRED_USE=regex
-RESTRICT=strip
-SLOT=12/2.2-1
-SRC_URI=mirror://gnu/guile/guile-2.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8cd58d01c34bc08ee0c8fd3cf9335628
diff --git a/dev-scheme/guile-cairo-1.4.0 b/dev-scheme/guile-cairo-1.4.0
deleted file mode 100644
index 9102a4259cff..000000000000
--- a/dev-scheme/guile-cairo-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4 virtual/pkgconfig test? ( dev-scheme/guile-lib )
-DESCRIPTION=Wraps the Cairo graphics library for Guile Scheme
-EAPI=2
-HOMEPAGE=http://home.gna.org/guile-cairo/
-IUSE=test
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4
-SLOT=0
-SRC_URI=http://download.gna.org/guile-cairo/guile-cairo-1.4.0.tar.gz
-_md5_=10fedb78319cc3ac856bac1067f2cabd
diff --git a/dev-scheme/guile-cairo-1.9.91 b/dev-scheme/guile-cairo-1.9.91
deleted file mode 100644
index 8c475a22819e..000000000000
--- a/dev-scheme/guile-cairo-1.9.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4 virtual/pkgconfig test? ( dev-scheme/guile-lib ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Wraps the Cairo graphics library for Guile Scheme
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/guile-cairo/
-IUSE=static-libs test
-KEYWORDS=amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/guile-cairo/guile-cairo-1.9.91.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bbc8e98d10b76d2c282c6938438f3ce
diff --git a/dev-scheme/guile-cairo/Manifest b/dev-scheme/guile-cairo/Manifest
new file mode 100644
index 000000000000..d0c8a1dee8cf
--- /dev/null
+++ b/dev-scheme/guile-cairo/Manifest
@@ -0,0 +1,5 @@
+DIST guile-cairo-1.4.0.tar.gz 512208 BLAKE2B e0e5a4eaca54aa2579f0fe7727dea5de48cf11243e04f6fdb692e715932470ac74b2cc24a30b9065edd4e2bcae39b25edc553eed3e79b334416f3227f0fb9bac SHA512 59e70c9a78b50bc8f580984cf67d9708b9a201920736be16d3ee2b8e73abaeac1c2b9d934b1713529043474881cd7258cb8df99ac317f6a10417b08a677c0759
+DIST guile-cairo-1.9.91.tar.gz 578928 BLAKE2B e0b766e1a83ca8d630760b8bdfab0bb0f26cd58bc6e73198f197ae7de7fd53e5a377b64f8b06f69a037caf566d94ce172e6f62a5b0114eedf859ddb6eb9d8021 SHA512 bdade3463bdac2f29519ef3001286e07ca3c57615183f2e5ac121d273f49c4dafaf3125ef7f8630e0695c0d73368c98241c59acdb9c5682be42bddbc4b5a28ac
+EBUILD guile-cairo-1.4.0.ebuild 637 BLAKE2B 488e5becd66ffac0ad03a3bdf5e70014dfee6047e2528c9f6128d4303ce8d565a470a46ba51e9ad0da49bcff15a8a059ec6b095dd4727ff031fd61f2b88ad5fd SHA512 85635c75f52f3bb2b055bb085c1136a754777d58016f4a8716f3763c8d7e5486c03bed4a6e8fffa72d44bceef7c85a24be91b528dda2178310bd38302d8dbd3f
+EBUILD guile-cairo-1.9.91.ebuild 633 BLAKE2B 51e2a6c49df09f4f99f3db234208842a689004c28ac6804a1adeef24c2ad5be4412c7ffc646d0775e638203946ad164f7c5756c059727b1b08b7684a7973629f SHA512 6de05e90bdc352e598c99930a1f3c70c19da752da4144a30c551fe35bcb4a057dad2f6d25f0e17d622362d161670ed082c970d4b5dce7daf6b17c2683bc12fef
+MISC metadata.xml 656 BLAKE2B 6c5e7e33fcbb53fecd80e13d4e66c0a5fa3126ec3a590dd5136490bad12ec64c722701b2ae2ef700a192d3b8135e77b0c8457f531b677a80fd7d1d66f17e3f7e SHA512 25b8b5f5b1ba90a7438c1dafbfe3a9a8ec9e2cea847f7722e33416a96bbc3dd5531d5e2607a803496aa3b71505b8a728e2d30e841e399ed30361853a54917267
diff --git a/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild b/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
new file mode 100644
index 000000000000..11b566443a90
--- /dev/null
+++ b/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="Wraps the Cairo graphics library for Guile Scheme"
+HOMEPAGE="http://home.gna.org/guile-cairo/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-scheme/guile-1.8
+	>=x11-libs/cairo-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-scheme/guile-lib )"
+
+src_configure() {
+	econf --disable-Werror
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog || die "dodoc failed"
+}
diff --git a/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild b/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
new file mode 100644
index 000000000000..3c05bf32c2d5
--- /dev/null
+++ b/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Wraps the Cairo graphics library for Guile Scheme"
+HOMEPAGE="http://www.nongnu.org/guile-cairo/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	>=dev-scheme/guile-1.8
+	>=x11-libs/cairo-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-scheme/guile-lib )"
+
+src_configure() {
+	local myeconfargs=( --disable-Werror )
+	autotools-utils_src_configure
+}
diff --git a/dev-scheme/guile-cairo/metadata.xml b/dev-scheme/guile-cairo/metadata.xml
new file mode 100644
index 000000000000..3c835e318c41
--- /dev/null
+++ b/dev-scheme/guile-cairo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+Guile-Cairo is complete, wrapping almost all of the Cairo API. It is API stable, providing a firm base on which to do graphics work. Finally, and importantly, it is pleasant to use. You get a powerful and well-maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/guile-git-0.0.20171110 b/dev-scheme/guile-git-0.0.20171110
deleted file mode 100644
index 8d1d2416fa3d..000000000000
--- a/dev-scheme/guile-git-0.0.20171110
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures dev-libs/libgit2:=
-DESCRIPTION=Guile bindings of git
-EAPI=6
-HOMEPAGE=https://gitlab.com/guile-git/guile-git
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.11:= dev-scheme/bytestructures dev-libs/libgit2:=
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/guile-git-0.0.20171110.tar.gz
-_md5_=f9fab37e99e16c63f4db195dc7320d63
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
new file mode 100644
index 000000000000..82edccab4744
--- /dev/null
+++ b/dev-scheme/guile-git/Manifest
@@ -0,0 +1,3 @@
+DIST guile-git-0.0.20171110.tar.gz 269708 BLAKE2B 89095fcf666fdb4810e44155829413c3878c783d66d7b60416b9535f57edf27719515c22d9e15e07dbfe0976613fb5ca323ea0559b5a0533f1818b87d248db87 SHA512 b542c6ac30f596599ffa05074be7f71407a062ea3b23e80153894d13220f7935711abf74060bb0cea5e9c46b12492ee78c6914d4a15227bd393b3a833edf4fe9
+EBUILD guile-git-0.0.20171110.ebuild 433 BLAKE2B 7c7cc7a47c9c8c922a2cf391f0203016cd0e5f5e095c4d57980c72a5f6080b4cbcb7209f386f4b53b24d909cac31ab3d46b8df134cb161ad30ebd7f2130153de SHA512 ed154b02a126cd0bc9de00309830c68d11415a2eb5e453eeb5295045a8071d07fe3976be5c7058dee78c0b215047d685a690b03a420516af04ab38409da6d79c
+MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
new file mode 100644
index 000000000000..ac4a2d6d25aa
--- /dev/null
+++ b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Guile bindings of git"
+HOMEPAGE="https://gitlab.com/guile-git/guile-git"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-scheme/bytestructures
+	dev-libs/libgit2:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-git/metadata.xml b/dev-scheme/guile-git/metadata.xml
new file mode 100644
index 000000000000..2907abeb0c42
--- /dev/null
+++ b/dev-scheme/guile-git/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>slyfox@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-gnome-platform-2.16.1-r1 b/dev-scheme/guile-gnome-platform-2.16.1-r1
deleted file mode 100644
index 85935c59a628..000000000000
--- a/dev-scheme/guile-gnome-platform-2.16.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/guile-gnome/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=177ac98d6cd2ab4969d4e2d55700f409
diff --git a/dev-scheme/guile-gnome-platform-2.16.2 b/dev-scheme/guile-gnome-platform-2.16.2
deleted file mode 100644
index 49c3c228520c..000000000000
--- a/dev-scheme/guile-gnome-platform-2.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/guile-gnome/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64f39a1a2cb2aba6e7a82b0c0f47c2d2
diff --git a/dev-scheme/guile-gnome-platform/Manifest b/dev-scheme/guile-gnome-platform/Manifest
new file mode 100644
index 000000000000..9e5c65044b7e
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -0,0 +1,9 @@
+AUX 2.16.1-conflicting-types.patch 1584 BLAKE2B 06392a5e1c2ee0036d022f9a8acd44e5e63f9ccfe72e6eda9dd186149c183dc01e3cd0f68e603f61e2089768e5012faea9ceabce3a0c38f5ee3f4ebdcd7bdedb SHA512 21ff8196a718d273e0901e70df62b7caf291e1c28988e1f972482302893a1193faa9ccff68378ae75e0aafcfbd9bef57106a30b02433ce3cdb07d14d59d29f86
+AUX 2.16.1-gcc45.patch 343 BLAKE2B 5b050c157845adf0b97d2b53e1795db60feead7bcef4d57c911e813ef6adbb288daea68b1366d0f083fa885bac574919afef6a7c7763d24906047da77c1367dd SHA512 a0412c07376b6e5e701428ca6a0f85b8762506c3fd86a76ca6a5641c4db1cd9be9cc97747f851d95fd6dbad8a02f7f1d5b11b7c649e927888c1e9a0909a8cba2
+AUX 2.16.1-gdk-color.patch 2328 BLAKE2B bbe5837601ac13097832a5488737eaf159ce4bbed0025745d956344c8a7355b1065efaab01af2fd7843a7bd3d1d8a9f9aa0c533315a00dddd0f8e4288864f366 SHA512 40e2b2838c18102c71d3a3132331332aa68bf9e7d202ced159c91444c30648a0c1c8afee106ec0b8b8012dc840eaf3466181887835ea62bff41dc1a7282faf71
+AUX 2.16.1-glib-single-include.patch 944 BLAKE2B 251be62ed49d67a234b5ca321c19febffd54ac3b4b4dfb84a42d84771cc4b17bc33adb19daacb4ac7ba6ea6afef69cb69e62c5f1e15e2911fce6970287dbec9c SHA512 f50eb52f0150a365f79314f1756c6ae78018a18ecbb488e830c27d4e76c3da6ad2bf46c7d44a35d3172c57bf709f5d4614ffba7652a5b459b542a0994ca47dea
+DIST guile-gnome-platform-2.16.1.tar.gz 3494333 BLAKE2B edd5c91a263c9a6bedb884d842f629c7d4fa610f5a4ba277ca374279a5abbcf5c1fb9ff85f7bb5faaed8905ed0eaf711bd469d86062d293930ca885b1aadc271 SHA512 c630e2d67b312fb41c8492f8956902f385faa834094860cac580d1df0329b41790d973f73fd7dd59dc365f5d6cfb6463cde8af90641fbc377680b51616ad8f7a
+DIST guile-gnome-platform-2.16.2.tar.gz 2538191 BLAKE2B e16d3d667996c822401a4e3982728db91dda1f02be5739b7dd0795466f0976f3fbb2692a21918f2f6c2502faf5c90bb0d287de171d80cece41353cccb2715488 SHA512 5acaa96d8caf82864ada8bfcbc4954a19cd5d7e210245f2e8b31082c6a9e4ab9ba7af5f8e1f762a891e1aad640913a7a205f56dfaed6915a9f782c53e042d042
+EBUILD guile-gnome-platform-2.16.1-r1.ebuild 1448 BLAKE2B 51b2633a873f7eaa7797459ddbab32eda473325af35ef00ea26d01cca555a437b0a40ce0d69730dd77814eba48f4e43fe536414922b190263325e4541522cc68 SHA512 4ea5b6c916e2b7fc334e9352fa58f655052663e357222a536b20aff7536482d3386c34a844f68a828117a1adead8d751aa0dae32f11c2a01b26e126a8cb2906f
+EBUILD guile-gnome-platform-2.16.2.ebuild 1235 BLAKE2B dc6a0e0c086c4954adc50928b7d230eb9db0dd52e14bce7de6553a56a0ac6eac44b9285ab4340c95bce3c5e5d3101d0868546edb84757cb80398334eb06755c5 SHA512 16b515053e940e574e2695a25ad089efaead772b3589a8d7c5d12e056bf568541539b57eef958cb704c20d710d941a38d33f6cc91d8c18aafbddbeb3e30d4161
+MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
new file mode 100644
index 000000000000..e470977acbc8
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/293655
+
+--- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.c	2008-07-03 11:52:27.000000000 -0300
++++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.c	2009-11-27 03:09:28.204506213 -0200
+@@ -1012,7 +1012,7 @@
+ }
+ 
+ GdkRectangle*
+-gtk_widget_get_allocation (GtkWidget *widget)
++guile_gtk_widget_get_allocation (GtkWidget *widget)
+ {
+     GdkRectangle *ret = g_new (GdkRectangle, 1);
+     *ret = widget->allocation;
+--- guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.h	2008-04-09 19:10:40.000000000 -0300
++++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.h	2009-11-27 03:08:29.385756221 -0200
+@@ -117,6 +117,6 @@
+ guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error);
+ 
+ GdkWindow* gtk_widget_get_window (GtkWidget *widget);
+-GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
++GdkRectangle* guile_gtk_widget_get_allocation (GtkWidget *widget);
+ void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions);
+ GtkStateType gtk_widget_get_state (GtkWidget *widget);
+--- guile-gnome-platform-2.16.1.orig/gtk/gnome/overrides/gtk.defs	2008-04-09 19:12:44.000000000 -0300
++++ guile-gnome-platform-2.16.1/gtk/gnome/overrides/gtk.defs	2009-11-27 03:13:34.667506321 -0200
+@@ -848,7 +848,7 @@
+ 
+ (define-method get-allocation
+   (of-object "GtkWidget")
+-  (c-name "gtk_widget_get_allocation")
++  (c-name "guile_gtk_widget_get_allocation")
+   (return-type "GdkRectangle*")) ;; same as GtkAllocation
+ 
+ (define-method get_state
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
new file mode 100644
index 000000000000..39c7e94760bd
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
@@ -0,0 +1,11 @@
+--- common.mk
++++ common.mk
+@@ -50,7 +50,7 @@
+ 	guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \
+ 	|| { rm $@; false; }
+ .c.doc:
+-	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
++	$(CPP) -P -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+ 	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
new file mode 100644
index 000000000000..d7836ac489f9
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
@@ -0,0 +1,55 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: gbenison@gmail.com-20080728153014-9cmh3qp4879910dg
+# target_branch: http://arch.gna.org/guile-gnome/bzr/gtk/
+# testament_sha1: 1dd74795aba452934a0810f47bfe1ad34b958e4b
+# timestamp: 2008-07-28 08:36:30 -0700
+# base_revision_id: wingo@pobox.com-20080703151735-je9a72h0nlq3eere
+# 
+# Begin patch
+=== modified file 'gnome/gw/gdk-support.c'
+--- gtk/gnome/gw/gdk-support.c	2008-04-24 11:17:07 +0000
++++ gtk/gnome/gw/gdk-support.c	2008-07-28 15:30:14 +0000
+@@ -228,11 +228,22 @@
+     return ret;
+ }
+ 
++/*
++ * Allocate a new GdkColor* which must be freed using
++ * gdk_color_free().
++ */
++static GdkColor*
++gdk_color_new()
++{
++  GdkColor tmp;
++  return gdk_color_copy(&tmp);
++}
++
+ GdkColor*
+ scm_scm_to_gdk_color (SCM scm)
+ #define FUNC_NAME "%scm->gdk-rectangle"
+ {
+-    GdkColor *ret = g_new0 (GdkColor, 1);
++    GdkColor *ret = gdk_color_new();
+     
+     if (scm_is_string (scm)) {
+         char *chars;
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZjPJ74AAbHfgEAQUXP//3qA
+AAC////6UAPZV7KKmigbBkSKemTJNjQBMKepo9RkZNGQ00MAAAABoAAAAAEomgmgaCTNBR6NQHpD
+0TTT1GjDAAAAAaAAAAABJIQ0j0TBJ5JiGmAppkZBoZHetMt0dHeL+Zs1essYZwmiipWtmW5noD6t
+JP2bTdtsv1JJPzNyeehztVVSPROr6m0YKZQFaOWu+z06Rud5U/7D6/HzSd7loXjOuOtTyhUB1+CF
+uquimbPJylUSYlaqGEDm3OnfJaLqj2yQ6r3QgKpKtA0pmW2HITLziKOTjm/fVLt6fxQHZtkGFTeB
+FuHcCiRWzsuJDoOcpYPAVFiEB8InMDl4naQHikc4a1XMxmYpaVYnPm2xrL3exYl0MEuEnlJO+JM5
+UFYwKS8BCwsgYhIWS2kuWGPMseMJO8ncXBIuJJ/X3ZRKMVCSIGaSULHRgmhOe9tGooKytZCskgmJ
+VS3QycULqKoxuNQ40lJoxtNxRyHHy7M0nUOE7BicXaUrMD5NrgsTCJtL8C5FPpE4MOJhg9nMJwT3
+DIsLzYUpCYlqPMWnEscKgQYSs2YjyQ6qxhXiYYlgxArte4UW+sCwwi2FpYQLks5oURZypVRHaVFP
+pJwmgV89TYjcTRROinDCUijL3O+eY5U1957/RoOIq5mRPALX3Kin8fYD/w9R85hVuGpzKzOiC8oV
+dPSyI6qB4jHE1b13nz11zltZaFSX1tLIcaRTqymf46deB05hZeUhBjGBqRcFZ2XkTb8hmPQXCMP0
+tfrRiWC4H2BiBEq5zGkSOGJoLiorU6aBWik6E8Rdxl/gYWG3ds790ppnbBuHeVHwr+HA0EfQlKAc
+q/E8AntpuJ1obUmOUEnfKYWm3NSt+oNhgoiNKKE+jOcy30xMx7eHGTLe33vIVOBzpxG8omhwPoNo
+PUmADruvHqaAVsAj5wgV2JksOsiBgWJZJ5ceoZqpB76oTzAbgKgLn8+qwLOWhwi4O5KK3uWHx6y8
+xGhbXvEVnkl2qk3YyJxYRuKNpjChsznCTyZ4PfeDxdm8DFXuCDIZbZWg3Yr6/kuYYAypBkmDrMiE
+4iIZlSOUreq0/wTGBllkoFAYcVIzkYjT/nQq/MW2bYwSTILXX3uG2etAsP61m91rJ9MZK6x94QmG
+YZNAZtZGfFMR1gOijgJD1tiHFaPr3/XjtiadSQ2LOpiSg+seT5OMoANJeQvIZNTBh4134wCOLGE6
+SCzdOZStqOnvfsWpi8GtD3xaP8XckU4UJCYzye+A
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
new file mode 100644
index 000000000000..84f8c8761fbc
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-glib-single-include.patch
@@ -0,0 +1,26 @@
+Index: guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
+===================================================================
+--- guile-gnome-platform-2.16.1.orig/corba/gnome/corba/guile-gnome-corba-generic.c
++++ guile-gnome-platform-2.16.1/corba/gnome/corba/guile-gnome-corba-generic.c
+@@ -24,7 +24,7 @@
+ 
+ #include <guile-gnome-corba-generic.h>
+ #include <guile-gnome-gobject.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <string.h>
+ 
+ static GQuark quark_corba_typecode = 0;
+Index: guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
+===================================================================
+--- guile-gnome-platform-2.16.1.orig/glib/gnome/gobject/guile-support.h
++++ guile-gnome-platform-2.16.1/glib/gnome/gobject/guile-support.h
+@@ -24,7 +24,7 @@
+ #ifndef __GUILE_SUPPORT_H__
+ #define __GUILE_SUPPORT_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ #include <libguile.h>
+ 
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
new file mode 100644
index 000000000000..cb8d91a9a8d5
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils multilib
+
+DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
+HOMEPAGE="https://www.gnu.org/software/guile-gnome/"
+SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/g-wrap
+	dev-libs/glib:2
+	dev-scheme/guile:12
+	dev-scheme/guile-cairo
+	dev-scheme/guile-lib
+	gnome-base/gconf:2
+	gnome-base/gnome-vfs:2
+	gnome-base/libbonobo
+	gnome-base/libglade:2.0
+	gnome-base/libgnomecanvas
+	gnome-base/libgnomeui
+	gnome-base/orbit:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+#needs guile with networking
+RESTRICT=test
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	PATCHES=(
+		"${FILESDIR}/${PV}-conflicting-types.patch"
+		"${FILESDIR}/${PV}-gcc45.patch"
+		"${FILESDIR}/${PV}-gdk-color.patch"
+		"${FILESDIR}/${PV}-glib-single-include.patch"
+		)
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-Werror
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}
+
+src_install() {
+	autotools-utils_src_install \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
new file mode 100644
index 000000000000..ee22dd2fc05c
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
+HOMEPAGE="https://www.gnu.org/software/guile-gnome/"
+SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/g-wrap-1.9.14
+	dev-libs/glib:2
+	dev-scheme/guile:12
+	dev-scheme/guile-cairo
+	dev-scheme/guile-lib
+	gnome-base/gconf:2
+	gnome-base/gnome-vfs:2
+	gnome-base/libbonobo
+	gnome-base/libglade:2.0
+	gnome-base/libgnomecanvas
+	gnome-base/libgnomeui
+	gnome-base/orbit:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+#needs guile with networking
+RESTRICT=test
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	PATCHES=(
+		"${FILESDIR}/2.16.1-glib-single-include.patch"
+		)
+	autotools-utils_src_prepare
+}
+
+src_compile() {
+	autotools-utils_src_compile \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}
+
+src_install() {
+	autotools-utils_src_install \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}
diff --git a/dev-scheme/guile-gnome-platform/metadata.xml b/dev-scheme/guile-gnome-platform/metadata.xml
new file mode 100644
index 000000000000..aa9967f46fc6
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-gui-0.2-r1 b/dev-scheme/guile-gui-0.2-r1
deleted file mode 100644
index 02a862189304..000000000000
--- a/dev-scheme/guile-gui-0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-scheme/guile x11-libs/guile-gtk
-DESCRIPTION=Guile Scheme code that aims to implement a graphical user interface
-EAPI=6
-HOMEPAGE=http://www.ossau.uklinux.net/guile/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile x11-libs/guile-gtk
-SLOT=0
-SRC_URI=http://www.ossau.uklinux.net/guile/guile-gui-0.2.tar.gz
-_md5_=77babca708d432b8816a31a3f26601ba
diff --git a/dev-scheme/guile-gui/Manifest b/dev-scheme/guile-gui/Manifest
new file mode 100644
index 000000000000..196d0ab65eb8
--- /dev/null
+++ b/dev-scheme/guile-gui/Manifest
@@ -0,0 +1,3 @@
+DIST guile-gui-0.2.tar.gz 33885 BLAKE2B 85fc868f7fede45947d4e4fdaa757f2de08e4da2d63e34a46917fee367df4140dbc05cf230f2f7ee73fb5aad52caa53c1304d167d21d0186a042647cb6cea57b SHA512 98d6eaad412232c45e363b8e85ae74bd36fd7f89c2af3932c17eba04e2a4c70ddd8bbe86488e1277534c88e331d8c4ef3fc89f3b0b6b2a35b48d09a23c8c2d89
+EBUILD guile-gui-0.2-r1.ebuild 451 BLAKE2B 0889f875e5bda5bd462982dda18ba187cedd31eb75d24c2e1235468b1b148f312b8d9dfc31c73605a2b3c21ff9639622df55c0da8f522ec84e8b577a163db67e SHA512 525c0383962378b984df5293a2fc004910d9a85e042880a2bee18676489504a5df9da0b23451c22903a0e3c12b177d0c25fc0f45d21a72bc8fe6513cbd4a24bd
+MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild b/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
new file mode 100644
index 000000000000..16f86466ad0b
--- /dev/null
+++ b/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Guile Scheme code that aims to implement a graphical user interface"
+HOMEPAGE="http://www.ossau.uklinux.net/guile/"
+SRC_URI="http://www.ossau.uklinux.net/guile/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-scheme/guile
+	x11-libs/guile-gtk"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-gui/metadata.xml b/dev-scheme/guile-gui/metadata.xml
new file mode 100644
index 000000000000..4ac68c154bb0
--- /dev/null
+++ b/dev-scheme/guile-gui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-json-0.6.0 b/dev-scheme/guile-json-0.6.0
deleted file mode 100644
index 86e9b663ccdd..000000000000
--- a/dev-scheme/guile-json-0.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-scheme/guile-2.0.0
-DESCRIPTION=JSON module for Guile
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/guile-json/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.0
-SLOT=0
-SRC_URI=https://download.savannah.gnu.org/releases/guile-json/guile-json-0.6.0.tar.gz
-_md5_=b5c0fbccc643df12df732e84425e95cf
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
new file mode 100644
index 000000000000..1e9a1282b96b
--- /dev/null
+++ b/dev-scheme/guile-json/Manifest
@@ -0,0 +1,3 @@
+DIST guile-json-0.6.0.tar.gz 99122 BLAKE2B d8b9aebae47b7ed1d89153e82eedbe7b2e0200cbe802c1ce5f43a6149a3f1df08326c1945da97a0a466a8b23fa941d52b16c07ef86c20301548bac00149e8c63 SHA512 90ab2a428669b5c2163e9b6b13e6f7fd7452e95d996f3cea44c3fd7bbf35e2d3759416e63a74b2193ba161f8022e845c0f058c3d20e89c18116660427a503d2e
+EBUILD guile-json-0.6.0.ebuild 403 BLAKE2B 45d37472437999fe7958d4c7ed18149f45c4e2d456193ecbf81ca5d09b7c77124c9a3e55151e7e470558885b56aca6ac41ae714b55774e9e27a44687189824aa SHA512 6ea9f42d8c661aa3f6d631ded253465bb4e32d62d45f826f5819346947e91f5fd03b8e6f805b7648ecc2e701cf46a18b097c865d23cd19b9afaf3621ade4e9e7
+MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
diff --git a/dev-scheme/guile-json/guile-json-0.6.0.ebuild b/dev-scheme/guile-json/guile-json-0.6.0.ebuild
new file mode 100644
index 000000000000..49115e2861ef
--- /dev/null
+++ b/dev-scheme/guile-json/guile-json-0.6.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="https://download.savannah.gnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.0"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-json/metadata.xml b/dev-scheme/guile-json/metadata.xml
new file mode 100644
index 000000000000..8703fdc61595
--- /dev/null
+++ b/dev-scheme/guile-json/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-lib-0.2.5.1 b/dev-scheme/guile-lib-0.2.5.1
deleted file mode 100644
index ddee7f9b0b57..000000000000
--- a/dev-scheme/guile-lib-0.2.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated] !<dev-libs/g-wrap-1.9.8
-DESCRIPTION=An accumulation place for pure-scheme Guile modules
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/guile-lib/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated]
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/guile-lib-0.2.5.1.tar.gz
-_md5_=e21febb89012b1c3d39fc490b3d1e9ab
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
new file mode 100644
index 000000000000..5f33040779d6
--- /dev/null
+++ b/dev-scheme/guile-lib/Manifest
@@ -0,0 +1,3 @@
+DIST guile-lib-0.2.5.1.tar.gz 424124 BLAKE2B 36aaf66f6a1550e24101547203865fb73f60ebe04d04e13a8244d81cd91510288f00f7c77636b86fd4a5c49f6157e187d623eb26d4ad361e7a284d9dd2f017f0 SHA512 500f0a5c973af1594402a4d564be8a6e559f575e10de35368cbda2d24d73c9b781b06b4a61433cf2609f91a7548903dc01718d70796e48a49c6d50988227946a
+EBUILD guile-lib-0.2.5.1.ebuild 571 BLAKE2B 0651605a1707de030edbbd314a5382aa8bc08a55d044a005afdd1383afc4134434a80093127868a8b09fe818aeb6cc5b3dea760d53d75bb8a5cfb22f5dcccc97 SHA512 2f465adaca9be50942c678a6fe029b0ec762e2941bb28b67e0aa469aab52ce02ab992462e5407be55f59c3bb554bf176e1ed1ff56cfa97f4285884148b1da998
+MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
new file mode 100644
index 000000000000..f0aefb40e8d8
--- /dev/null
+++ b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An accumulation place for pure-scheme Guile modules"
+HOMEPAGE="http://www.nongnu.org/guile-lib/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
+DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+}
diff --git a/dev-scheme/guile-lib/metadata.xml b/dev-scheme/guile-lib/metadata.xml
new file mode 100644
index 000000000000..aa9967f46fc6
--- /dev/null
+++ b/dev-scheme/guile-lib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-sqlite3-0.1.0 b/dev-scheme/guile-sqlite3-0.1.0
deleted file mode 100644
index d37fc3080de3..000000000000
--- a/dev-scheme/guile-sqlite3-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-scheme/guile-2.0.11:= dev-db/sqlite:3= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Guile bindings of sqlite3
-EAPI=6
-HOMEPAGE=https://notabug.org/civodul/guile-sqlite3.git
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+ GPL-2
-RDEPEND=>=dev-scheme/guile-2.0.11:= dev-db/sqlite:3=
-SLOT=0
-SRC_URI=https://notabug.org/civodul/guile-sqlite3/archive/v0.1.0.tar.gz -> guile-sqlite3-0.1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=48bbae4aaf1e4dfab40a28eddc31131d
diff --git a/dev-scheme/guile-sqlite3/Manifest b/dev-scheme/guile-sqlite3/Manifest
new file mode 100644
index 000000000000..00ee1fef4bbf
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -0,0 +1,3 @@
+DIST guile-sqlite3-0.1.0.tar.gz 23832 BLAKE2B cff04a320ab239bf0d90c01ffc4e557bf5bf2978a433fcca0413b09f3c3b2ee5ed75f3655077dc493ae42a11a8e027f0a17b74c97e3eecadfb67f2e0e7912693 SHA512 8c1f58024c464e5628162e3ba1bf129809403bcc5d2329b55b6628f419ff8d5ead21d87f0bdcbb458ce5798d62184af177616bbfbeb653c34450c716f6b3ab26
+EBUILD guile-sqlite3-0.1.0.ebuild 594 BLAKE2B 386d686e584dfc0835b7c4c13b26b03d4636dcc64ef46957d7c2e7c12b467a85d02917ed9d46a9bd4693badcea131b61c888927dbe24572b4625fd28398a0396 SHA512 cd93cda177eee234b4b96d3e3c1166533274394988fa7b5d214fc8f329ab1208778a48e60cdc18d9a68147922d05178664fd89990396e4d1e830f276fdaef243
+MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
new file mode 100644
index 000000000000..b406491f9454
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Guile bindings of sqlite3"
+HOMEPAGE="https://notabug.org/civodul/guile-sqlite3.git"
+SRC_URI="https://notabug.org/civodul/guile-sqlite3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-db/sqlite:3=
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+
+	# upstream tag on top of source tree. has no autogenerated files
+	eautoreconf
+}
diff --git a/dev-scheme/guile-sqlite3/metadata.xml b/dev-scheme/guile-sqlite3/metadata.xml
new file mode 100644
index 000000000000..2907abeb0c42
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>slyfox@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile-www-2.34 b/dev-scheme/guile-www-2.34
deleted file mode 100644
index c5963064c5e3..000000000000
--- a/dev-scheme/guile-www-2.34
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=test
-DEPEND=dev-scheme/guile:12
-DESCRIPTION=Guile Scheme modules to facilitate HTTP, URL and CGI programming
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/guile-www/
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=dev-scheme/guile:12
-SLOT=0
-SRC_URI=mirror://nongnu/guile-www/guile-www-2.34.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0d6fe16bd2cdd9eff04fdfe658b03c9
diff --git a/dev-scheme/guile-www-2.35 b/dev-scheme/guile-www-2.35
deleted file mode 100644
index a26ab4e97be7..000000000000
--- a/dev-scheme/guile-www-2.35
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=test
-DEPEND=dev-scheme/guile
-DESCRIPTION=Guile Scheme modules to facilitate HTTP, URL and CGI programming
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/guile-www/
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=dev-scheme/guile
-SLOT=0
-SRC_URI=mirror://nongnu/guile-www/guile-www-2.35.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80d21a36df1ae780aa8dda4493954618
diff --git a/dev-scheme/guile-www/Manifest b/dev-scheme/guile-www/Manifest
new file mode 100644
index 000000000000..c89ef9f33a15
--- /dev/null
+++ b/dev-scheme/guile-www/Manifest
@@ -0,0 +1,5 @@
+DIST guile-www-2.34.tar.xz 594488 BLAKE2B 176630e5cfe85e21a717a01532d2368cd183f8dfec0aae611166a8aa3883e13e40653a989d72a71812ebb8defe131a459f4d5ca4c7971796984ac359e4b22ae5 SHA512 f2b05608eb3a3c79dfe779b771fe52acb78938290ecf34eeca8e11ded398366183cfba668fd50084ed67e06514b765034554ecc45ed969f51c1cdfa7c1e77a9c
+DIST guile-www-2.35.tar.xz 614004 BLAKE2B 5069be694fa74e0dea980a9f8d9c9fefa8a543a4904e90b56f0d9496f6cc43d3ed29aacf478d4fde8edd9833551101d2d8b14ae800a6d741220d3186d3583246 SHA512 5190088e762cfcaa1e602098a32b66af67295bc56c20d82f8b87fb3273370881805c1e735f4020b5889c904a588e21024432ddde15d452af82570367be6db3bb
+EBUILD guile-www-2.34.ebuild 504 BLAKE2B 1d8000ef3ad102350574b5e409cb725a4c072744a4f40b9f92c5994c7a69243170f2e2e211a4455ff2ca450cd69b9c8b243dfe8d7215e81c3d38f15aa1c51138 SHA512 b532c66bb475ec3e8129de62e90f3c4c19c6a8cae76a9d93fc3e41dbd0974ec775d5e5ffdeb8530c3c5430a9ccf1b6d4aa31aceeaf180870bd95e951ab9ec8c1
+EBUILD guile-www-2.35.ebuild 501 BLAKE2B 74b848e5d5b7888737cb1a59481074f5abfbfc61e434fe0bf1b456537c7f3277add1801f12a5d6c0cf4020aa208c5e849035b8cb3b2687cf11988ff2cc1e61b9 SHA512 a82cf32c5b791d5d7d742ab3bbbe636f9b33cb4812995db61389ef4016de201cf0ddc376538193e5ae4c6d459a12ab5f512c50e8dc3f367d723847babed55913
+MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/dev-scheme/guile-www/guile-www-2.34.ebuild b/dev-scheme/guile-www/guile-www-2.34.ebuild
new file mode 100644
index 000000000000..2407f10e2846
--- /dev/null
+++ b/dev-scheme/guile-www/guile-www-2.34.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Guile Scheme modules to facilitate HTTP, URL and CGI programming"
+HOMEPAGE="http://www.nongnu.org/guile-www/"
+SRC_URI="mirror://nongnu/guile-www/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-scheme/guile:12"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	emake VERBOSE=1 check
+}
diff --git a/dev-scheme/guile-www/guile-www-2.35.ebuild b/dev-scheme/guile-www/guile-www-2.35.ebuild
new file mode 100644
index 000000000000..e8079d2cbfe3
--- /dev/null
+++ b/dev-scheme/guile-www/guile-www-2.35.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Guile Scheme modules to facilitate HTTP, URL and CGI programming"
+HOMEPAGE="http://www.nongnu.org/guile-www/"
+SRC_URI="mirror://nongnu/guile-www/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-scheme/guile"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	emake VERBOSE=1 check
+}
diff --git a/dev-scheme/guile-www/metadata.xml b/dev-scheme/guile-www/metadata.xml
new file mode 100644
index 000000000000..8937bad0b175
--- /dev/null
+++ b/dev-scheme/guile-www/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
new file mode 100644
index 000000000000..561e67d5b378
--- /dev/null
+++ b/dev-scheme/guile/Manifest
@@ -0,0 +1,23 @@
+AUX 50guile-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX guile-1.8.8-fix_guile-config.patch 494 BLAKE2B e7cf0fe161b83e0561c0eac26889c407ed7fba41a79944a1fe060881e31217c40554f1bcc708940102b80dbf27edf3ba8de58850889bb9e3707166e04195f01d SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970
+AUX guile-1.8.8-gcc46.patch 1004 BLAKE2B 6680d9f6a5207078dac634d4504c0b4b7502a2f49dac089d8f5251d8d8cdcc37e408d0f446389ad0fc908ce7ea801ae3c1af59d7b03dd19f3ce7d1175e97ea68 SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa
+AUX guile-1.8.8-gcc5.patch 575 BLAKE2B a8766ca3eaf808ad4547312a11d203422be21e647a0b089c5709e5f747e6c5136a80dc521c118506086b4a7808aa3301e315420262923604a2bf5819a6d637ef SHA512 844a585679f8d1cbdbe9c4c7c5feb21ebca095a522d75db264c0f4c244153a1435a01647955fc98a0743fec48aeac28c1570dbce78bfd026544addba945a1cee
+AUX guile-1.8.8-gtexinfo-5.patch 460 BLAKE2B 895480608683caf27dda3d4e92b4c82ecde1a6d27e9e37de445fdf9665cbb432759d75b5cb0340ed9a15d2c3175b48647989bdaebe659c1a1104c221bb43c07e SHA512 19185a96bb6dcf7f1cac1908633d65d8cb673148469553cce4099256d05a94688834a61ddc0a18957f9fe253fffb2821817b4b29a4a604e8c152debb6e3323a6
+AUX guile-1.8.8-makeinfo-5.patch 2361 BLAKE2B 3720979563cba33c9d5058d070717e6c433b1c1e3e0e41a34d83179f1c2ae5bb5cb8a1a445d0da52f714aea18418d492a482d1dcf11ffe689c092a50d8f0191a SHA512 a69ed6cf2fd87c6f3d61cc914eed960fcdebaa151778b1ecf04f1774e6dddf07d17bf90fb3243a08e8c231e391843201d0ba26debedef33199d8dd75f8cbcd09
+AUX guile-1.8.8-mkdir-mask.patch 1300 BLAKE2B 941f4fdeafc769fe6d41b2303f7dc3f7972d5c40cae6c09bf1532171827ac3e284bf812276e0d9b7c276fe8312b306fcef9010b69d3d2dd5d13593e11be904e0 SHA512 e02fa50af16fb545b26560064cc7adb19caf523691dfb22044c1e01fe9c98c42804c3d13ac28d65cb61bf7667fb0f1d4aa703949cea321d382b871abd083454e
+AUX guile-1.8.8-readline.patch 953 BLAKE2B e08c20d919b3659f8f4b2bcee26b12d43f2b942c1b12859cacb5ab813fe2aa8790b29cbb694b9c75851d28a7c96e3296345d8c2261175ce6b71a4bd65eec6f1a SHA512 e86e6e7f035f9ff9d541b44987d7cb0e5a1f80f62b7b4a112dc933f5831b90a33b506c6601165e957a3973c38ca56d0e84eafaa76c78ae5db26d7887669f1443
+AUX guile-1.8.8-sandbox.patch 514 BLAKE2B d47f7a6ffc4e67cec738e963ff2ec7c3bfa600992cb49eee6fff248d340811695905a02907ddb8444b6a1d6c8541af1824b0348bbf8230f4e3dba6d4317dad32 SHA512 6786c4c8254ebf0dbfe69402f4781151fcecec0fad8b282b831cb0300721ef22b8c11d4feecbe30643e3783d488c53e3f1158c0b0c76f6beda15fd7c0d6515db
+AUX guile-1.8.8-tinfo.patch 450 BLAKE2B 0dcf1728e30034f1e612d666b07cdbf2147dbbe8151a23479d1519f4bc55a0fcf83c37e545592c2a2fb7c7426f026ae3fac0f08d3a36248cd8b27c3d9ae8a618 SHA512 0ea33680a57b1adb0821bd00cd73955e8c2fd5f31c4bd20a291c3e4fbb6a3dd9e2f4977b135f05fa3e2b65b1f5e0f5253db642e7b0b0fcd2e78ff8b6dd1cf37a
+AUX guile-2-snarf.patch 1274 BLAKE2B e9efdd1e14560579131ecff748add4f97de730678e6f766681be72f95bf99ab36edd8bc7279701084d13f3fa762968af814760bcf9b8778c73c956c282bb3c93 SHA512 49d015b08d0bcf5d27aa43d4a595b2ccb4366dffe0f5d159162c8c7747fb9fdbe84056a737f3c81a6e39281d91109bfa4aa98c85dd0e757c17ab668a1dd46f24
+AUX guile-2.0.14-darwin.patch 1026 BLAKE2B 9193732cfb74931f7bf8e9b55c5c9dd2621ef6271c8d18190e0ed94d90decde85272f271bbbe7d3c4dd0dd509e51fae3f7f0af42872a0b9ebb87396c9e69a9d2 SHA512 151d19f171656105d87336f81dd8c34273d07a3e88aa03ac5ca8d640c79ab317a90ef06097858bf627e4666fba747faea45237c73e7bc6462d19d8f0d1904d53
+AUX guile-2.0.14-ia64-fix-crash-thread-context-switch.patch 2426 BLAKE2B 5b2073a3780794e9466d8e5434ab98a91a821408ab792abbfaf61d09c95e113b99746b0da850115b4534bda00b1313cef5bb9b08c90c8bf9a04c81b1eb78faa3 SHA512 082f98ac4ee2f40dd3762006bf5c43022088b2286c9a8d63ae9e234d3c8527f3afcfba8076e0c8578e7fbed257294db6ce1a4513661b89f821579dc121d449ae
+AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420c858f964b8587bed523d95fadedbf9981dd9c196934299413db9c23e940a4b88e798e4fff65cdea1507968494338313ba SHA512 450f44cbd2b3f0c7c02963c35e58e8d0e4a7192239993215b69713d8a1109692ab1e153efe685c27681069477a56e7bc52b34ebd8717a2c8695be8c6b8abe673
+DIST guile-1.8.8.tar.gz 3956654 BLAKE2B 4820d635ac2c57526c0c03f3e0e6e4ac4276533ea8db15e6d1b759c33edec094a1a4bdc3e09ccae61f1b271d63565063746feea242a90c18cd575775444a42ef SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0
+DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f5668467f3ccc59ba9fdf41bb0b035827da173175e9389448cabef05997fb170baf2897ac4a9dddc4064d6af2b53b SHA512 79fd5fda5064331eb687934ec3eaf07943f5b23bd05fbce23ab5ee3698864250b33746e33b8f074692b56f7b428dac42ed5d3f5b9dc17d171aa6dfadc1625b00
+DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
+DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
+EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
+EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
+EBUILD guile-2.0.14-r3.ebuild 2243 BLAKE2B 55335cd62d01e3054d24e92258c8c18fae754fa143d8f2b07c38a543344c24ee50a03f9a12b6978c86ce9fd369a666380c759ffac34714dc68dd439cac0af0d4 SHA512 0a2f1c77ac08995c1a60596c634178795c9c3bac2140bf3aa131cc1d89dc2230483b7b05e7afed220217904e3eee488201069cdd4a6181a5e0aa6e6ce8fa7947
+EBUILD guile-2.2.3.ebuild 2016 BLAKE2B 2ae8537a627d4880c93f7a317de57c001685bb1cdc7a07aed1c2b81e01b11b029ee364b0ccc28893ce23236ad7a48fdc1aec8738a7ffc5bf10ac5f77ab867393 SHA512 ddeb74589c283bcd2d767c2670ec57f9d67477f3dbdbb8dcc40dfa8c68c5de7f73616f03e979b2292e91cff4fb05e89b33f319e42387006a120d2199054a7da1
+MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/dev-scheme/guile/files/50guile-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
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
new file mode 100644
index 000000000000..2b04426ebd96
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
@@ -0,0 +1,14 @@
+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-gcc46.patch b/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
new file mode 100644
index 000000000000..b06a0e59eb14
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
@@ -0,0 +1,39 @@
+Backported upstream patch to fix SIGSEGV with gcc-4.6
+
+http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94
+https://bugs.gentoo.org/show_bug.cgi?id=424475
+--- a/configure.in
++++ b/configure.in
+@@ -1199,23 +1199,20 @@
+ 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],
+ 	       [],
diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
new file mode 100644
index 000000000000..742ea0ba9de2
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
@@ -0,0 +1,15 @@
+Preprocessor changes in GCC 5 cause guile-snarf to output garbage.
+
+https://bugs.gentoo.org/560736
+
+--- a/libguile/guile-snarf.in
++++ b/libguile/guile-snarf.in
+@@ -50,7 +50,7 @@
+     ## Apparently, AIX's preprocessor is unhappy if you try to #include an
+     ## empty file.
+     echo "/* cpp arguments: $@ */" ;
+-    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
++    ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+     grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+ 
diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch
new file mode 100644
index 000000000000..d7fbda15c101
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp $
+
+Compatibility with gtexinfo 5.2
+
+--- doc/tutorial/guile-tut.texi	2010-12-14 06:24:39.000000000 +1300
++++ doc/tutorial/guile-tut.texi	2013-11-30 19:44:28.304575529 +1300
+@@ -446,7 +446,7 @@
+ Schemer} from that list.}
+ 
+ 
+-@subsection Hello World
++@section Hello World
+ @cindex hello world
+ 
+ Our first program is the typical Scheme "hello world" program.  Put the
+\ No newline at end of file
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
new file mode 100644
index 000000000000..9f3a02c18c65
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
@@ -0,0 +1,71 @@
+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-1.8.8-mkdir-mask.patch b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch
new file mode 100644
index 000000000000..7d1c703835f1
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch
@@ -0,0 +1,35 @@
+--- a/libguile/filesys.c	2016-11-05 15:03:52.131894648 +0100
++++ b/libguile/filesys.c	2016-11-05 15:07:13.275894481 +0100
+@@ -791,24 +791,18 @@
+ SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0,
+             (SCM path, SCM mode),
+ 	    "Create a new directory named by @var{path}.  If @var{mode} is omitted\n"
+-	    "then the permissions of the directory file are set using the current\n"
+-	    "umask.  Otherwise they are set to the decimal value specified with\n"
+-	    "@var{mode}.  The return value is unspecified.")
++	    "then the permissions of the directory are set to @code{#o777}\n"
++	    "masked with the current umask (@pxref{Processes, @code{umask}}).\n"
++	    "Otherwise they are set to the value specified with @var{mode}.\n"
++	    "The return value is unspecified.")
+ #define FUNC_NAME s_scm_mkdir
+ {
+   int rv;
+-  mode_t mask;
++  mode_t c_mode;
+ 
+-  if (SCM_UNBNDP (mode))
+-    {
+-      mask = umask (0);
+-      umask (mask);
+-      STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask));
+-    }
+-  else
+-    {
+-      STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode)));
+-    }
++  c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode);
++
++  STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode));
+   if (rv != 0)
+     SCM_SYSERROR;
+   return SCM_UNSPECIFIED;
diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch
new file mode 100644
index 000000000000..68f64c528a4b
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch
@@ -0,0 +1,34 @@
+Make guile-readline optional
+
+https://bugs.gentoo.org/392553
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -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
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
+ #
+ #--------------------------------------------------------------------
+ 
+-AC_CONFIG_SUBDIRS(guile-readline)
++GUILE_READLINE=
++AC_ARG_ENABLE([readline],
++  [AS_HELP_STRING([--disable-readline],
++                  [disable building guile-readline])],
++  if test "x$enable_readline" != xno; then
++    AC_CONFIG_SUBDIRS([guile-readline])
++    GUILE_READLINE="guile-readline"
++  fi)
++AC_SUBST([GUILE_READLINE])
+ 
+ #--------------------------------------------------------------------
+ 
diff --git a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
new file mode 100644
index 000000000000..70d752fdae97
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
@@ -0,0 +1,15 @@
+Prevent sandbox violation when installing
+
+https://bugs.gentoo.org/521546
+
+--- a/guile-config/Makefile.am
++++ b/guile-config/Makefile.am
+@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h
+ 	    -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
+ 	chmod +x guile-config.tmp
+ 	mv guile-config.tmp guile-config
+-
+-## Get rid of any copies of the configuration script under the old
+-## name, so people don't end up running ancient copies of it.
+-install-exec-local:
+-	rm -f ${bindir}/build-guile
diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
new file mode 100644
index 000000000000..6c4d0116246e
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
@@ -0,0 +1,15 @@
+With ncurses[tinfo] tgoto will be in libtinfo
+
+https://bugs.gentoo.org/539316
+
+--- a/guile-readline/configure.in
++++ b/guile-readline/configure.in
+@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then
+ fi
+ AC_SUBST(EXTRA_DEFS)
+ 
+-for termlib in ncurses curses termcap terminfo termlib ; do
++for termlib in ncurses curses termcap terminfo termlib tinfo ; do
+    AC_CHECK_LIB(${termlib}, tgoto,
+                 [LIBS="-l${termlib} $LIBS"; break])
+ done
diff --git a/dev-scheme/guile/files/guile-2-snarf.patch b/dev-scheme/guile/files/guile-2-snarf.patch
new file mode 100644
index 000000000000..c6ab5cd48cd6
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2-snarf.patch
@@ -0,0 +1,47 @@
+From f775ab3654357fcaad294b95efb0b1c16de1eda8 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 Feb 2017 22:58:40 +0000
+Subject: guile-snarf: skip -g* arguments to avoid build failure
+
+* libguile/guile-snarf.in: skip -g* arguments to avoid failure on
+  -ggdb3.
+
+Bug: https://bugs.gentoo.org/608190
+Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25803
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ libguile/guile-snarf.in | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
+index 47bbc04..22dc1d3 100644
+--- a/libguile/guile-snarf.in
++++ b/libguile/guile-snarf.in
+@@ -95,10 +95,22 @@ if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
+ 
+ trap "rm -rf $tempdir" 0 1 2 15
+ 
++# filter out -g* flags from commandline
++# as some flags like -ggdb3 cause CPP
++
++cpp_args=""
++for arg in "$@"
++do
++    case "$arg" in
++        -g*) ;; # skip debug flag
++        *) cpp_args="$cpp_args $arg" ;;
++    esac
++done
++
+ if [ ! "$outfile" = "-" ] ; then
+-    modern_snarf "$@" > $outfile
++    modern_snarf $cpp_args > $outfile
+ else
+-    modern_snarf "$@"
++    modern_snarf $cpp_args
+ fi
+ 
+ # zonk outfile if errors occurred
+-- 
+cgit v1.0-41-gc330
+
diff --git a/dev-scheme/guile/files/guile-2.0.14-darwin.patch b/dev-scheme/guile/files/guile-2.0.14-darwin.patch
new file mode 100644
index 000000000000..17741ae352c2
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.0.14-darwin.patch
@@ -0,0 +1,38 @@
+fix compilation on Darwin
+
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23
+https://bugs.gentoo.org/show_bug.cgi?id=612338
+
+--- guile-2.0.14/libguile/filesys.c
++++ guile-2.0.14/libguile/filesys.c
+@@ -1486,6 +1486,9 @@
+       mode_bits = scm_i_mode_bits (mode);
+     }
+ 
++#ifdef __APPLE__
++  open_flags &= O_APPEND|O_SHLOCK|O_EXLOCK|O_CLOEXEC;
++#endif
+   SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
+   if (rv == -1)
+     SCM_SYSERROR;
+--- guile-2.0.14/libguile/stime.c
++++ guile-2.0.14/libguile/stime.c
+@@ -830,6 +830,10 @@
+ 
+ #ifdef HAVE_POSIX_CPUTIME
+   {
++#ifdef __APPLE__
++    if (clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
++      get_internal_run_time = get_internal_run_time_posix_timer;
++#else
+     clockid_t dummy;
+     
+     /* Only use the _POSIX_CPUTIME clock if it's going to work across
+@@ -839,6 +843,7 @@
+       get_internal_run_time = get_internal_run_time_posix_timer;
+     else
+       errno = 0;
++#endif
+   }
+ #endif /* HAVE_POSIX_CPUTIME */
+ #endif /* HAVE_CLOCKTIME */
diff --git a/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch b/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch
new file mode 100644
index 000000000000..c2f136ddd104
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch
@@ -0,0 +1,63 @@
+From f92888853439a8ded221f3423865c78de2a96a14 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 5 Nov 2017 09:30:45 +0000
+Subject: ia64: Fix crash in thread context switch.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes <https://bugs.gnu.org/29151> and <https://bugs.gentoo.org/613986>.
+
+Backtrace looks like that:
+
+  Program terminated with signal SIGSEGV, Segmentation fault.
+  #0  0x200000000014a5c0 in scm_ia64_longjmp (JB=0x6000000000817020, VAL=1) at continuations.c:372
+  372                   t->pending_rbs_continuation->backing_store,
+  [Current thread is 1 (Thread 0x2000000000049340 (LWP 8190))]
+  (gdb) bt
+  #0  0x200000000014a5c0 in scm_ia64_longjmp (JB=0x6000000000817020, VAL=1) at continuations.c:372
+  #1  0x2000000000148e00 in scm_c_abort (vm=0x60000000000edea0, tag=0x6000000000795ba0, n=0, argv=0x60000fffff7f0ce0, cookie=-1) at control.c:239
+  #2  0x2000000000149070 in scm_at_abort (tag=0x6000000000795ba0, args=0x304) at control.c:258
+  (gdb) print t
+  $2 = (scm_i_thread *) 0x6000000000068000
+  (gdb) print t->pending_rbs_continuation
+  $3 = (scm_t_contregs *) 0xffeb
+
+The problem here is the value of 't->pending_rbs_continuation' pointer.
+It's supposed to poin to a register stack pointer or be NULL if not yet
+backed up.
+
+The problem is it is never initialized to NULL at creation time and
+contained garbage on stack. Sometimes people are lucky and have zeros
+on stack and guile works. But sometimes there is something and guile
+crashes.
+
+The fix is trivial: initialize 'pending_rbs_continuation = NULL'
+at thread registration time (the same way other threads are registered).
+
+Reported-by: Matt Turner
+
+* libguile/threads.c (guilify_self_1): Initialize pending_rbs_continuation
+to avoid crash on ia64.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+Signed-off-by: Ludovic Courtès <ludo@gnu.org>
+---
+ libguile/threads.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libguile/threads.c b/libguile/threads.c
+index 9ceb5b8..770f62c 100644
+--- a/libguile/threads.c
++++ b/libguile/threads.c
+@@ -395,6 +395,7 @@ guilify_self_1 (struct GC_stack_base *base, int needs_unregister)
+   t.base = base->mem_base;
+ #ifdef __ia64__
+   t.register_backing_store_base = base->reg_base;
++  t.pending_rbs_continuation = 0;
+ #endif
+   t.continuation_root = SCM_EOL;
+   t.continuation_base = t.base;
+-- 
+cgit v1.0-41-gc330
+
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 000000000000..1cded2d2c924
--- /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
new file mode 100644
index 000000000000..c2740abb37d5
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+
+RESTRICT="!regex? ( test )"
+
+RDEPEND="
+	>=dev-libs/gmp-4.1:0=
+	dev-libs/libltdl:0=
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	emacs? ( virtual/emacs )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/libtool"
+
+# 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/8"
+MAJOR="1.8"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
+		"${FILESDIR}/${P}-gcc46.patch" \
+		"${FILESDIR}/${P}-gcc5.patch" \
+		"${FILESDIR}/${P}-makeinfo-5.patch" \
+		"${FILESDIR}/${P}-gtexinfo-5.patch" \
+		"${FILESDIR}/${P}-readline.patch" \
+		"${FILESDIR}/${P}-tinfo.patch" \
+		"${FILESDIR}/${P}-sandbox.patch" \
+		"${FILESDIR}/${P}-mkdir-mask.patch"
+
+	sed \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+		-e "/AM_PROG_CC_STDC/d" \
+		-i guile-readline/configure.in || die
+
+	epatch_user
+
+	mv "${S}"/configure.{in,ac} || die
+	mv "${S}"/guile-readline/configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	#will fail for me if posix is disabled or without modules -- hkBst
+	econf \
+		--disable-error-on-warning \
+		--disable-static \
+		--enable-posix \
+		$(use_enable networking) \
+		$(use_enable readline) \
+		$(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) \
+		--with-modules \
+		EMACS=no
+}
+
+src_compile()  {
+	emake
+
+	# 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 || die
+		elisp-compile *.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+
+	# texmacs needs this, closing bug #23493
+	dodir /etc/env.d
+	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile || 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() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/guile/guile-2.0.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
new file mode 100644
index 000000000000..037cc1595b2b
--- /dev/null
+++ b/dev-scheme/guile/guile-2.0.13-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="LGPL-3+"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+# emacs useflag removal not working
+
+# workaround for bug 596322
+REQUIRED_USE="regex"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	virtual/libffi
+	dev-libs/libltdl:=
+	dev-libs/libunistring:0=
+	sys-devel/libtool
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/texinfo
+	sys-devel/gettext"
+
+SLOT="12/22" # subslot is soname version
+MAJOR="2.0"
+
+DOCS=( GUILE-VERSION HACKING README )
+
+PATCHES=( "${FILESDIR}/${PN}-2-snarf.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--disable-error-on-warning \
+		--disable-rpath \
+		--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
+
+	# 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
+
+	# Dark magic necessary for some deps
+	dosym libguile-2.0.so /usr/$(get_libdir)/libguile.so
+}
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
new file mode 100644
index 000000000000..7e73e36e14d0
--- /dev/null
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic autotools ltprune
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="LGPL-3+"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+# emacs useflag removal not working
+
+# workaround for bug 596322
+REQUIRED_USE="regex"
+
+RDEPEND="
+	>=dev-libs/boehm-gc-7.0:=[threads?]
+	dev-libs/gmp:=
+	virtual/libffi
+	dev-libs/libltdl:=
+	dev-libs/libunistring:0=
+	sys-devel/libtool
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/texinfo
+	sys-devel/gettext"
+
+SLOT="12/22" # subslot is soname version
+MAJOR="2.0"
+
+DOCS=( GUILE-VERSION HACKING README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2-snarf.patch"
+	"${FILESDIR}/${P}-darwin.patch"
+	"${FILESDIR}/${P}-ia64-fix-crash-thread-context-switch.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--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
+	prune_libtool_files
+
+	# 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
+
+	# Dark magic necessary for some deps
+	dosym libguile-2.0.so /usr/$(get_libdir)/libguile.so
+}
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
new file mode 100644
index 000000000000..895f6d9e02bc
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-devel/libtool
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/texinfo
+	sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+	# see bug #178499
+	filter-flags -ftree-vectorize
+
+	econf \
+		--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
+
+	# 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
new file mode 100644
index 000000000000..02c7884936bb
--- /dev/null
+++ b/dev-scheme/guile/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<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>
+</pkgmetadata>
diff --git a/dev-scheme/jscheme-7.2-r1 b/dev-scheme/jscheme-7.2-r1
deleted file mode 100644
index a51b315595b5..000000000000
--- a/dev-scheme/jscheme-7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A Scheme dialect with a simple Java interface called Javadot notation
-EAPI=6
-HOMEPAGE=http://jscheme.sourceforge.net/jscheme/main.html
-IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.6 >=virtual/jdk-1.6:* >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jscheme/jscheme-7.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0b9b49b4e4d49b832cda1ca2043bda9e
diff --git a/dev-scheme/jscheme/Manifest b/dev-scheme/jscheme/Manifest
new file mode 100644
index 000000000000..c15479dbe651
--- /dev/null
+++ b/dev-scheme/jscheme/Manifest
@@ -0,0 +1,3 @@
+DIST jscheme-7.2.tgz 2507622 BLAKE2B a468b040c414cd570b2e6331a2aaaa73983da2abd570525532562ca9a4caaa4c1027f5f46abaa40d117bd04b584e6183162e3195bc559cceea30c3ea0bae2872 SHA512 48aa1ce806e2dd9bd6797dce6e6569787ad9072f728a39a37310ec5604afdb3fda4ad56a721336d0be9e3c985333ff9dd31cdb809c095d503f54a0f477adc3c7
+EBUILD jscheme-7.2-r1.ebuild 649 BLAKE2B 5c87a564741025d5bfbd452b240d11533a4f9c800c752d97fe0658e38cf1f2197f7f8b33a2f100ac58d74e68275c08de32b9d8e1d1434da6e90b6b452fcfc9b2 SHA512 36f13668f9805f94cc1ad14a9c91448081117ba4699bb175bd102f53e29919582b2fa4b9aa8b59d8d8c739b536e21a72cc5899a9781222a06256eb85737a7098
+MISC metadata.xml 599 BLAKE2B c34409b6298cbe0e19afa8f1f63bcbfdcdeb0f0502162a8002c0e7b8089759479599974b69c30122ac7f8254dec38093a3b3b28dfd0bcc7348b3c9586344a14e SHA512 f1ae5056e6e7ac9d45d80d2a11c3501c24b1cb50818345e70833df9e84eed3b6656d2cbda53e392bf52694f5b32926d177cd49dd6163f67a692b32a62a873c5f
diff --git a/dev-scheme/jscheme/jscheme-7.2-r1.ebuild b/dev-scheme/jscheme/jscheme-7.2-r1.ebuild
new file mode 100644
index 000000000000..cf090e8d036d
--- /dev/null
+++ b/dev-scheme/jscheme/jscheme-7.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-utils-2 java-pkg-2
+
+DESCRIPTION="A Scheme dialect with a simple Java interface called Javadot notation"
+HOMEPAGE="http://jscheme.sourceforge.net/jscheme/main.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.6:*"
+RDEPEND=">=virtual/jre-1.6
+	${DEPEND}"
+
+src_compile() {
+	sh bin/make || die "make failed"
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	java-pkg_dolauncher ${PN} \
+		--main jscheme.REPL
+
+	use doc && dodoc -r doc
+}
diff --git a/dev-scheme/jscheme/metadata.xml b/dev-scheme/jscheme/metadata.xml
new file mode 100644
index 000000000000..28f1568c4bc2
--- /dev/null
+++ b/dev-scheme/jscheme/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	JScheme is a dialect of Scheme with a very simple interface to Java, called
+	the Javadot notation . This notation provides a transparent access to all
+	Java classes, constructors, methods, and fields on the classpath.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jscheme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/kawa-1.14-r1 b/dev-scheme/kawa-1.14-r1
deleted file mode 100644
index b730dd11b417..000000000000
--- a/dev-scheme/kawa-1.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) servlets? ( java-virtuals/servlet-api:3.0 ) xqtests? ( app-arch/unzip:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/kawa/
-IUSE=+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests elibc_FreeBSD source
-KEYWORDS=x86
-LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
-RDEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=754bf2c727f811212f46cb49d2bbf545
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
new file mode 100644
index 000000000000..b90e728bb24e
--- /dev/null
+++ b/dev-scheme/kawa/Manifest
@@ -0,0 +1,5 @@
+AUX kawa-1.14.patch 1482 BLAKE2B 76f1ab83fee8ece2d30138b4fed314a056dc32b4c3a07eccbc75307a36779c0a5c3bd519e7bfa5d03c1108714ea9c2f13cd1e5852c2622a9b701387f6e9fe0b0 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92
+DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
+DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
+EBUILD kawa-1.14-r1.ebuild 2760 BLAKE2B b16be8e41e14d2531fd937bf95708e16753a65ac0df852c169568c4fe045df96e301c16d9565ded650de714e28454ee9d44db08aa70f97fa20d1ed6a266ca8b6 SHA512 4c17775eda4f927e6db324d69a7fed405b21b44f51294db8fe0acfc8445a17241cf74c8c2486931ba8c1d98a06bf0cc609d55f86121787f23ef142441b9dbc0e
+MISC metadata.xml 1296 BLAKE2B ba022afb4f0abda7b0bef5d3a74f7f9a1e02e861d7a9d5cd44c50a74d57e4c66f646c2249cd037c159751bdbada7f53a4674bfe229933584f219bef87e561e71 SHA512 f960bf7ac29967887ca3d07bc55ebf127e0b99e7dbf2d45b6a14f018010aaa50338db62151ab5a2e92b71801eebbdf8c797b21d76c36117daa88536e965bd194
diff --git a/dev-scheme/kawa/files/kawa-1.14.patch b/dev-scheme/kawa/files/kawa-1.14.patch
new file mode 100644
index 000000000000..8acc5e442f69
--- /dev/null
+++ b/dev-scheme/kawa/files/kawa-1.14.patch
@@ -0,0 +1,24 @@
+diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in
+--- kawa-1.10.orig/Makefile.in		2010-09-19 01:38:24.000000000 +0200
++++ kawa-1.10/Makefile.in	2010-09-19 01:38:59.000000000 +0200
+@@ -908,7 +908,7 @@
+     | sed -e 's|./||' | sort > $@
+ 
+ gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java
+-	$(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
++	$(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
+ 
+ # JDK 1.1
+ select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class
+diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
+--- kawa-1.9.90.orig/bin/Makefile.in	2009-08-08 12:20:49.000000000 -0300
++++ kawa-1.9.90/bin/Makefile.in	2009-09-21 20:15:06.000000000 -0300
+@@ -686,7 +686,7 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+-@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
++@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
+ @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) $(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
+ @ENABLE_SERVLET_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) $(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
+ 
diff --git a/dev-scheme/kawa/kawa-1.14-r1.ebuild b/dev-scheme/kawa/kawa-1.14-r1.ebuild
new file mode 100644
index 000000000000..6faeac4e0383
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.14-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
+HOMEPAGE="https://www.gnu.org/software/kawa/"
+XQTS_Ver="1_0_3"
+SRC_URI="mirror://gnu/kawa/${P}.tar.gz
+		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
+
+LICENSE="MIT public-domain
+		 jemacs? ( GPL-2 )
+		 krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests"
+
+CDEPEND="( >=virtual/jdk-1.6 )
+	frontend? ( sys-libs/readline:0 )
+	sax? ( dev-java/sax:0 )
+	echo2? ( dev-java/echo2 )
+	servlets? ( java-virtuals/servlet-api:3.0 )"
+DEPEND="${CDEPEND}
+		xqtests? ( app-arch/unzip:0 )"
+RDEPEND="${CDEPEND}"
+
+xtestsuite="XQTS_${XQTS_Ver}"
+
+src_unpack () {
+	unpack kawa-${PV}.tar.gz || die
+	if use xqtests; then
+		mkdir "${WORKDIR}/${xtestsuite}" || die
+		cd "${WORKDIR}/${xtestsuite}" || die
+		unpack ${xtestsuite}.Zip || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
+	# speeds up one-shot ebuilds.
+	myconf="--disable-dependency-tracking"
+	if use jemacs && ! use swing; then
+		echo
+		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
+		einfo "so swing is enabled anyway."
+		echo
+		myconf="${myconf} --with-swing"
+	else
+		myconf="${myconf} $(use_with swing)"
+	fi
+	if use xqtests; then
+		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
+	fi
+	if use servlets; then
+		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+	fi
+
+	econf ${myconf} $(use_enable frontend kawa-frontend) \
+		  $(use_enable xml) \
+		  $(use_enable krl brl) \
+		  $(use_enable echo2) \
+		  $(use_enable jemacs) \
+		  $(use_with awt) \
+		  $(use_with sax sax2) \
+		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
+}
+
+src_compile() {
+	emake -j1 || die "emake failed."
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
+
+	java-pkg_newjar kawa-${PV}.jar || die
+
+	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
+	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
+		"--xquery" || die "dolauncher qexo failed"
+	if use servlets; then
+		java-pkg_dolauncher "kawa-cgi-servlet" --main \
+			gnu.kawa.servlet.CGIServletWrapper || die
+	fi
+	if use jemacs; then
+		java-pkg_dolauncher "jemacs" --main \
+			gnu.jemacs.lang.ELisp || die
+	fi
+
+	use source && java-pkg_dosrc kawa/* gnu/*
+
+	dodoc ChangeLog TODO README NEWS || die
+	doinfo doc/kawa.info* || die
+	cp doc/kawa.man doc/kawa.2 || die
+	cp doc/qexo.man doc/qexo.2 || die
+	doman doc/*.2 || die
+}
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
new file mode 100644
index 000000000000..64f677da3f76
--- /dev/null
+++ b/dev-scheme/kawa/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>scheme@gentoo.org</email>
+  <name>Gentoo Scheme Project</name>
+</maintainer>
+<longdescription lang="en">
+  Kawa is a full Scheme implementation. It implements almost all of R5RS,
+  plus some extensions. By default, symbols are case sensitive. It is
+  completely written in Java. Scheme functions and files are automatically
+  compiled into Java byte-codes. Kawa does some optimizations, and the
+  compiled code runs at reasonable speed.
+</longdescription>
+<use>
+  <flag name="awt">Assume AWT is available</flag>
+  <flag name="echo2">Enable support for the Echo2 web toolkit with
+    <pkg>dev-java/echo2</pkg></flag>
+  <flag name="frontend">Build "kawa" front-end program using
+    <pkg>sys-libs/readline</pkg></flag> 
+  <flag name="jemacs">Build JEmacs</flag>
+  <flag name="krl">Build BRL emulation and KRL</flag>
+  <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
+  <flag name="servlets">Build support for generating servlets with
+    <pkg>dev-java/servletapi</pkg></flag>
+  <flag name="swing">Assume Swing is available</flag>
+  <flag name="xqtests">Support XQuery Test Suite</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-scheme/metadata.xml b/dev-scheme/metadata.xml
new file mode 100644
index 000000000000..30a22896bc74
--- /dev/null
+++ b/dev-scheme/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-scheme category contains libraries and utilities relevant to the
+		Scheme programming language.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-scheme enthält Bibliotheken und Werkzeuge für die
+		Programmiersprache Scheme.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-scheme contiene librerías y utilidades referentes al
+		lenguaje de programación Scheme.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-schemeカテゴリーにはSchemeプログラミング言語に関連したライブラリーと
+		ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-scheme categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+		van de programmeertaal Scheme.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-scheme chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Scheme.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-scheme contiene librerie e utilità per il linguaggio di
+		programmazione Scheme.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-scheme contém bibliotecas e utilitários
+		referentes à linguagem de programação Scheme.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-scheme zawiera biblioteki i narzędzia związane z językiem
+		programowania Scheme.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-scheme/net-http-0.3.1-r1 b/dev-scheme/net-http-0.3.1-r1
deleted file mode 100644
index 9f5d5ed4781a..000000000000
--- a/dev-scheme/net-http-0.3.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-scheme/guile
-DESCRIPTION=Library for doing HTTP client-side programming in Guile
-EAPI=4
-HOMEPAGE=http://evan.prodromou.name/software/net-http/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile
-SLOT=0
-SRC_URI=http://evan.prodromou.name/software/net-http/net-http-0.3.1.tar.gz
-_md5_=85d980b4e048b0f7e1173b1e829ffe5a
diff --git a/dev-scheme/net-http/Manifest b/dev-scheme/net-http/Manifest
new file mode 100644
index 000000000000..596d30c617a9
--- /dev/null
+++ b/dev-scheme/net-http/Manifest
@@ -0,0 +1,3 @@
+DIST net-http-0.3.1.tar.gz 26907 BLAKE2B 405f6609700e451b299953747d1dfc125b7f8f4a578ff637f7df8962145d3264d248b15c80bc411d82a943f5e5506b2b942be638ae203f1727cfd40d632e8aa0 SHA512 a85d45c2dca6572b8b66a98dfb6719acba4d5ed61bce88de56ea8a84dc41ff0068e7d5b6c864b32b41c608521b153a8fc785635740d65aa4c1bd6d28daaefc3a
+EBUILD net-http-0.3.1-r1.ebuild 713 BLAKE2B 795a4a8557294768697ba67a79a86163178324ba4ce32a5a410028026d808fc819c3896391ef8696a2cfb385f251a6101eaa4d76c9f018d7ee72b1ccefbdd2a8 SHA512 03c3877249bd87cbb103b2971ff3bd158ccf00ded86b8edafc407a3d1053b919bd742c0cf00bf74c3c6a14d25c96877e6c7197dadc2e1e6d0c0f9704ddcbab5b
+MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/net-http/metadata.xml b/dev-scheme/net-http/metadata.xml
new file mode 100644
index 000000000000..4ac68c154bb0
--- /dev/null
+++ b/dev-scheme/net-http/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci-chemistry@gentoo.org</email>
+	<name>Gentoo Chemistry Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-scheme/net-http/net-http-0.3.1-r1.ebuild b/dev-scheme/net-http/net-http-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..c279c4a62a7f
--- /dev/null
+++ b/dev-scheme/net-http/net-http-0.3.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Library for doing HTTP client-side programming in Guile"
+HOMEPAGE="http://evan.prodromou.name/software/net-http/"
+SRC_URI="http://evan.prodromou.name/software/net-http/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-scheme/guile"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	# Scheme doesn't compile
+	true
+}
+
+src_compile() {
+	# Scheme doesn't compile
+	true
+}
+
+src_install() {
+	local GUILE_DIR="/usr/share/guile/site"
+	insinto ${GUILE_DIR}
+	doins -r "${S}"/net
+	dodoc "${S}"/README
+}
diff --git a/dev-scheme/racket-6.11-r1 b/dev-scheme/racket-6.11-r1
deleted file mode 100644
index c8fdf43f2bb2..000000000000
--- a/dev-scheme/racket-6.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
-EAPI=6
-HOMEPAGE=http://racket-lang.org/
-IUSE=doc +futures +jit minimal +places +readline +threads +X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+ LGPL-3
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-REQUIRED_USE=futures? ( jit )
-SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.11/racket-minimal-6.11-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.11/racket-6.11-src-builtpkgs.tgz )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=700da2c916772ba2b41d9d496ec5360f
diff --git a/dev-scheme/racket-6.12-r1 b/dev-scheme/racket-6.12-r1
deleted file mode 100644
index d7248a288701..000000000000
--- a/dev-scheme/racket-6.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
-EAPI=6
-HOMEPAGE=http://racket-lang.org/
-IUSE=doc +futures +jit minimal +places +readline +threads +X
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+ LGPL-3
-RDEPEND=dev-db/sqlite:3 media-libs/libpng:0 x11-libs/cairo[X?] x11-libs/pango[X?] virtual/libffi virtual/jpeg:0 readline? ( dev-libs/libedit ) X? ( x11-libs/gtk+[X?] ) !dev-tex/slatex
-REQUIRED_USE=futures? ( jit )
-SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.12/racket-minimal-6.12-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.12/racket-6.12-src-builtpkgs.tgz )
-_eclasses_=pax-utils	b963274a93e76570a88168c1f1db4cd7
-_md5_=700da2c916772ba2b41d9d496ec5360f
diff --git a/dev-scheme/racket-6.7 b/dev-scheme/racket-6.7
deleted file mode 100644
index 682c650e7d24..000000000000
--- a/dev-scheme/racket-6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi
-DESCRIPTION=General purpose, multi-paradigm programming language in the Lisp-Scheme family.
-EAPI=6
-HOMEPAGE=http://racket-lang.org/
-IUSE=doc +futures +jit minimal +places +threads +X
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi
-REQUIRED_USE=futures? ( jit )
-SLOT=0
-SRC_URI=minimal? ( http://download.racket-lang.org/installers/6.7/racket-minimal-6.7-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/6.7/racket-6.7-src-builtpkgs.tgz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b67c555f4a26847a057f04a885a3b9e
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
new file mode 100644
index 000000000000..69d21ca216a2
--- /dev/null
+++ b/dev-scheme/racket/Manifest
@@ -0,0 +1,10 @@
+DIST racket-6.11-src-builtpkgs.tgz 122307703 BLAKE2B 395b14c15b73dfda7b6e863a83530b5266ec2f132b3b8ee23ee60bea0083b42e1dd67c60cbdfca2cac93c343e3a4edf132677c707aed62d85c43ae27edb2de74 SHA512 2b9f6b478880a9ec176018f34a3015f5e84ceb11e61519d9ab9f7df8d4b8dc664fa9103ca787664ffcd86909410fbf6812838a59d899f3487dea278e39eb597b
+DIST racket-6.12-src-builtpkgs.tgz 119736428 BLAKE2B ca462e69c29c33e56e8e92dfc88e18c0643e045a52d50b288139b2d439dac9e10c3a5d0226236a2e2103b9d0c74871b97c3edfb242b49822d92893acc9ea42d7 SHA512 31f3f9b3f69a80601569cfdeee1610a49a2931c2c11a9daf9ff14eb8828dc48cb0befd05fc1b0cc53cc1477a04841e850f2dc89614dff58dc8e9e5da7b717716
+DIST racket-6.7-src-builtpkgs.tgz 116773863 BLAKE2B 786552b296449cd105450450f7232ba5468aba0ed6d96aa6db058cc3eb655808f031259ee69d1ab8abb9a751151e28e923d4388860ed37d74a1f6a637f740f0f SHA512 63fdc18e72fa152434d0fb83e926c28d2b2d16c93a0a2be0c14d445671c1bff5daf500e9917e41fa2f60454377de0cc10d226c321402abf4bad55a15ac74f127
+DIST racket-minimal-6.11-src-builtpkgs.tgz 11208413 BLAKE2B 17e979ab6e4c99f781994d48ca90e206618835e2ecfa875d0966efe2909a440c509fe9706cccb7f377675a0bb4d76971ed4dd73de2c088ae40660df50b6cf7cc SHA512 f197a645e7da04c120f1cb61d98a1cd47824576467a2fa12753576b72f258d1229cc99243f91ed87cf37be63062c26844b44469987d7ac4bfeee853aa7cb6e66
+DIST racket-minimal-6.12-src-builtpkgs.tgz 11251582 BLAKE2B c8ed5c562241f37297e0e88d1c8d60ceaf35c2a7010ca68cccca8b8ee007819822149cbda4f3b5c0ec93093901593b2722a22b9f8e46a083b207022877ce45f5 SHA512 6eb23ec16c710c661171f545b8dc5a53666e8a16d1db7edf1a0713693c99b79a779c4d7c6765dc3107f699c31e29238ddbb3e08b1eb62832292af0d4a1b5f465
+DIST racket-minimal-6.7-src-builtpkgs.tgz 11213736 BLAKE2B 1661fe1818d0b2c0d2c058aead61e25c5df01201d3ccdb31fccca14e9c1f2f822c18bfad6be3c1b7446d692c252129b63340b37e0311848269a914197416eee9 SHA512 59c885b535ed8e91a3b2a524bbc38661a5c19848ded935cc9f068c3fd6c8da39fc0755ef8df3a69cce3d50b96ee30d91972d6a4f6d5414eefb80bdc1ede6a285
+EBUILD racket-6.11-r1.ebuild 2330 BLAKE2B 0d4a3e2b8951efd9b0ac721ad3e26f877eeb3ee1dd9782d97f6fb9926778130e989897f96654156a48c2043c487fcb871d893bf1c47be0ea4479193bee8e02a6 SHA512 bf9bde5de6c04e458a657abc34a347d8327099d7a6f054da3759afdea06c99adb7f6c52b206e2f172a3e0a4281bf798b7c755ef5b1ccfea1dd6aa5dd43b97bf5
+EBUILD racket-6.12-r1.ebuild 2330 BLAKE2B 0d4a3e2b8951efd9b0ac721ad3e26f877eeb3ee1dd9782d97f6fb9926778130e989897f96654156a48c2043c487fcb871d893bf1c47be0ea4479193bee8e02a6 SHA512 bf9bde5de6c04e458a657abc34a347d8327099d7a6f054da3759afdea06c99adb7f6c52b206e2f172a3e0a4281bf798b7c755ef5b1ccfea1dd6aa5dd43b97bf5
+EBUILD racket-6.7.ebuild 1845 BLAKE2B 950444100a4aae3fffc7980e85923b9fa6d672c0689c54f6151b5942d944eb41a83cdb8139bec52539551254fadd2e5653a4a6ac4100334e36be88ec0b0939d0 SHA512 d301c1021bd33fa3f55923e7d0fa073c0d1e2710b0921e59b56623b91104cdbf3e4082e790cce3a1aee845cc4c11791167fa28004183bdbc16319b9b506e56ca
+MISC metadata.xml 1575 BLAKE2B fe1e4b2308e5f676ce39f2b2f45c230e47f1fb690eaa57732cdb9a3e2dbfd11bfbec178d06655974eff966b165ce7643f8d1badf60e79ed3c97b64a338c2f6b6 SHA512 debfd31e91802544fce5a38936849b540aa2299d4a6a473fd55307ce4305b52bff0f99f6513ba5b343469a8740830f91879be4ee9e6086f63a00e2f3bc21cc64
diff --git a/dev-scheme/racket/metadata.xml b/dev-scheme/racket/metadata.xml
new file mode 100644
index 000000000000..69beced3af9c
--- /dev/null
+++ b/dev-scheme/racket/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription lang="en">
+==Grow your Program==
+Racket's interactive mode encourages experimentation, and quick scripts easily compose into larger systems. Small scripts and large systems both benefit from native-code JIT compilation. When a system gets too big to keep in your head, you can add static types.
+
+==Grow your Language==
+Extend Racket whenever you need to. Mold it to better suit your tasks without sacrificing interoperability with existing libraries and without having to modify the tool chain. When less is more, you can remove parts of a language or start over and build a new one.
+
+==Grow your Skills==
+Whether you're just starting out, want to know more about programming language applications or models, looking to expand your horizons, or ready to dive into research, Racket can help you become a better programmer and system builder.
+  </longdescription>
+  <use>
+    <flag name="futures"> 
+      Enable racket/future library for fine-grained hardware parallelism
+    </flag>
+    <flag name="places"> 
+      Enable racket/place library for share-nothing parallelism and message-passing communication. Compared to futures, places are heavyweight, but they have a simpler performance model.
+    </flag>
+    <flag name="threads"> 
+      Enable support for green threads 
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-scheme/racket/racket-6.11-r1.ebuild b/dev-scheme/racket/racket-6.11-r1.ebuild
new file mode 100644
index 000000000000..0ce238ca01ba
--- /dev/null
+++ b/dev-scheme/racket/racket-6.11-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc +futures +jit minimal +places +readline +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	virtual/libffi
+	virtual/jpeg:0
+	readline? ( dev-libs/libedit )
+	X? ( x11-libs/gtk+[X?] )"
+RDEPEND="${RDEPEND} !dev-tex/slatex"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	rm -r foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		pushd racket
+		emake cgc-core
+		pax-mark m .libs/racketcgc
+		pushd gc2
+		emake all
+		popd
+		pax-mark m .libs/racket3m
+		popd
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+	fi
+}
diff --git a/dev-scheme/racket/racket-6.12-r1.ebuild b/dev-scheme/racket/racket-6.12-r1.ebuild
new file mode 100644
index 000000000000..0ce238ca01ba
--- /dev/null
+++ b/dev-scheme/racket/racket-6.12-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="GPL-3+ LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc +futures +jit minimal +places +readline +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+RDEPEND="dev-db/sqlite:3
+	media-libs/libpng:0
+	x11-libs/cairo[X?]
+	x11-libs/pango[X?]
+	virtual/libffi
+	virtual/jpeg:0
+	readline? ( dev-libs/libedit )
+	X? ( x11-libs/gtk+[X?] )"
+RDEPEND="${RDEPEND} !dev-tex/slatex"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	rm -r foreign/libffi || die 'failed to remove bundled libffi'
+}
+
+src_configure() {
+	# According to vapier, we should use the bundled libtool
+	# such that we don't preclude cross-compile. Thus don't use
+	# --enable-lt=/usr/bin/libtool
+	econf \
+		--enable-shared \
+		--enable-float \
+		--enable-libffi \
+		--enable-foreign \
+		--disable-libs \
+		--disable-strip \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		$(use_enable jit) \
+		$(use_enable places) \
+		$(use_enable futures) \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		# When the JIT is enabled, a few binaries need to be pax-marked
+		# on hardened systems (bug 613634). The trick is to pax-mark
+		# them before they're used later in the build system. The
+		# following order for racketcgc and racket3m was determined by
+		# digging through the Makefile in src/racket to find out which
+		# targets would build those binaries but not use them.
+		pushd racket
+		emake cgc-core
+		pax-mark m .libs/racketcgc
+		pushd gc2
+		emake all
+		popd
+		pax-mark m .libs/racket3m
+		popd
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use jit; then
+		# The final binaries need to be pax-marked, too, if you want to
+		# actually use them. The src_compile marking get lost somewhere
+		# in the install process.
+		for f in mred mzscheme racket; do
+			pax-mark m "${D}/usr/bin/${f}"
+		done
+
+		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
+	fi
+}
diff --git a/dev-scheme/racket/racket-6.7.ebuild b/dev-scheme/racket/racket-6.7.ebuild
new file mode 100644
index 000000000000..1529a99d7a9b
--- /dev/null
+++ b/dev-scheme/racket/racket-6.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils pax-utils
+
+DESCRIPTION="General purpose, multi-paradigm programming language in the Lisp-Scheme family."
+HOMEPAGE="http://racket-lang.org/"
+SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="doc +futures +jit minimal +places +threads +X"
+REQUIRED_USE="futures? ( jit )"
+
+# see bug 426316: racket/draw (which depends on cairo) is sometimes used in compile-time code or when rendering documentation
+RDEPEND="dev-db/sqlite:3
+	x11-libs/cairo[X?]
+	virtual/libffi"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	default
+	#remove bundled libraries
+	rm -rf foreign/libffi/ || die "Bundled libraries libffi was not removed"
+}
+
+src_configure() {
+# according to vapier, we should use the bundled libtool
+# such that we don't preclude cross-compile. Thus don't use
+# --enable-lt=/usr/bin/libtool
+	econf \
+		$(use_enable X gracket) \
+		$(use_enable doc docs) \
+		--enable-shared \
+		$(use_enable jit) \
+		--enable-foreign \
+		$(use_enable places) \
+		$(use_enable futures) \
+		--enable-float \
+		--enable-libffi \
+		$(use_enable threads pthread)
+}
+
+src_compile() {
+	if use jit; then
+		pushd racket
+		emake cgc
+		pax-mark m .libs/racketcgc
+		emake 3m
+		pax-mark m .libs/racket3m
+		popd
+	fi
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if ! use minimal; then
+		#racket now comes with desktop files, but DESTDIR is mishandled
+		for f in /usr/share/applications/{drracket,slideshow}.desktop; do
+			sed -e "s|${D}||g" \
+				-i "${D}/${f}" || die "Failed to patch '${f}'"
+		done
+	fi
+}
diff --git a/dev-scheme/scheme48-1.9.2-r1 b/dev-scheme/scheme48-1.9.2-r1
deleted file mode 100644
index d5ff238cee84..000000000000
--- a/dev-scheme/scheme48-1.9.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=emacs? ( virtual/emacs )
-DESCRIPTION=Scheme48 is an implementation of the Scheme Programming Language
-EAPI=5
-HOMEPAGE=http://www.s48.org/
-IUSE=doc emacs
-KEYWORDS=~x86 ~amd64 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://www.s48.org/1.9.2/scheme48-1.9.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5c43c7c32b5815d97c58b6bbb38b414
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
new file mode 100644
index 000000000000..37ecc64a0dc8
--- /dev/null
+++ b/dev-scheme/scheme48/Manifest
@@ -0,0 +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 1458 BLAKE2B 136003e6158c422b1acd10ddb4a3b78f392991f3d1a370beb390b132b96a7d8c8f4dc12b35dc1cea0957bd83d4ff93dd58c2a7a06c6481cb7c1b5f3b2df75245 SHA512 28998c63133fd2e757ee3652bb06bcc2b34d36756aa6de9b7567688b48606b931373b079768e2c19c570d4b8b4c9fd8d4052ae72da54a59a14a4ad919a2abdf0
+MISC metadata.xml 535 BLAKE2B 5e924b66834d42091699b6ce8335b205e1ffcb66c794a2173ab3793393514cd2061482e5e6190ad7bbf74e364db78a5657d556749560ebcadda91b5efa98c966 SHA512 b7fc727061a594f67a9ff8ec36dd64150cebf6813b1438fb5173b7679ce65bda92ba5ea9501816cfed738797b012f198da27622a1fb038800181dd16c2d50917
diff --git a/dev-scheme/scheme48/files/50scheme48-gentoo.el b/dev-scheme/scheme48/files/50scheme48-gentoo.el
new file mode 100644
index 000000000000..fe378e6a7081
--- /dev/null
+++ b/dev-scheme/scheme48/files/50scheme48-gentoo.el
@@ -0,0 +1,10 @@
+;;; scheme48 site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(setq scheme-program-name "scheme48")
+(autoload 'run-scheme
+	  "cmuscheme48"
+	  "Run an inferior Scheme process."
+	  t)
+
diff --git a/dev-scheme/scheme48/files/CVE-2014-4150.patch b/dev-scheme/scheme48/files/CVE-2014-4150.patch
new file mode 100644
index 000000000000..9457fbe7b3c0
--- /dev/null
+++ b/dev-scheme/scheme48/files/CVE-2014-4150.patch
@@ -0,0 +1,11 @@
+--- a/emacs/cmuscheme48.el	2012-12-28 01:43:30.000000000 +0900
++++ b/emacs/cmuscheme48.el	2016-07-05 20:06:19.200173816 +0900
+@@ -58,7 +58,7 @@
+    (let ((end (point)))
+      (beginning-of-defun)
+      (if losep
+-	 (let ((loser "/tmp/s48lose.tmp"))
++	 (let ((loser (make-temp-file "s48lose")))
+ 	   (write-region (point) end loser)
+ 	   (scheme48-load-file loser))
+ 	 (scheme48-send-region (point) end)))))
diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
new file mode 100644
index 000000000000..afd07b1fd150
--- /dev/null
+++ b/dev-scheme/scheme48/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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>
+</pkgmetadata>
diff --git a/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..fb3e5b00945b
--- /dev/null
+++ b/dev-scheme/scheme48/scheme48-1.9.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit elisp-common multilib eutils flag-o-matic
+
+DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language"
+HOMEPAGE="http://www.s48.org/"
+SRC_URI="http://www.s48.org/${PV}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc emacs"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+SITEFILE=50scheme48-gentoo.el
+
+src_prepare() {
+	epatch "${FILESDIR}"/CVE-2014-4150.patch
+}
+
+src_configure() {
+	append-cflags -fno-strict-aliasing
+	econf --docdir=/usr/share/doc/${P}
+}
+
+src_compile() {
+	emake
+	if use emacs; then
+		elisp-compile "${S}"/emacs/cmuscheme48.el
+	fi
+}
+
+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
+	else
+		pushd "${ED}/usr/share/doc/${P}" > /dev/null
+		rm -f *.html *.css *.gif
+		rm -f manu*
+		popd > /dev/null
+	fi
+
+	#this symlink clashes with gambit
+	rm "${ED}"/usr/bin/scheme-r5rs || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-scheme/scm-5.5.6-r3 b/dev-scheme/scm-5.5.6-r3
deleted file mode 100644
index fb70bea6fb8d..000000000000
--- a/dev-scheme/scm-5.5.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst test
-DEPEND=app-arch/unzip >=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
-DESCRIPTION=SCM is a Scheme implementation from the author of slib
-EAPI=6
-HOMEPAGE=http://swiss.csail.mit.edu/~jaffer/SCM
-IUSE=arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-macos
-LICENSE=LGPL-3
-RDEPEND=app-arch/unzip >=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
-SLOT=0
-SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f9a1d1aa1474444482036afaa2f1d5c
diff --git a/dev-scheme/scm-5.5.6-r4 b/dev-scheme/scm-5.5.6-r4
deleted file mode 100644
index 27ed812c7c41..000000000000
--- a/dev-scheme/scm-5.5.6-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile config install postinst test
-DEPEND=>=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
-DESCRIPTION=SCM is a Scheme implementation from the author of slib
-EAPI=7
-HOMEPAGE=http://swiss.csail.mit.edu/~jaffer/SCM
-IUSE=arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
-LICENSE=LGPL-3
-RDEPEND=>=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
-SLOT=0
-SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
-_md5_=a531c126620062194af7bbb59d80a9be
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
new file mode 100644
index 000000000000..2c44df92cae7
--- /dev/null
+++ b/dev-scheme/scm/Manifest
@@ -0,0 +1,6 @@
+AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0d8e697366f71910a4a728a8ad937c75db310cefdb96144a1af9334edd2da9fc5c720530c6cb0f741e310ee06277e6c1 SHA512 e746ebca91e26569354f09403cf1610c745281af3477d92587a8b52de704998a61d1aeac75bfadfed8aead84243aa01f626438399cfffe92c73bba9fa9564f22
+AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
+DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
+EBUILD scm-5.5.6-r3.ebuild 3762 BLAKE2B 72bf6fea02e74443e8f449c193168c1db95db448f7702ff06b708c58fc0a3573afa47d29b1e46b6358d0ceb3a0879da0c181adf3a71b56442bd26ee40eaa46c8 SHA512 cc7b0a0e2e185a967bc0fb5a771f7344345f0b24fb6bc9df51971e043f0f717b49a93697ab0ab1018da341a42b2e44647b513b6aad91aaa6c77c310b8c6b159d
+EBUILD scm-5.5.6-r4.ebuild 3730 BLAKE2B 14768043556305926bdc25a5c446f8879e7ff51a9c9b2be5c6a1c9e8fadaa5de9c94daedfaa2810b8b1494f2bb771de5746b314f55c72bacc2a7e9544624eaf5 SHA512 d08819bf9939023757edd314dd486ed40c287cb5cceb3a38c8f994a0b97f2ae7373b56e77b6a742230652f768cd85a652147f9983ec9eb61fe424c49f764a7fe
+MISC metadata.xml 1636 BLAKE2B ad72069e26e5a229c33efa845450fe5991d4c6bb14c39ccf22ba1a2d7903b969354a244a09e6684af4f588b2196e12aa60d658a5f842b5b127396a250377b2b0 SHA512 f0936782a77db52a61d47c86f9d638c66ac9848e8b62fcef182b5346abd55e83a5f275b6a60c865551dd134dcb85a77906d4662f91ed505d167608f8901dc0d0
diff --git a/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch b/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch
new file mode 100644
index 000000000000..8636c47c7185
--- /dev/null
+++ b/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch
@@ -0,0 +1,81 @@
+diff -Naur scm.old//build.scm scm//build.scm
+--- scm.old//build.scm	2009-08-03 15:35:57.000000000 -0300
++++ scm//build.scm	2010-04-16 15:52:25.000000000 -0300
+@@ -540,7 +540,7 @@
+      (graphics *unknown* "-I/usr/X11/include -DX11" "-lX11"
+ 	       "/usr/X11/lib/libX11.sa" () ())
+      (editline *unknown* "" "-lreadline" "/usr/lib/libreadline.a" () ())
+-     (termcap *unknown* "" "-ltermcap" "/usr/lib/libtermcap.a" () ())
++     (termcap *unknown* "" "-lncurses" "/usr/lib/libncurses.a" () ())
+      (debug *unknown* "-g" "-g" #f () ())
+      (socket *unknown* "" "" #f () ())
+      (lib *unknown* "" "" #f () ("scmmain.c"))
+diff -Naur scm.old//Makefile scm//Makefile
+--- scm.old//Makefile	2009-08-03 15:38:21.000000000 -0300
++++ scm//Makefile	2010-04-16 15:51:11.000000000 -0300
+@@ -178,18 +178,9 @@
+ 	$(BUILD) -f udscm4.opt -o udscm4 -s $(IMPLPATH)
+ 	-rm $(ofiles) scmmain.o
+ dscm4:	udscm4 $(ifiles) require.scm
+-	if [ -f /proc/sys/kernel/randomize_va_space -a\
+-	     "`cat /proc/sys/kernel/randomize_va_space`" != "0" ]; then {\
+-	   cat /proc/sys/kernel/randomize_va_space > randomize_va_space.tmp;\
+-	   echo 0 > /proc/sys/kernel/randomize_va_space;\
+-	} fi
+ 	-rm -f slibcat implcat scm~
+ 	-mv scm scm~
+ 	echo "(quit)" | $(SETARCH) ./udscm4 -no-init-file -o scm
+-	if [ -f randomize_va_space.tmp ]; then {\
+-	   cat randomize_va_space.tmp > /proc/sys/kernel/randomize_va_space;\
+-	   rm randomize_va_space.tmp;\
+-	} fi
+ 
+ # dumpable R5RS interpreter
+ udscm5.opt:
+@@ -199,20 +190,10 @@
+ udscm5:	$(cfiles) $(ufiles) $(hfiles) build.scm build udscm5.opt
+ 	$(BUILD) -f udscm5.opt -o udscm5 -s $(IMPLPATH)
+ 	-rm $(ofiles) scmmain.o
+-	strip udscm5
+ dscm5:	udscm5 $(ifiles) require.scm
+-	if [ -f /proc/sys/kernel/randomize_va_space -a\
+-	     "`cat /proc/sys/kernel/randomize_va_space`" != "0" ]; then {\
+-	   cat /proc/sys/kernel/randomize_va_space > randomize_va_space.tmp;\
+-	   echo 0 > /proc/sys/kernel/randomize_va_space;\
+-	} fi
+ 	-rm -f slibcat implcat scm~
+ 	-mv scm scm~
+ 	echo "(quit)" | $(SETARCH) ./udscm5 -no-init-file -r5 -o scm
+-	if [ -f randomize_va_space.tmp ]; then {\
+-	   cat randomize_va_space.tmp > /proc/sys/kernel/randomize_va_space;\
+-	   rm randomize_va_space.tmp;\
+-	} fi
+ 	$(MAKE) check
+ 	$(MAKE) checkmacro
+ 
+@@ -394,7 +375,7 @@
+ PREVDOCS = prevdocs/
+ html:	$(htmldir)scm_toc.html $(htmldir)Xlibscm_toc.html $(htmldir)hobbit_toc.html
+ 
+-TEXI2HTML = /usr/local/bin/texi2html -split -verbose
++TEXI2HTML = /usr/bin/texi2html -split -verbose
+ 
+ $(htmldir)scm_toc.html:	Makefile $(texifiles)
+ 	${TEXI2HTML} scm.texi
+@@ -431,7 +412,7 @@
+ 
+ rpm_prefix=$(HOME)/rpmbuild/
+ 
+-prefix = /usr/local/
++prefix = /usr/
+ exec_prefix = $(prefix)
+ # directory where `make install' will put executable.
+ bindir = $(exec_prefix)bin/
+@@ -498,7 +479,6 @@
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	mkdir -p $(DESTDIR)$(man1dir)
+ 	-cp scm scmlit $(DESTDIR)$(bindir)
+-	-strip $(DESTDIR)$(bindir)scmlit
+ 	-cp scm.1 $(DESTDIR)$(man1dir)
+ 	mkdir -p $(DESTDIR)$(libscmdir)
+ 	test -f $(DESTDIR)$(libscmdir)require.scm || \
diff --git a/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch b/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch
new file mode 100644
index 000000000000..a78e7ddb5d75
--- /dev/null
+++ b/dev-scheme/scm/files/scm-5.5.6-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -ur b/Makefile a/Makefile
+--- b/Makefile	2018-06-21 14:02:53.439716620 -0500
++++ a/Makefile	2018-06-21 14:03:33.900568504 -0500
+@@ -111,7 +111,7 @@
+ 
+ # SCMLIT -- try making this first!
+ scmlit:	$(ofiles) scmmain.o require.scm Makefile
+-	$(LD) -o scmlit $(ofiles) scmmain.o $(LIBS)
++	$(LD) $(LDFLAGS) -o scmlit $(ofiles) scmmain.o $(LIBS)
+ 	$(MAKE) checklit
+ scmflags.h:	scmflags
+ scmflags:
+\ No newline at end of file
diff --git a/dev-scheme/scm/metadata.xml b/dev-scheme/scm/metadata.xml
new file mode 100644
index 000000000000..04609e08685d
--- /dev/null
+++ b/dev-scheme/scm/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+SCM is a  Scheme implementation conforming to  Revised5 Report on the Algorithmic Language Scheme and the IEEE P1178 specification.
+	</longdescription>
+	<use>
+		<flag name="arrays">Support for  arrays, uniform-arrays and
+			uniform-vectors.</flag>
+		<flag name="bignums">Support for large precision integers.</flag>
+		<flag name="cautious">SCM will always check the number of arguments to
+			interpreted closures.</flag>
+		<flag name="dynamic-linking">Be able to load compiled files while
+			running.</flag>
+		<flag name="engineering-notation">Floats to display in engineering
+			notation (exponents always multiples of 3) instead of scientific
+			notation.</flag>
+		<flag name="gsubr">generalized c arguments: for arbitrary 
+			(more then 11) arguments to C functions.</flag>
+		<flag name="inexact">Support for floating point numbers.</flag>
+		<flag name="ioext">Commonly available I/O extensions: line I/O, file
+			positioning, file delete and rename, and directory functions.</flag>
+		<flag name="libscm">Build and install libscm.a and related headers</flag>
+		<flag name="macro">C level support for hygienic and referentially 
+			transparent macros (syntax-rules macros).</flag>
+		<flag name="regex">String regular expression matching.</flag>
+		<flag name="unix">Support for: nice, acct, lstat, readlink, symlink,
+			mknod and sync.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-scheme/scm/scm-5.5.6-r3.ebuild b/dev-scheme/scm/scm-5.5.6-r3.ebuild
new file mode 100644
index 000000000000..8f89c5848c1a
--- /dev/null
+++ b/dev-scheme/scm/scm-5.5.6-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator eutils flag-o-matic
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="SCM is a Scheme implementation from the author of slib"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
+HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-macos"
+IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
+
+#unzip for unpacking
+DEPEND="app-arch/unzip
+	>=dev-scheme/slib-3.1.5
+	dev-util/cproto
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/libtermcap-compat )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch" )
+
+src_compile() {
+	# SLIB is required to build SCM.
+	local slibpath="${EPREFIX}/usr/share/slib/"
+	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
+		einfo "using SLIB $SCHEME_LIBRARY_PATH"
+	elif [ -d ${slibpath} ]; then
+		export SCHEME_LIBRARY_PATH=${slibpath}
+	fi
+
+	einfo "Making scmlit"
+	emake -j1 scmlit clean
+
+	einfo "Building scm"
+	local features=""
+	use arrays && features+="arrays"
+	use bignums && features+=" bignums"
+	use cautious && features+=" cautious"
+	use engineering-notation && features+=" engineering-notation"
+	use inexact && features+=" inexact"
+	use macro && features+=" macro"
+
+	( use readline ||
+	  use ncurses ||
+	  use regex ||
+	  use posix ||
+	  use ioext ||
+	  use gsubr ||
+	  use sockets ||
+	  use unix ||
+	  use dynamic-linking ) && features+=" dynamic-linking"
+
+	./build \
+		--compiler-options="${CFLAGS}" \
+		--linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \
+		-s "${EPREFIX}"/usr/$(get_libdir)/scm \
+		-F ${features:="none"} \
+		-h system \
+		-o scm || die
+
+	einfo "Building DLLs"
+	if use readline; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-h system \
+			-F edit-line \
+			-t dll || die
+	fi
+	if use ncurses ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-F curses \
+			-h system \
+			-t dll || die
+	fi
+	if use regex ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c rgx.c \
+			-h system \
+			-t dll || die
+	fi
+	if use gsubr ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c gsubr.c \
+			-h system \
+			-t dll || die
+	fi
+	if use ioext ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c ioext.c \
+			-h system \
+			-t dll || die
+	fi
+	if use posix; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c posix.c \
+			-h system \
+			-t dll || die
+	fi
+	if use sockets ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c socket.c \
+			-h system \
+			-t dll || die
+	fi
+	if use unix ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c unix.c \
+			-h system \
+			-t dll || die
+	fi
+
+	if use libscm ; then
+		emake libscm.a
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" man1dir="${EPREFIX}"/usr/share/man/man1/ \
+		install
+
+	if use libscm; then
+		emake DESTDIR="${D}" libdir="${EPREFIX}"/usr/$(get_libdir)/ \
+			installlib
+	fi
+
+	doinfo scm.info
+	doinfo hobbit.info
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && pkg_config
+}
+
+pkg_config() {
+	einfo "Regenerating catalog..."
+	scm -e "(require 'new-catalog)"
+}
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
new file mode 100644
index 000000000000..6496a36b4f9e
--- /dev/null
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(ver_cut 1)${trarr:$(ver_cut 2):1}$(ver_cut 3)"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="SCM is a Scheme implementation from the author of slib"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
+HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=dev-scheme/slib-3.1.5
+	dev-util/cproto
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/libtermcap-compat )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch"
+	"${FILESDIR}/${P}-respect-ldflags.patch" )
+
+src_compile() {
+	# SLIB is required to build SCM.
+	local slibpath="${EPREFIX}/usr/share/slib/"
+	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
+		einfo "using SLIB $SCHEME_LIBRARY_PATH"
+	elif [ -d ${slibpath} ]; then
+		export SCHEME_LIBRARY_PATH=${slibpath}
+	fi
+
+	einfo "Making scmlit"
+	emake -j1 scmlit clean
+
+	einfo "Building scm"
+	local features=""
+	use arrays && features+="arrays"
+	use bignums && features+=" bignums"
+	use cautious && features+=" cautious"
+	use engineering-notation && features+=" engineering-notation"
+	use inexact && features+=" inexact"
+	use macro && features+=" macro"
+
+	( use readline ||
+	  use ncurses ||
+	  use regex ||
+	  use posix ||
+	  use ioext ||
+	  use gsubr ||
+	  use sockets ||
+	  use unix ||
+	  use dynamic-linking ) && features+=" dynamic-linking"
+
+	./build \
+		--compiler-options="${CFLAGS}" \
+		--linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \
+		-s "${EPREFIX}"/usr/$(get_libdir)/scm \
+		-F ${features:="none"} \
+		-h system \
+		-o scm || die
+
+	einfo "Building DLLs"
+	if use readline; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-h system \
+			-F edit-line \
+			-t dll || die
+	fi
+	if use ncurses ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-F curses \
+			-h system \
+			-t dll || die
+	fi
+	if use regex ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c rgx.c \
+			-h system \
+			-t dll || die
+	fi
+	if use gsubr ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c gsubr.c \
+			-h system \
+			-t dll || die
+	fi
+	if use ioext ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c ioext.c \
+			-h system \
+			-t dll || die
+	fi
+	if use posix; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c posix.c \
+			-h system \
+			-t dll || die
+	fi
+	if use sockets ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c socket.c \
+			-h system \
+			-t dll || die
+	fi
+	if use unix ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c unix.c \
+			-h system \
+			-t dll || die
+	fi
+
+	if use libscm ; then
+		emake libscm.a
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" man1dir="${EPREFIX}"/usr/share/man/man1/ \
+		install
+
+	if use libscm; then
+		emake DESTDIR="${D}" libdir="${EPREFIX}"/usr/$(get_libdir)/ \
+			installlib
+	fi
+
+	doinfo scm.info
+	doinfo hobbit.info
+}
+
+regen_catalog() {
+	einfo "Regenerating catalog..."
+	scm -e "(require 'new-catalog)"
+}
+
+pkg_postinst() {
+	[[ -z ${ROOT%/} ]] && regen_catalog
+}
+
+pkg_config() {
+	regen_catalog
+}
diff --git a/dev-scheme/scmxlate-20090410-r1 b/dev-scheme/scmxlate-20090410-r1
deleted file mode 100644
index 83e0704ca8fd..000000000000
--- a/dev-scheme/scmxlate-20090410-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Scmxlate is a configuration tool for software packages written in Scheme
-EAPI=6
-HOMEPAGE=http://www.ccs.neu.edu/home/dorai/scmxlate/scmxlate.html
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://evalwhen.com/scmxlate/scmxlate.tar.bz2 -> scmxlate-20090410.tar.bz2
-_md5_=726267dbe54f7c87887083640afe4f4f
diff --git a/dev-scheme/scmxlate/Manifest b/dev-scheme/scmxlate/Manifest
new file mode 100644
index 000000000000..aaaeb87c6b19
--- /dev/null
+++ b/dev-scheme/scmxlate/Manifest
@@ -0,0 +1,3 @@
+DIST scmxlate-20090410.tar.bz2 30016 BLAKE2B 7a23e32140572b23e6e213a38450bc50ce6dd99ea58e4bfb3c775524de61a7325fa6171c6aaa2dfc1c232fa2b352fa7ebd8cbcce6a417cc5169313e7efab028d SHA512 c6148a1c928ff326c5ac5442a0843a334645d76bb17a48d32018807a2dfa2a4147acfaf43866996d4b06fbe0e6723280da7e66576a3c7c18d70f8e75c73954af
+EBUILD scmxlate-20090410-r1.ebuild 580 BLAKE2B 8dd88147b6f9ee7b372179bbf05bac255b522888f526840408d3ed2de7f24edfe26ae41f2f9c285d54dde125b0bbc9ea845b8346cc2197e6a952209adf4216b2 SHA512 8324f8eef59ebd7dc048a001d1a752f3c41a69fd8a6eba9978f7f884e3d11858c9964e6cd2d40480666a9830c6627e628232d79adc96a99eab5ce10af91fc5ec
+MISC metadata.xml 753 BLAKE2B 12f2361f80e0f1b729e212db800e56961453ef72d7c0c8a2c594760eb1ea43ff3e304bdc6bbb1e8d66a34a88ed26b9a72b31f0e942e19f7d00944d40d39ef54a SHA512 962ae334810dc4891638dbf00f43fe20e4e548045657de93bfe30cecfe57ead9019d04f849f8163398ee288937e46709106e23826e48feb80a4d9c263fe6cb9e
diff --git a/dev-scheme/scmxlate/metadata.xml b/dev-scheme/scmxlate/metadata.xml
new file mode 100644
index 000000000000..71f54d2527aa
--- /dev/null
+++ b/dev-scheme/scmxlate/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+Scmxlate is a configuration tool for software packages written in Scheme.
+Scmxlate provides the package author with a strategy for programmatically specifying the changes required to translate the package for a variety of Scheme dialects and Common Lisp, and a variety of operating systems. The end-user simply loads one file into their Scheme or Common Lisp, which triggers the entire configuration process with little or no further intervention. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/scmxlate/scmxlate-20090410-r1.ebuild b/dev-scheme/scmxlate/scmxlate-20090410-r1.ebuild
new file mode 100644
index 000000000000..ed7e4e6d24c3
--- /dev/null
+++ b/dev-scheme/scmxlate/scmxlate-20090410-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Scmxlate is a configuration tool for software packages written in Scheme"
+HOMEPAGE="http://www.ccs.neu.edu/home/dorai/scmxlate/scmxlate.html"
+SRC_URI="http://evalwhen.com/scmxlate/scmxlate.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="freedist" # license doesn't grant the right for modifications
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_compile() { true; }
+
+src_install() {
+	insinto /usr/share/${PN}/
+	doins *.cl *.scm
+	dodoc README
+}
diff --git a/dev-scheme/sigscheme-0.8.5-r1 b/dev-scheme/sigscheme-0.8.5-r1
deleted file mode 100644
index 4d8f49d4f882..000000000000
--- a/dev-scheme/sigscheme-0.8.5-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=SigScheme is an R5RS Scheme interpreter for embedded use
-EAPI=6
-HOMEPAGE=https://code.google.com/p/sigscheme/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://sigscheme.googlecode.com/files/sigscheme-0.8.5.tar.bz2
-_md5_=7076696d14cd907e728ff9fad67247b3
diff --git a/dev-scheme/sigscheme/Manifest b/dev-scheme/sigscheme/Manifest
new file mode 100644
index 000000000000..6555249af3b6
--- /dev/null
+++ b/dev-scheme/sigscheme/Manifest
@@ -0,0 +1,3 @@
+DIST sigscheme-0.8.5.tar.bz2 1117490 BLAKE2B b7757151d0a9f37c5a717e3e6114560706be834eec1306f5bd0da28dcfd6d68d4f7f7869545fc299dd1972555591eeb3885e1ffec2f11f9d2b2e9b1c01d9ae9f SHA512 88cb9aec0ddd71a6cb6ad70fbd0554285538d17f2d9c888914101a1e5e16ad4ab65dc30c2b6f25d450af903e408bc903c516cc397d9f2242979cd20607686313
+EBUILD sigscheme-0.8.5-r1.ebuild 400 BLAKE2B 542ba26943124a0f7c048f09c6745deecdfbccaed2eca52d326112d1341aa8c4b67a25bed5e0fa51456b9d9176246d60369e48c3f693ef1239589a688f7037e2 SHA512 f0af1608ede941b43cbdb4dc4b5165d3b81f6f31338b278850985e184ba497a8f5204a822d8515eb212549088f03c25d53d0aa450a655247b9bee945ca2802ae
+MISC metadata.xml 729 BLAKE2B 6006883a89dcb6afe351a2658a0cdb2f3753fb5cf87b36104ccbee298d944ad3856f4d92c01fc9411d250c2c33c6c84ba7f397e71b2a7ea7ac8a78621ded32b1 SHA512 e31ba55c22696074c4f1f9a86d9811220aba54704e5ebae30f51ad54f30c958890f84a7ea335354af18a257c92ae7547e609f744b4270d7d7c52f065777216a0
diff --git a/dev-scheme/sigscheme/metadata.xml b/dev-scheme/sigscheme/metadata.xml
new file mode 100644
index 000000000000..9b93c167db39
--- /dev/null
+++ b/dev-scheme/sigscheme/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>SigScheme is a R5RS Scheme interpreter for embedded use. 
+		It features small footprint (64KB in library form on the 
+		'small' configuration) like SIOD and TinyScheme, low memory 
+		consumption (2-words per cons cell), multibyte characters 
+		handling (UTF-8, EUCs and Shift_JIS) and more. 
+		It is mainly developed to replace the Scheme interpreter of uim.</longdescription>
+	<upstream>
+		<remote-id type="google-code">sigscheme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..cbed33d141c5
--- /dev/null
+++ b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
+HOMEPAGE="https://code.google.com/p/sigscheme/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf --enable-hygienic-macro
+}
diff --git a/dev-scheme/slib-3.2.5-r1 b/dev-scheme/slib-3.2.5-r1
deleted file mode 100644
index a27b9624b690..000000000000
--- a/dev-scheme/slib-3.2.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm )
-DESCRIPTION=Portable Scheme library for all standard Scheme implementations
-EAPI=6
-HOMEPAGE=http://people.csail.mit.edu/jaffer/SLIB
-IUSE=gambit scm
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain BSD
-RDEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/gambit ) scm? ( dev-scheme/scm )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://swiss.csail.mit.edu/ftpdir/scm/slib-3b5.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4896158dbe6060f0133a972dfdee7bc1
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
new file mode 100644
index 000000000000..381389b0ead3
--- /dev/null
+++ b/dev-scheme/slib/Manifest
@@ -0,0 +1,6 @@
+AUX 50slib 39 BLAKE2B a7e221f173cfc2b24c72f047130e6b4c289533a22dc7d59fca49a147ed5c9290935f852e8425ac95942da2e8f135713dbd999d6e96521e35c9bce9cf8b6458d2 SHA512 e454fbcd8e4516b363a94055a0dde09f3cd5fa61babb0c6510ba6dcb50ddc123bb89ec8657171cc1d05fa5ebf5a1691b9425d3397c88617c9d2288770ff8a29b
+AUX slib-3.2.5-fix-makefile-guile.patch 882 BLAKE2B 6e9c80b476cafa24477aae5b30e8c35f116cfbd0261f06b15672e39cc94e2ef6cb116104a41e5c0f1ebcb887664d9f43ec6c5b21ab3286d5a33c56d081ca9a4b SHA512 74997578edd5472f084a3b899c4e11b67432a4776bce6a19cbd4300316bf413f38374711a9a5cd3c10cd6cac01cb6d337d6f2ad18236bc4747c0bccf88948e3a
+AUX slib-3.2.5-fix-paths.patch 1627 BLAKE2B bea0c823ca1f4e006953128cb5fe2886f5e84efbcf2d1ee32c801524d3bbbaf65899853c476697b501673501b112e7bd9382f7e372d27745cd190d3fa66a0bd4 SHA512 bdd667f20ca0ef57707a4df379186b58ef5ffab38e61a7e8e4ef697d7a90ebbafa8e4ca1f887d87520290656f2445fe1a9f4bd4e22634587908f70059dde0f30
+DIST slib-3b5.tar.gz 987735 BLAKE2B ad1e6e43885a16277d01f37582db7de068f21da5e10b23e034f5487ac8748303dcc9c12615884ee047dce7c246203f1d0d1cc375794371eae6854199d720c209 SHA512 e5d1210b70cd882cd5e810b3c4102d6060ec82fb2093f472bf31b597f6273e0a02f4d35a82c4b5c8cdc3f8b2c7b9e498fa3e35c7f265fa864cd9dc50e7a874c8
+EBUILD slib-3.2.5-r1.ebuild 2768 BLAKE2B 1a07e6c9e5fe579ca7a1df0914a06612e89e86559e99d484428fa7faa9ba6584a5f1d4ee09a9c504adcb08cb6ff7302f68f8bf019625a826d26e535cc4857103 SHA512 35f5d974cb1f99875f837d432f8fd8dba2061d3b993152275015251d49e1f6c181a2d11a9b81c9af07d561ab7a2138231ec7a3a04a5d2c34c8ef639ee3212e6d
+MISC metadata.xml 580 BLAKE2B 64dcf4957037aed50b50ea0648103f9b9f2cc040736751a1bf584464855fed650efe1d3e437ef122356e3f83f7c9b528ddea493193aebe49dc285a7066281d69 SHA512 5b75cfc410ff0ec6a324590f69001ac38410e963df6490695abb85132168cd37ccf685b9281026eea2fc82e59340fccecde58887aa3b64f88003970b979d5807
diff --git a/dev-scheme/slib/files/50slib b/dev-scheme/slib/files/50slib
new file mode 100644
index 000000000000..072862ed0b83
--- /dev/null
+++ b/dev-scheme/slib/files/50slib
@@ -0,0 +1 @@
+SCHEME_LIBRARY_PATH="/usr/share/slib/"
diff --git a/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch b/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch
new file mode 100644
index 000000000000..4617b4e780cb
--- /dev/null
+++ b/dev-scheme/slib/files/slib-3.2.5-fix-makefile-guile.patch
@@ -0,0 +1,23 @@
+--- slib-3b5/~Makefile	2016-10-10 23:54:01.461733550 +0200
++++ slib-3b5/Makefile	2016-10-10 23:59:33.806035867 +0200
+@@ -13,9 +13,9 @@ SHELL = /bin/sh
+ INSTALL = install
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+-INSTALL_INFO = ginstall-info
++INSTALL_INFO = install-info
+ 
+-SCHEME = scm
++SCHEME = guile
+ CHPAT = $(HOME)/bin/chpat
+ MAKEDEV = $(MAKE) -f $(HOME)/makefile.dev
+ TEXI2HTML = /usr/local/bin/texi2html -split -verbose
+@@ -183,7 +183,7 @@ slib.html: slib.texi
+ 	$(MAKEINFO) --html --no-split --no-warn --force $<
+ 
+ slib-$(VERSION).info: slib.texi version.txi $(txifiles) $(texifiles)
+-	$(MAKEINFO) $< --no-warn --no-split -o slib-$(VERSION).info
++	$(MAKEINFO) $< --no-warn --no-split --force -o slib-$(VERSION).info
+ slib.info: slib-$(VERSION).info
+ 	if [ -f $(prevdocsdir)slib.info ];\
+ 	  then infobar $(prevdocsdir)slib.info slib-$(VERSION).info \
diff --git a/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch b/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch
new file mode 100644
index 000000000000..9a373c14d733
--- /dev/null
+++ b/dev-scheme/slib/files/slib-3.2.5-fix-paths.patch
@@ -0,0 +1,42 @@
+--- slib-3b5/~RScheme.init	2016-10-10 23:05:39.117046443 +0200
++++ slib-3b5/RScheme.init	2016-10-10 23:06:47.242857550 +0200
+@@ -52,7 +52,7 @@
+ 	  ;; Use this path if your scheme does not support GETENV
+ 	  ;; or if SCHEME_LIBRARY_PATH is not set.
+ 	  (case (software-type)
+-	    ((unix) "/usr/lib/slib/")
++	    ((unix) "/usr/share/slib/")
+ 	    ((vms) "lib$scheme:")
+ 	    ((ms-dos) "C:\\SLIB\\")
+ 	    (else "")))))
+--- slib-3b5/~gambit.init	2016-10-10 23:05:20.939634454 +0200
++++ slib-3b5/gambit.init	2016-10-10 23:07:46.571968697 +0200
+@@ -38,7 +38,7 @@
+   (let ((impl-path
+ 	 (or (getenv "GAMBIT_IMPLEMENTATION_PATH")
+ 	     (case (software-type)
+-	       ((unix) "/usr/local/share/gambc/")
++	       ((unix) "/usr/share/gambc/")
+ 	       ((vms) "scheme$src:")
+ 	       ((ms-dos) "C:\\scheme\\")
+ 	       ((windows) "c:/scheme/")
+@@ -65,7 +65,7 @@
+ 	  ;; Use this path if your scheme does not support GETENV
+ 	  ;; or if SCHEME_LIBRARY_PATH is not set.
+ 	  (case (software-type)
+-	    ((unix) "/usr/local/lib/slib/")
++	    ((unix) "/usr/share/slib/")
+ 	    ((macos) (string-append (implementation-vicinity) "slib:"))
+ 	    ((amiga) "dh0:scm/Library/")
+ 	    ((vms) "lib$scheme:")
+--- slib-3b5/~guile-2.init	2016-10-10 23:05:46.531807087 +0200
++++ slib-3b5/guile-2.init	2016-10-10 23:08:00.154538349 +0200
+@@ -199,7 +199,7 @@
+ (define implementation-vicinity
+   (cond ((getenv "GUILE_IMPLEMENTATION_PATH")
+ 	 => (lambda (path) (lambda () path)))
+-	(else %site-dir)))
++	(else %library-dir)))
+
+ ;;; (library-vicinity) should be defined to be the pathname of the
+ ;;; directory where files of Scheme library functions reside.
diff --git a/dev-scheme/slib/metadata.xml b/dev-scheme/slib/metadata.xml
new file mode 100644
index 000000000000..def1d63fae27
--- /dev/null
+++ b/dev-scheme/slib/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+SLIB is a portable scheme library meant to provide compatibiliy and
+utility functions for all standard scheme implementations.
+	</longdescription>
+	<use>
+		<flag name="scm">Support for scm scheme implementation</flag>
+		<flag name="gambit">Support for gambit scheme implementation</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..b48f4c3cd153
--- /dev/null
+++ b/dev-scheme/slib/slib-3.2.5-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
+
+DESCRIPTION="Portable Scheme library for all standard Scheme implementations"
+HOMEPAGE="http://people.csail.mit.edu/jaffer/SLIB"
+SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${PN}-${MY_PV}.tar.gz"
+
+RESTRICT="mirror"
+
+LICENSE="public-domain BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="gambit scm"
+
+RDEPEND="
+	>=sys-apps/texinfo-5.0
+	>=dev-scheme/guile-1.8.8:=
+	gambit? ( dev-scheme/gambit )
+	scm? ( dev-scheme/scm )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ANNOUNCE COPYING FAQ README ChangeLog slib.{txt,html} )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-paths.patch"
+	"${FILESDIR}/${P}-fix-makefile-guile.patch"
+)
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/share || die
+}
+
+src_compile() {
+	default
+
+	makeinfo -o slib.txt --plaintext --force slib.texi || die
+	makeinfo -o slib.html --html --no-split --force slib.texi || die
+}
+
+src_install() {
+	# core
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins *.{dat,init,ps,scm,sh}
+
+	# permissions
+	local i
+	for i in "${ED%/}"/usr/share/${PN}/*.sh ; do
+		fperms +x /usr/share/${PN}/$(basename "$i")
+	done
+
+	# bin
+	dodir /usr/bin/
+	dosym /usr/share/${PN}/${PN}.sh /usr/bin/${PN}
+
+	# env
+	doenvd "${FILESDIR}/50slib"
+
+	# docs
+	doinfo slib.info
+	doman slib.1
+
+	# guile
+	if has_version '=dev-scheme/guile-2.0*'; then
+		dodir /usr/share/guile/2.0
+		dosym /usr/share/${PN}/ /usr/share/guile/2.0/${PN}
+	else
+		dodir /usr/share/guile/1.8
+		dosym /usr/share/${PN}/ /usr/share/guile/1.8/${PN}
+	fi
+
+	# backwards compatibility
+	dodir /usr/lib/
+	dosym /usr/share/${PN}/ /usr/lib/${PN}
+}
+
+_new_catalog() {
+	if [[ ! "$1" =~ ^(guile|scm)$ ]]; then
+		echo -n "(load \"${ROOT}/usr/share/slib/$1.init\")" || die
+	fi
+	echo " (require 'new-catalog) (slib:report-version)" || die
+}
+
+pkg_postinst() {
+	local SCHEME_LIBRARY_PATH=/usr/share/slib/
+
+	# catalogs
+	einfo "Updating implementation catalogs.."
+	guile -c "(use-modules (ice-9 slib)) $(_new_catalog guile)" |& grep -i '^slib' || die
+
+	# broken as for now
+	#	if use elk ; then
+	#		echo "$(_new_catalog elk)" | elk -l -
+	#	fi
+
+	if use gambit ; then
+		gsi -e "$(_new_catalog gambit)" || die
+	fi
+
+	if use scm ; then
+		scm -e "$(_new_catalog scm)" || die
+	fi
+}
+
+pkg_postrm() {
+	for impl in 'guile/*' gambc scm; do
+		rm -f "${ROOT}/usr/"lib*/${impl}/slibcat \
+			"${ROOT}/usr/share/"${impl}/slibcat || die
+	done
+}
diff --git a/dev-scheme/stklos-1.10-r1 b/dev-scheme/stklos-1.10-r1
deleted file mode 100644
index 0ccefee30cdf..000000000000
--- a/dev-scheme/stklos-1.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]
-DESCRIPTION=fast and light Scheme implementation
-EAPI=6
-HOMEPAGE=http://www.stklos.net
-IUSE=threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]
-SLOT=0
-SRC_URI=http://www.stklos.net/download/stklos-1.10.tar.gz
-_md5_=d13d4e8e0c02acbbb1d463706cd2f0d0
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
new file mode 100644
index 000000000000..6a33cb7df3d2
--- /dev/null
+++ b/dev-scheme/stklos/Manifest
@@ -0,0 +1,3 @@
+DIST stklos-1.10.tar.gz 6097807 BLAKE2B bfb957c54626d29cc1ecba553a0b982022b1ed0b89f333d763937e8c5f84b5c6b80ebc1e6531d968f4b33d72427a4f9957c010932308672907e105d37828ee50 SHA512 64877dec82b4c19bcaea95f6c60a4b9dff19c11bf11792fa5204d0ca3bb6f6962cc9250b35dcd5f01015e430b9a027add4f40c6a7169858893cab3e8c8df0bbb
+EBUILD stklos-1.10-r1.ebuild 898 BLAKE2B a773b3f7ab17b2305076fcf5bc09699eb0b370e866845f77be8d2fe9b773d583c53814bd33a4b4a21c54bd590a468592ed941d5f95e22ce1a5e4a5c3006c2795 SHA512 c11a85b5044b87af3e9bc4cc4550ec76006e902868cb248eb47c1972fec64b353bb4c580a67f570306715b6c21bc9c26b866a9470512c88b7b48c8cd70314d7c
+MISC metadata.xml 602 BLAKE2B d101c5ffdf3c53046f2886a173dbd645a1311d38a594b435fce965cb4ca2df4ff99a1e63c7146f9cf7d02c2b42e7d5ac2b05b1bd847b89e20c19fb03e8d2384e SHA512 ee3d82277e478d2e00f67fc96268dd45440efd0a2b3dac1adae60e905af831478fdb43ce9051f909b20183a305784d7327bc677887598fbb5558c9a6b6297aa1
diff --git a/dev-scheme/stklos/metadata.xml b/dev-scheme/stklos/metadata.xml
new file mode 100644
index 000000000000..db151c849da5
--- /dev/null
+++ b/dev-scheme/stklos/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		STklos is a free Scheme system supporting most of the languages 
+		features defined in R5RS. The aim of this implementation is to 
+		be fast as well as light. The implementation is based on an ad-hoc 
+		Virtual Machine. STklos can also be compiled as a library and 
+		embedded in an application.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild
new file mode 100644
index 000000000000..16e52f98762b
--- /dev/null
+++ b/dev-scheme/stklos/stklos-1.10-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="fast and light Scheme implementation"
+HOMEPAGE="http://www.stklos.net"
+SRC_URI="http://www.stklos.net/download/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads"
+DEPEND="dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]"
+RDEPEND="${DEPEND}"
+
+#parallel build failure reported upstream
+MAKEOPTS=-j1
+
+src_prepare() {
+	# kill bundled libs
+	rm -rf "${S}"/{ffi,gc,gmp,pcre} || die
+	default
+}
+
+src_configure() {
+	econf --enable-threads=$(if use threads; then echo pthreads; else echo none; fi) \
+		--without-gmp-light --without-provided-gc \
+		--without-provided-regexp --without-provided-ffi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS
+}
diff --git a/dev-scheme/termite-0.15-r1 b/dev-scheme/termite-0.15-r1
deleted file mode 100644
index 904c4761d912..000000000000
--- a/dev-scheme/termite-0.15-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-scheme/gambit
-DESCRIPTION=Erlang-style concurrency for Gambit Scheme
-EAPI=6
-HOMEPAGE=https://code.google.com/p/termite/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-scheme/gambit
-SLOT=0
-SRC_URI=https://termite.googlecode.com/files/termite.tar.gz -> termite-0.15.tar.gz
-_md5_=1b5b63236e1b44f96938738625582841
diff --git a/dev-scheme/termite/Manifest b/dev-scheme/termite/Manifest
new file mode 100644
index 000000000000..2222c8936ae3
--- /dev/null
+++ b/dev-scheme/termite/Manifest
@@ -0,0 +1,3 @@
+DIST termite-0.15.tar.gz 77482 BLAKE2B 65af1b195780c33ec35c0f91c1002826cb6573898af623ad728c3150e7cf9ee7bd233ba485a82dddab4f2d7a4c1479d79a7b3e6e2d62b7846cd52b46aa613cde SHA512 77369d08f222b6a51272aa067036061059bd49263cbcdf28e5254198437399bab9d4aa464b34d049480935dfe31843b3fc683eea3fa0c06a181a4521a92f4933
+EBUILD termite-0.15-r1.ebuild 603 BLAKE2B bb7f6d17a2e99c53aab13f418da4cdbd9585bf7f3dc7c9a09ff2708e4817c0d69db88473cb0e353bc57169497b1952b040b5e83edec21fbf989104a16731f6d9 SHA512 33b1517ca0c5f2789d0714031600b23cc7f0074694ecf76e48fef18699d0d9644c913d727d2624ce9dc2d29f89180c066b215f110f719b24c0fa70c7631d77f9
+MISC metadata.xml 612 BLAKE2B a9856fbec776efe8afed9d983569660dd40b98863eb2bb240352d7cb66d85e6463b7400da9589d7e4fcbd939e8ce6c04f04e7b7d18df24529d9e70aa390e71a3 SHA512 e1f5de468e16fce0ca4b6ddbc719d9773dc65d493539f934ef35d45d7584b1c0649ae23e2ebccdf8bcd5f5dcfec9780adb28f2edf68158979d7efb610d04eea5
diff --git a/dev-scheme/termite/metadata.xml b/dev-scheme/termite/metadata.xml
new file mode 100644
index 000000000000..e2da284ad43b
--- /dev/null
+++ b/dev-scheme/termite/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">Termite Scheme is a variant of Scheme intended for distributed computing. 
+	It offers a simple and powerful concurrency model, inspired by the Erlang 
+	programming language, which is based on a message-passing model of 
+	concurrency.</longdescription>
+	<upstream>
+		<remote-id type="google-code">termite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/termite/termite-0.15-r1.ebuild b/dev-scheme/termite/termite-0.15-r1.ebuild
new file mode 100644
index 000000000000..9fca8b50295b
--- /dev/null
+++ b/dev-scheme/termite/termite-0.15-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Erlang-style concurrency for Gambit Scheme"
+HOMEPAGE="https://code.google.com/p/termite/"
+SRC_URI="https://termite.googlecode.com/files/${PN}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-scheme/gambit"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	dobin tsi
+	dodoc README CHANGELOG
+
+	insinto /usr/$(get_libdir)/${PN}/
+	doins *.scm
+	doins -r otp
+
+	insinto /usr/share/${PN}
+	doins -r examples test benchmarks
+}
diff --git a/dev-scheme/tinyscheme-1.41 b/dev-scheme/tinyscheme-1.41
deleted file mode 100644
index 6b10b084e659..000000000000
--- a/dev-scheme/tinyscheme-1.41
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Lightweight scheme interpreter
-EAPI=5
-HOMEPAGE=http://tinyscheme.sourceforge.net
-IUSE=static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme-1.41.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85775e6e63fc532d7c1534eeaa26a373
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
new file mode 100644
index 000000000000..5ef1d5baf7ce
--- /dev/null
+++ b/dev-scheme/tinyscheme/Manifest
@@ -0,0 +1,4 @@
+AUX tinyscheme-1.41-makefile.patch 1152 BLAKE2B 7d75c4a04912e46606d27bc8bab66a868a05547577b4b80962da3d86f169fc64fed7f591c99fc6308f03a8957c99191ec2ebba30d76d2d186a0781c95d0fab9a SHA512 e7ff9a2cc45f1f7f07df3619bf48b2d14c4adf39c452786e4aa0ebb134264f0111f001296e617b6511cd8f28ee3dbdc9f90b5922540aafd91becc358c5de98da
+DIST tinyscheme-1.41.tar.gz 61761 BLAKE2B b657376561eee0ceae02d102ae7da7ce777dcbc78c98b54b0c00c578fb06ccdd3fba8aca5ce150ca188917b8e5f1e9acb63c9c5dc2e050aafa78b0705a20d47c SHA512 a9c1c9cd7a11bf31e0f8ac813ebd6e731cb56b9526fd14d343d7f8c479a8e1b561b744b3f522512adc023cacd1acbf52aa18bf5d8db68f767971660305b79b0f
+EBUILD tinyscheme-1.41.ebuild 1383 BLAKE2B 4f1b408eb014a714ef418bce8a11605eb07804797e3fe31fd75d0a3968dfe344bad59bf3a32a54b559dcd865e8d60605aacf2722881444e247c8d1162969250c SHA512 e0fb286733b75e80ef450267a9a268814ac501c85516dc59071483bfb119825a36b7ab124d9a82778446a50bf64684fdfac1c4cc2d2f19e71a59afe73b3dad4c
+MISC metadata.xml 867 BLAKE2B ded640d5a97da7be0b173ec36eb47ab640bdb3024137c93e3ec37d6c9863297b5885040d49f42575de1de6d34f14fa442be94259480808a701619b8105b74c73 SHA512 42f4d045a180c0000df235d368602cf0af1c0b95de53c1bfd4b32089a641d6633d1ac2a713de1a1de09243b479c9e4bf7561b1d664c589c483bfa9b2e865b1fc
diff --git a/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch b/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch
new file mode 100644
index 000000000000..69fccb5e537a
--- /dev/null
+++ b/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch
@@ -0,0 +1,50 @@
+diff -ru a/makefile b/makefile
+--- a/makefile	2013-04-14 20:08:33.000000000 +0000
++++ b/makefile	2013-12-11 11:59:58.688782748 +0000
+@@ -18,8 +18,7 @@
+ #AR= echo
+ 
+ # Unix, generally
+-CC = gcc -fpic -pedantic
+-DEBUG=-g -Wall -Wno-char-subscripts -O
++#CC = $(CC)
+ Osuf=o
+ SOsuf=so
+ LIBsuf=a
+@@ -27,12 +26,11 @@
+ LIBPREFIX=lib
+ OUT = -o $@
+ RM= -rm -f
+-AR= ar crs
++#AR= $(AR)
++ARFLAGS = crs
+ 
+ # Linux
+-LD = gcc
+-LDFLAGS = -shared
+-DEBUG=-g -Wno-char-subscripts -O
++#LD = $(CC)
+ SYS_LIBS= -ldl -lm
+ PLATFORM_FEATURES= -DSUN_DL=1
+ 
+@@ -71,16 +69,16 @@
+ all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
+ 
+ %.$(Osuf): %.c
+-	$(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
++	$(CC) -fpic $(CFLAGS) -I. -c $(FEATURES) $(DL_FLAGS) $<
+ 
+ $(LIBTARGET): $(OBJS)
+-	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
++	$(CC) -shared $(LDFLAGS) -Wl,-soname=$@ -o $@ $(OUT) $(OBJS) $(SYS_LIBS)
+ 
+ scheme$(EXE_EXT): $(OBJS)
+-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(SYS_LIBS)
+ 
+ $(STATICLIBTARGET): $(OBJS)
+-	$(AR) $@ $(OBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS)
+ 
+ $(OBJS): scheme.h scheme-private.h opdefines.h
+ dynload.$(Osuf): dynload.h
diff --git a/dev-scheme/tinyscheme/metadata.xml b/dev-scheme/tinyscheme/metadata.xml
new file mode 100644
index 000000000000..82f95a75d483
--- /dev/null
+++ b/dev-scheme/tinyscheme/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">
+TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. It is meant to be used as an embedded scripting interpreter for other programs. As such, it does not offer IDEs or extensive toolkits although it does sport a small top-level loop, included conditionally. A lot of functionality in TinyScheme is included conditionally, to allow developers freedom in balancing features and footprint.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tinyscheme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
new file mode 100644
index 000000000000..4819bc573162
--- /dev/null
+++ b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="Lightweight scheme interpreter"
+HOMEPAGE="http://tinyscheme.sourceforge.net"
+SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -DOSX
+		sed -i \
+			-e 's/SOsuf=so/SOsuf=dylib/' \
+			-e "s|-Wl,-soname=|-Wl,-install_name=${EPREFIX}/usr/lib/|" \
+			makefile || die
+	fi
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"\
+		AR=$(tc-getAR) CC=$(tc-getCC)
+}
+
+src_install() {
+
+	local tslib=libtinyscheme$(get_libname)
+	local tslibx=libtinyscheme$(get_libname ${PV})
+
+	newbin scheme ${PN}
+
+	newlib.so ${tslib} ${tslibx}
+	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
+	dodoc Manual.txt || die "dodoc failed"
+
+	if use static-libs; then
+		dolib.a libtinyscheme.a
+	fi
+
+	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
+	insinto /usr/include/
+	newins scheme.h tinyscheme.h
+
+	local INIT_DIR=/usr/share/${PN}/
+	insinto ${INIT_DIR}
+	doins init.scm
+	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
+}
diff --git a/dev-scheme/ypsilon-0.9.6_p3 b/dev-scheme/ypsilon-0.9.6_p3
deleted file mode 100644
index 7161d9409f96..000000000000
--- a/dev-scheme/ypsilon-0.9.6_p3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/cpio
-DESCRIPTION=R6RS-compliant Scheme implementation for real-time applications
-EAPI=5
-HOMEPAGE=https://code.google.com/p/ypsilon/
-IUSE=examples threads
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/cpio
-SLOT=0
-SRC_URI=https://ypsilon.googlecode.com/files/ypsilon-0.9.6.update3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=537bcb8a7f841939d7216971807ae421
diff --git a/dev-scheme/ypsilon/Manifest b/dev-scheme/ypsilon/Manifest
new file mode 100644
index 000000000000..6a892b816a41
--- /dev/null
+++ b/dev-scheme/ypsilon/Manifest
@@ -0,0 +1,4 @@
+AUX ypsilon-0.9.6_p3-asneeded.patch 353 BLAKE2B ea32b5ffd6ed20a54ea28e799e9cb38a3df5f0fa251c7d47ed097949b80b7af0118b4f96634e4d6888a001bc031c239530047200e24e408f31b94233c252e083 SHA512 12709409fc4663bc945a8bb182c0c0155d37c85b739adb99c9ca7ff31fdebbbe8e67b8fa3e0a98e93b01d9d5aa2f47db1630b0c57d3b1a0e462bddb92fa604e2
+DIST ypsilon-0.9.6.update3.tar.gz 4555843 BLAKE2B 65cdf9d154dbe201967a0eea9b21b90f86eb7a88975bb9f4013f801ed28e6da09eb29a793287f0870f6b27f3e63594a79e7894a6a6780342223a728c229babb0 SHA512 9ea5e3e70481c538bcaf671feb7f764015fb44702bcec4e2873007e065bf48d7d9b0cfc8f9dcc51e0083b0bf5296fd8ac40a1f851d76019a18b21fa7e292ee89
+EBUILD ypsilon-0.9.6_p3.ebuild 864 BLAKE2B 3ea49a2882a9187cd8af3aaf24f3b9fee05355610547a0fd88188a4fa4213988e23b80c89ff0669f869b77e5aa32f1244bf7ccdcd46a8d8550f768c7006c74d3 SHA512 5b7916b941ef813da3a0314b691138989ba0d5982c75c18e07f1f2df57a0697734f6c777810ba1173104620b9c0b76490c46e9ff9a3046320f84bb902b579543
+MISC metadata.xml 486 BLAKE2B d562278ad0676d151db2d3bf07a11749bcf43483c28d783d6831a42ab70b070c993e97fadbcf5854ca9232a9325efc180171ee16414db0dad1e2b42abc9b2e45 SHA512 5ad24cb19a09eba414c8099f9300eb81b254797641e6234e2819e10d8fc52066d6bf75e639f71a5bf8bd9e10178cf56342a129401ceec31689bea4b82bc28eb9
diff --git a/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
new file mode 100644
index 000000000000..4769fce6c25c
--- /dev/null
+++ b/dev-scheme/ypsilon/files/ypsilon-0.9.6_p3-asneeded.patch
@@ -0,0 +1,11 @@
+--- ypsilon-0.9.6.update3.orig/Makefile	2008-12-23 09:56:02.000000000 +0100
++++ ypsilon-0.9.6.update3/Makefile	2009-10-21 18:14:37.613881129 +0200
+@@ -126,7 +126,7 @@
+ 	@mkdir -p -m755 $(HOME)/.ypsilon
+ 
+ $(PROG): $(OBJS)
+-	$(CXX) $(LDFLAGS) $(LDLIBS) -o $@ $^
++	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ vm1.s: vm1.cpp
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
diff --git a/dev-scheme/ypsilon/metadata.xml b/dev-scheme/ypsilon/metadata.xml
new file mode 100644
index 000000000000..c77deb420372
--- /dev/null
+++ b/dev-scheme/ypsilon/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription lang="en">Ypsilon is the implementation of Scheme Programming Language, which conforms
+		to the latest standard R6RS.</longdescription>
+	<upstream>
+		<remote-id type="google-code">ypsilon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild b/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
new file mode 100644
index 000000000000..e68eb684fb61
--- /dev/null
+++ b/dev-scheme/ypsilon/ypsilon-0.9.6_p3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P="${P/_p/.update}"
+DESCRIPTION="R6RS-compliant Scheme implementation for real-time applications"
+HOMEPAGE="https://code.google.com/p/ypsilon/"
+SRC_URI="https://ypsilon.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples threads"
+
+DEPEND="app-arch/cpio"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_compile() {
+	use threads && append-flags "-pthread"
+
+	emake PREFIX="/usr" CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" LDFLAGS="$LDFLAGS"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins example/*
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-scheme
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)