From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 27 Oct 2018 12:48:57 +0100
Subject: gentoo resync : 27.10.2018

---
 dev-lang/Manifest.gz                               | Bin 18040 -> 18021 bytes
 dev-lang/duktape/Manifest                          |   2 +
 dev-lang/duktape/duktape-2.2.1.ebuild              |  43 ++++
 dev-lang/elixir/Manifest                           |   8 +-
 dev-lang/elixir/elixir-1.6.5.ebuild                |  32 ---
 dev-lang/elixir/elixir-1.7.1.ebuild                |  32 ---
 dev-lang/elixir/elixir-1.7.2.ebuild                |  32 ---
 dev-lang/elixir/elixir-1.7.4.ebuild                |  28 +++
 dev-lang/erlang/Manifest                           |  19 +-
 dev-lang/erlang/erlang-19.3.6.12.ebuild            | 227 ++++++++++++++++++++
 dev-lang/erlang/erlang-20.2.ebuild                 | 158 --------------
 dev-lang/erlang/erlang-20.3.2.ebuild               | 227 --------------------
 dev-lang/erlang/erlang-20.3.8.10.ebuild            | 227 ++++++++++++++++++++
 dev-lang/erlang/erlang-20.3.8.9.ebuild             | 227 --------------------
 dev-lang/erlang/erlang-21.0.2.ebuild               | 226 --------------------
 dev-lang/erlang/erlang-21.1.1.ebuild               | 161 +++++++++++++++
 .../erlang/files/erlang-20.2-libressl-2.6.1.patch  | 111 ----------
 dev-lang/go/Manifest                               |   2 +
 dev-lang/go/go-1.10.4.ebuild                       | 228 +++++++++++++++++++++
 dev-lang/mercury-extras/Manifest                   |   6 -
 .../mercury-extras/mercury-extras-13.05.2.ebuild   | 198 ------------------
 .../mercury-extras/mercury-extras-14.01.ebuild     | 198 ------------------
 dev-lang/mercury/Manifest                          |   8 +-
 dev-lang/mercury/mercury-13.05.2.ebuild            | 198 ------------------
 dev-lang/mercury/mercury-14.01.1.ebuild            |   9 +-
 dev-lang/mercury/mercury-14.01.ebuild              | 203 ------------------
 dev-lang/php/Manifest                              |   8 +-
 dev-lang/php/metadata.xml                          |  13 ++
 dev-lang/php/php-7.1.23.ebuild                     |   7 +-
 dev-lang/php/php-7.2.11.ebuild                     |   7 +-
 dev-lang/php/php-7.3.0_rc3.ebuild                  |   7 +-
 dev-lang/qu-prolog/Manifest                        |   6 -
 .../files/qu-prolog-10.0-associated-item.patch     |  11 -
 .../qu-prolog/files/qu-prolog-10.0-configure.patch |  21 --
 dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch |  38 ----
 dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch  |  35 ----
 dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild        | 101 ---------
 dev-lang/ruby/Manifest                             |   2 +-
 dev-lang/ruby/ruby-2.3.8.ebuild                    |   2 +-
 dev-lang/sassc/Manifest                            |   2 +-
 dev-lang/sassc/sassc-3.5.0.ebuild                  |   4 +-
 41 files changed, 976 insertions(+), 2098 deletions(-)
 create mode 100644 dev-lang/duktape/duktape-2.2.1.ebuild
 delete mode 100644 dev-lang/elixir/elixir-1.6.5.ebuild
 delete mode 100644 dev-lang/elixir/elixir-1.7.1.ebuild
 delete mode 100644 dev-lang/elixir/elixir-1.7.2.ebuild
 create mode 100644 dev-lang/elixir/elixir-1.7.4.ebuild
 create mode 100644 dev-lang/erlang/erlang-19.3.6.12.ebuild
 delete mode 100644 dev-lang/erlang/erlang-20.2.ebuild
 delete mode 100644 dev-lang/erlang/erlang-20.3.2.ebuild
 create mode 100644 dev-lang/erlang/erlang-20.3.8.10.ebuild
 delete mode 100644 dev-lang/erlang/erlang-20.3.8.9.ebuild
 delete mode 100644 dev-lang/erlang/erlang-21.0.2.ebuild
 create mode 100644 dev-lang/erlang/erlang-21.1.1.ebuild
 delete mode 100644 dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch
 create mode 100644 dev-lang/go/go-1.10.4.ebuild
 delete mode 100644 dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
 delete mode 100644 dev-lang/mercury-extras/mercury-extras-14.01.ebuild
 delete mode 100644 dev-lang/mercury/mercury-13.05.2.ebuild
 delete mode 100644 dev-lang/mercury/mercury-14.01.ebuild
 delete mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch
 delete mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch
 delete mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch
 delete mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
 delete mode 100644 dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c616f19162cc..9af14c986dad 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest
index 251152273f5d..53a43e476244 100644
--- a/dev-lang/duktape/Manifest
+++ b/dev-lang/duktape/Manifest
@@ -1,6 +1,8 @@
 AUX duktape.pc 218 BLAKE2B 3864f90f3ec1d77733736e16f99c0bab796502d3306759106357cb500d038304dfd6dc9849c9cde2e77683bf1f38dc7707119b39b66a6b55961b802e8d679520 SHA512 0f4b4e20ea9b348ed8b69623ed4fa09c20a2a951ef4f281b6313961c4aa085be9fc511a948d67713a7d2d9dede984761d5409b25e09da1db10698eb615f7c6fb
 DIST duktape-2.1.1.tar.xz 1024568 BLAKE2B 9b8a5ef07052f685233e62a0ffac31c5ca2b41b90a82bd288edb4f7c495457c065dffb162a6b225b2aab48f41758dfca6031efbcf2e4b82fe590abab46465c2d SHA512 51e5146b083b460f005ce93e369aebf9981e33a3e888f3e91fd175b7f018a93981e8f6f9ff9bbd865ad30f1424fcb21c18334450050909cda5f74caf11b25479
 DIST duktape-2.2.0.tar.xz 969136 BLAKE2B f0567bec70a5a0055937007dc2891816bda214295f0373dd1039ee82c5c97111c1601fe3b0421690d968b8ce2d1fd0df18b2e3b786daabb5d1327cee5f980cf0 SHA512 6fe67660ad4cfbab37b9048840bd8c42ee9585441c17253e1f17cb06e4527d1413851bc167d8b013990d5cae9f8e6eb4cb6ff80866f55bd8d67b0cf47580be7c
+DIST duktape-2.2.1.tar.xz 966496 BLAKE2B fc458035fea9b3c5f26ac538b0ddb19ca0f93b8d20e3d51b3428e72a18797c15e6aeb6111ff05818e54529f199084b2803582d54b19040d16e58462405889449 SHA512 af78a1680cb796e1eedca78264a9c3344cd8149b3c54dc5109f21a0c65ee24097f6f18eceefbf336cda9eda7cb347a0484badfe765f3b93e1c1620b099999f25
 EBUILD duktape-2.1.1.ebuild 981 BLAKE2B 25de184279d1d125eeee0691ba1ab21bbc537602bb8067a799f1682ad61a3e886768f37c4637a356be49c39f5492617c29d6a939db571278ed72a7ab73b3d1c8 SHA512 6d8bdb857de247fad2bee557c7df1fd6422dde70c36313a0ee5efa99ff9fff129b21d944c1a7ba372dd73c9da13013e75483bb08558d3e356679d2722809aba6
 EBUILD duktape-2.2.0.ebuild 981 BLAKE2B 05e9f13ce05e68479f0cf6f4fdd30db7d54724030b8d400ba7df541fa0c74eabae0074dc5cdf63511746c9f8b0277f4d43f2e33059002ef6b7a2dfd1c6845a26 SHA512 df56de8556085d401f0226a745a05deeb2ffc8a6460bb055b7c649fb8bec5a01a650c876c14fe4337a30741dc3dc04b6f64813af1ab4039dd14aad8ad3d8f49b
+EBUILD duktape-2.2.1.ebuild 978 BLAKE2B 8459dfa0fe51b8eb242f23f7267d897f6b400abd39f75e4b67b74254d1aac49f72707ed55d287876ebe053556b1c7ffdc38110c34a169b45adcbae8f37c7252a SHA512 add1db6731ce23552a638d68d029dbd93438b809b9610aaa6247a8b39242a1c26d8632d65db415a2732889b8e1e255952076f7c86cd1384e02972293e9138e69
 MISC metadata.xml 477 BLAKE2B 8aa33e556bbac581fbf57393f8ba92e731e03ab91df9c34f442bec4f02f9ce69d455673e5074b037bd1b134653f1c11850b4f20eb0fa282fb0aa22d9e5c8517d SHA512 72024950f8fdb4c54f48cafd73d139c52230108fa9ba032c72a2bc847ec2d760d280879b17fb032ee22e147a4b9dcab5281e69985a157711a9d03c75c55a06c5
diff --git a/dev-lang/duktape/duktape-2.2.1.ebuild b/dev-lang/duktape/duktape-2.2.1.ebuild
new file mode 100644
index 000000000000..13e2afcd3471
--- /dev/null
+++ b/dev-lang/duktape/duktape-2.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Embeddable Javascript engine"
+HOMEPAGE="http://duktape.org"
+SRC_URI="http://duktape.org/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+
+	# Set install path
+	sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \
+			Makefile.sharedlibrary || die "failed to set install path"
+
+	# Edit pkgconfig
+	sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
+	sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
+
+	# Set lib folder
+	sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
+		Makefile.sharedlibrary || die
+
+	mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
+}
+
+src_install() {
+	dodir /usr/$(get_libdir)
+	dodir /usr/include
+	emake install
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}/${PN}.pc"
+}
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 4a76da604536..c4a5cb12cf56 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,13 +1,9 @@
 DIST elixir-1.4.5.tar.gz 1829098 BLAKE2B bc8e2beafe53c3af507215d913558e295370ed8d3731c8b013f5d1cd2ad1d8a4fad4b3fe1a7ee3397470916f6f6687436ecbaa06c85c47f4b52aa0331b7dad23 SHA512 3fe659a739ded54bfc7d05a96acf3061c860e44cfd7700651d138c7e21997c5703cc62d2bd3b7a258b27064bb222dfdcdc01e4d017451f522f9658a039073611
-DIST elixir-1.6.5.tar.gz 2075889 BLAKE2B 73586354f3672ef7892b462781e8e94ab913548b4753129a08e4864f222590e95b310c55df628e4e42015bed642569a7183624c2d107cd07dac560ba2b9a57fa SHA512 e2cf9c2d9198da32cefb841cae4ce64bb52eb28239bbffb6d991916cfdee420b242773664efa7381eb4609c67438ab608f5f96ca2c403b54ecdd9bfdddf91a95
 DIST elixir-1.6.6.tar.gz 2078742 BLAKE2B 4a793ac55db97c1d604d5f0012758d039f4a26eff5866a2ad2b90010f8477a8f62cc8f01a391f93133c927c5da5494b6d10b76f087a4af1206da977b0ec14a17 SHA512 62010100274b99423bb6a660e34ef53a702250a09371ef4b49ec03a3afe8761611b3734aea31763afa361560eb74c6d23e022d4d9bc4453c1bdef36bb37f9b4d
-DIST elixir-1.7.1.tar.gz 2139430 BLAKE2B 71fb91134ec707f254cdc5aa36e9335c2a5855b8d65f5a42a75df7dc7e690b342531748e36cfca051cb751eed5487e39b5ef03fc3af35871ca389033ea79ab14 SHA512 f1d5f1f1c5df78673b318d69e1863e2780ad7cd54b050ac6ac9767a07952828a91d749bf16cd6c8d384d3a0c5b6154683d93086121787b5f03783113d8bd3b2c
-DIST elixir-1.7.2.tar.gz 2140217 BLAKE2B d29889a89ab4f29cfb0ee9be75ad62db0ca70f59dfaf75a740b0647ba74d8e1c93e19adea74ef9722e315c011ef6c316fc73da08ee192bb9344ac4130ee46549 SHA512 b105014530f8d68b1b3f15b0199c38efeacdcfc8595269a4ed0275f653e747fce60e6bc0fc94c34a056a6ebbaaf312f061f1aba37988dd984e6b717e856bbab8
 DIST elixir-1.7.3.tar.gz 2140430 BLAKE2B 5f5d4d094de9c6412488444241991693d9f14afeddd087077ac1e4aba4a4f825ccf04196778f9e00d56f90c90e5b584dcfc0a286e7beabad3eb22a292661fea2 SHA512 67c8de5a85eefc5f7d7ed42ec8b96cb34937cea6c94eb1f2c27237fc0b4c51b2eb39d65c2a4dce4788cb6ed1879fb1839cd8d73c66be71b0b4895952dc228f05
+DIST elixir-1.7.4.tar.gz 2139938 BLAKE2B 8515fbbb89db64efbda8834f2368ee4391a4e0ed042812a059f0d640b0c9028bec330ba192aaec7988d83635bbc25d2a6891236571c3817a76f6477594899b94 SHA512 594e76601e0d6f7eeddfcaa9b76a2e5c66f702a497599fffc5e9255790c18ac5e00b986fc45fd3b90335522f51272bcd4bcf2b9f8951b94eebfb1d56ac7cebc2
 EBUILD elixir-1.4.5.ebuild 610 BLAKE2B da40f0452c6571e8c72f1dc85e845ffced68579db1903479d4df21d20447d3d800ebd69ad75da3675213feee30d0438fa868a377d6cba94b365bac14adbd6132 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17
-EBUILD elixir-1.6.5.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 EBUILD elixir-1.6.6.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
-EBUILD elixir-1.7.1.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
-EBUILD elixir-1.7.2.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
 EBUILD elixir-1.7.3.ebuild 742 BLAKE2B 017a3956c75e57c612a3f3b2836536da678bc189a95092117aee9bc0602df9e1df26c1ddd8f8ac6a95a354c45b4f6511963add65f83e38efcb486699aa978a37 SHA512 fc902f86e10586266e825fb6eb508389d936470377161c19e45ea0e90287c36c53642db605d8e1241b329e47cc487975c2809484ffc87d3f11e29d15a2685824
+EBUILD elixir-1.7.4.ebuild 684 BLAKE2B 5ff4aa8db3b8e43be0c8de1bf6592772bf44e786de3917b7efe86e2eb2a81c7cfc777ebf3a31a7e85117040a86e796e0dc74c5c54386f7822dff38a5f9e8c100 SHA512 1ccf3527ede24d498a22f9cbdee31577ca77922083cff13f63c346ff774e40d7aa9bd0cb6a621e3845c5213614fce6e2b3bcce4db51f17db4a75f34ebb3aed46
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.6.5.ebuild b/dev-lang/elixir/elixir-1.6.5.ebuild
deleted file mode 100644
index 844bd80c8914..000000000000
--- a/dev-lang/elixir/elixir-1.6.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-18[ssl]"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-
-RESTRICT=test # needs debug symbols
-
-src_compile() {
-	emake Q=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.7.1.ebuild b/dev-lang/elixir/elixir-1.7.1.ebuild
deleted file mode 100644
index 844bd80c8914..000000000000
--- a/dev-lang/elixir/elixir-1.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-18[ssl]"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-
-RESTRICT=test # needs debug symbols
-
-src_compile() {
-	emake Q=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.7.2.ebuild b/dev-lang/elixir/elixir-1.7.2.ebuild
deleted file mode 100644
index 844bd80c8914..000000000000
--- a/dev-lang/elixir/elixir-1.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-18[ssl]"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-
-RESTRICT=test # needs debug symbols
-
-src_compile() {
-	emake Q=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.7.4.ebuild b/dev-lang/elixir/elixir-1.7.4.ebuild
new file mode 100644
index 000000000000..55dec41ac77f
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.7.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 0f1b25539223..07dc01e3ba3b 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -2,42 +2,39 @@ AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c
 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473
 AUX epmd.init 537 BLAKE2B 8b7c45ec9820d37b01cbbe824e0fd13f4651ac280383f8830dc42037f76f918569ce68c00d6c880ab34a95f5c2831dfb3edaf62e13112e5a1c0e77534fd9239c SHA512 231eb48c02eb183eac7aa2f6ec811b0934098e04faf49b130d5f6e184d351f3c1d6484ff5330e5c8d707473be79f220247a9b7076cf3bf27fdd659b1ccdcc111
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
-AUX erlang-20.2-libressl-2.6.1.patch 4228 BLAKE2B 8c671d3aa8329562b274e6b9f233a3f93565f5a0f4491b83e7e57fb6881d0fbaaf955d7aa5537bdcfc85dbf4c979a3625aed2c203679eccaf9fcc4bd93133836 SHA512 66ff54153264d37d21822a19c07dc7d07fb4ed5c32234be7270821c060fcbd2673069dfd23a38512c7b0373fc97e6e44799f4b4280a1391b300f60f422ef6d69
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
 AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9
-DIST erlang-20.3.2.tar.gz 53492641 BLAKE2B 2cdf78b6003801400d99949865a5b3e17d2209bf411bbe07dc12f749c84725710d12f85cb2559bc39ac04a7d6f7a9ae07b5f131a5524cf4ce3eb8559ca0259bc SHA512 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b
-DIST erlang-20.3.8.9.tar.gz 53514692 BLAKE2B 1afa37ff8cc462cb0cc719c49c2c10b2684c7160b6912c574834021b2f521737dfa4cfedd0c82c843c1bb1e1977143fac7ae1ec94cfa9df4b2775deffd903a7b SHA512 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7
+DIST erlang-19.3.6.12.tar.gz 34004718 BLAKE2B 49f726a4c3f3bb4fcde1d3ff7cee93ef68a0ed0f5cbb00af8fb3585fb640302bf407351b61b0507c6aaefb4311f77dc0de450d2c43c6f8310f6af01ffd424a79 SHA512 9e117cbbc9cf53d908ae87f58f80f5ad4d3e69d5f1c94e3460a1d9c287dc7290d05fccb104ffc7779dd36b6b9377290ac4c5983a8ad3ea3ca518f66e0ab0db3f
+DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
 DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c
-DIST erlang-21.0.2.tar.gz 52835517 BLAKE2B bf7e2e166236a7c0a3e3411889f163dce0d938c1a854a6c264c137b601587c4cd4d62d58d9a87cf925406272d6e3d6547e4403927adc8e901716289ee2164162 SHA512 ff736a6df92ac7feec7b9ebb1b6523d511a533d48e536f36aee20fa21b5a1dc33791065d45f6900bbbaa48b4ba80b57a306b416801456a5ac33468786dfb00b7
 DIST erlang-21.0.9.tar.gz 52842736 BLAKE2B 57de5e94450a70d32eb46bff691be4d3679daa56bee4e9aa2aad156b9447ea5bbe1287b806c304115c0ac4a677b8a04fb23286e269c7e0516f60cebd5ef2b3c7 SHA512 01bc5ce8d5c76823af1a17d389f326509c4ade5add0b0e66830e2c6aec2c7d93906cbbf9fb6b454178bddfa1c96355d632e4c557ab6da2bbdb8c6b0e05d87ee8
+DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
 DIST erlang-21.1.tar.gz 53857079 BLAKE2B ae292f5e98d747a6afb5d82205dd33d55cb6e275e3ebc98a4dbc8378cfcb1ea64f83d5f2d2256fd7208c7fe553b47ff25edf2858287f5316cae50788f2175337 SHA512 9e118e902c33b8dd71266efb4cc4aeb0db0d8be8adb64ac85595a6507dc847b84e5444a9b5c5cbf46b560c885db9f4cd934c74de4aa2e1574785295ea0865348
+DIST erlang_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
 DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
 DIST erlang_doc_html_21.0.tar.gz 32501093 BLAKE2B 5c5bab831d4a86129cca41f8e82416d45a92e8ae29cd2223301633b46471783ee6bb8131d469cedcf0f655ea21879c475c61d0b9eefba9e12d78d0a803403a19 SHA512 8be300d9e502b7dcf8db4621d7c5c8981f47cbff851b30b33ef33871f737554eda73dacd179b64995fc45362c4dfd91e15ff659d2898f863465222176bfbff9f
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
+DIST erlang_doc_man_19.3.tar.gz 1410781 BLAKE2B 78293aa498c2651be27d83f13e14007f25a1816b4dae499f463249f774256eddde3a4e31c435a30edd04fb6f41cee965c968b338de77330c3320f3df6087be92 SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1
 DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
 DIST erlang_doc_man_21.0.tar.gz 1311959 BLAKE2B 70b049c6d7b8bbbb3bf77f7588ccf0eb937d5fe511968d47e1325dd01b48e986ae82804ffc88b750f0f7e2fe0482c0506ad060a6a84892eea61264aa2b003dd9 SHA512 611ac0b7cb2c0bc0bb6cd194dffe4f9d2c95bf38da033aa8c43d386a9bedf6f7d6fa8a95d340dbb57da2698602599c8e0501cbbdd735d6e5d35110aa9087dc79
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
 DIST otp_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
-DIST otp_doc_html_20.2.tar.gz 33570484 BLAKE2B c47244a601ae780e5304aedbafbc84d514cb21852760c51384b197d8d37602d51448b7123f6205da9afd2c5d2158f518a122dd4d550ca2ff22d3425eb31b6cf7 SHA512 b481930066737cf0ae2496aa9bc0c865da46bd3985fe5ebcf51eb9383539a57ec364e1eed9d3916ba0953d837d0d5d37cfc129a995d4e2a9656846e75cda9397
 DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
 DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
 DIST otp_doc_man_19.3.tar.gz 1410781 BLAKE2B 78293aa498c2651be27d83f13e14007f25a1816b4dae499f463249f774256eddde3a4e31c435a30edd04fb6f41cee965c968b338de77330c3320f3df6087be92 SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1
-DIST otp_doc_man_20.2.tar.gz 1337652 BLAKE2B 416e83c696e30981eabad1f5a7c89abfd0b9d48ff04c9bd86b13dc96302acc9f2b9a73906a2976888ce35c6bfb38b3c006a1e0a041dd1bd5e75908e53bb920c3 SHA512 a67bb975b613c74c4e2418406b6472764ac69dfb9f8a6f64c79c680b1f87edea719431c140b006f776b0088885d958a6f2718267cebaf73ed506eaff721400f4
 DIST otp_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
 DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1c8b1b4b1b60132e255c29c475534ce018a7902ed29b696b783a21daa73d1778435aada1a77064ab46e915af87d SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714
 DIST otp_src_19.3.tar.gz 68510871 BLAKE2B fc37c493f5fa3533aaa29f545ff751f5851b58d8952f6f21ef50fec433d661a1e3300139b30a41d9c1f16b3eeaf5d98450bf0a2408e7910712d9d98f3af19237 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6
-DIST otp_src_20.2.tar.gz 87136848 BLAKE2B f83e652320b67b72cf42be3c23a9251806096fea4e255f73c8170bcb61ea1e008983f1da1c9dc7b46b76e1fd0d96f94097f5d629eb28c08eb424bb1e7a1cee28 SHA512 6c2cbef9fa67f4aa9d0c22bedf87f39b0067994614663afee88c57bb7789eec45cb1970dcbd930d163a27293b8d24b20a90cf6ed30ff1a14492a9ccdd5b59a65
 DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977efd182efcef6c466a0ac6232e18d9481823624cdd49a866feb38e96db6150f40927f25f2daaa64fe4aafd02089b4 SHA512 4169e2e653055c62dd66e214dcab577b49cadb8328dcc43adb8a2d44850b12c02db8323992c21852409697c5a48493068316417be9d97519b039a8f1cde143da
 EBUILD erlang-19.1.ebuild 4479 BLAKE2B 671c00139feb254a2d053abd6006504aac816ad56b68291653f663d482138c4b8672b0893ef4e7d37f1610a581aa07695a722fcefa4c233523ab459b9adb292d SHA512 61ed8db5368a33c031588f896ea7f62cd770567dd61e8dbbb1793e4020cc540877e2823291a90227a9bc55811f7057448e49becdba792c600bd5d6168dd3af18
+EBUILD erlang-19.3.6.12.ebuild 6713 BLAKE2B 99d8e6c2e71fc01c815cafb7cdb2b6aa730f3ff07d174d82ee1ab44bfad140395fa6c5e0eb121d32ccd6c98f6bd37a5b384dd3cc02215fc96f229d3bf220f8f0 SHA512 e718298bb175bf3c7fc2828a603d504b474294258b46c6941a20a367e77b460e3f396d425b805c69a310aa428ce3477e8af38c40ea1abbc026c4e5488f8c1a44
 EBUILD erlang-19.3.ebuild 4532 BLAKE2B 8b90954a7cada84ee1eddb41566fd50bf5eb50d154bfc2e13ebcfa1ea33aa2d8334da80554ce5862ba3b3ba6b77ddbd933e6322829bf96985caaeaf556704c09 SHA512 f204b98e05485feff3e66be512d93336a147dfc3e5af1795d5afe3c63a722fcf5f7578c25f097074535b31e4ea5b339848cb2d633f46ae00af0be4b1d1ee30f7
-EBUILD erlang-20.2.ebuild 4583 BLAKE2B 17eee67fc09394b3cf55a8fe150270622f52fc9238a8680e459d8b292257af5838af7ac357989c4b0a3ff3924511dd7fd19ab1c49d5c40fb44b1f0b150efc768 SHA512 a115afef15e227083e43f157f89c1b736aa1ecbedfd2bbd6ef5748644bb1b117a319a69037451c59319a38ca29550ca316044428399646b6e21e2f6ffbb55999
-EBUILD erlang-20.3.2.ebuild 6674 BLAKE2B 58402cfc311affce1e54986cda12ef8d19dab878548df39e806b73fe48a713ce7b11697dd0084ffc1773791b6a6d33575d232f243468fa6b5f5b3a94690e6d39 SHA512 38d70edf46cf74139e78e4345b42bd8d7b08c74060940c84666188b6931efd552de700b3a74b8cdb9d273ceff5b4e9d4627b79c0122781d27fe7ce4b2527732b
-EBUILD erlang-20.3.8.9.ebuild 6716 BLAKE2B 0c979eadeffa3a1f9b478b2f8025e277eff34e9bfbf629444815f354fddb181749877fd12852c41bbf9322b32e2cb05337510af62c4de900c2b1ccfd2c0840ed SHA512 5d605798812399b51205fd017772d34ea797b07a585cbabc97daa6fad7aa63ea17c527431a1da282b6ec3ff353d5a627c726ad33dfff4e2fb683a25ba06466fc
+EBUILD erlang-20.3.8.10.ebuild 6713 BLAKE2B 99d8e6c2e71fc01c815cafb7cdb2b6aa730f3ff07d174d82ee1ab44bfad140395fa6c5e0eb121d32ccd6c98f6bd37a5b384dd3cc02215fc96f229d3bf220f8f0 SHA512 e718298bb175bf3c7fc2828a603d504b474294258b46c6941a20a367e77b460e3f396d425b805c69a310aa428ce3477e8af38c40ea1abbc026c4e5488f8c1a44
 EBUILD erlang-20.3.8.ebuild 6716 BLAKE2B 0c979eadeffa3a1f9b478b2f8025e277eff34e9bfbf629444815f354fddb181749877fd12852c41bbf9322b32e2cb05337510af62c4de900c2b1ccfd2c0840ed SHA512 5d605798812399b51205fd017772d34ea797b07a585cbabc97daa6fad7aa63ea17c527431a1da282b6ec3ff353d5a627c726ad33dfff4e2fb683a25ba06466fc
 EBUILD erlang-20.3.ebuild 4830 BLAKE2B 0d98f34098815c5b4a42c0629f8a0a6f492f3ddfcaa154c0d7b6bc3572d108d789175c8146d78789375f906a1c024fcafce6e9e5c1b0d76ba6f7056b2f8038fd SHA512 f19a1237535942004359468046539cfae2551e28fb1090161cef0ee4d20bcb28aa1a6ee62ee37f2e0ec409675cd6cbf2b41ee9aef3bf967a59e2cb52735dfbb2
-EBUILD erlang-21.0.2.ebuild 6715 BLAKE2B a7d1ae8ef4c13b5dda06d3eeaf6c6fd0daf08242381e27ac5c8bcc26b485985042a0fd3bbdf99840e0f3a44cfa2be2f67f488635f7eb5859485f55d159eb4654 SHA512 4347100ae033a9768a71533c1b6e55a856a590df86dc44592a40ef63cf23559f26c676528e4daa69db38bf941418cbb180e004e5309cc53dc1e4bef450c991ed
 EBUILD erlang-21.0.9.ebuild 6715 BLAKE2B a7d1ae8ef4c13b5dda06d3eeaf6c6fd0daf08242381e27ac5c8bcc26b485985042a0fd3bbdf99840e0f3a44cfa2be2f67f488635f7eb5859485f55d159eb4654 SHA512 4347100ae033a9768a71533c1b6e55a856a590df86dc44592a40ef63cf23559f26c676528e4daa69db38bf941418cbb180e004e5309cc53dc1e4bef450c991ed
+EBUILD erlang-21.1.1.ebuild 4448 BLAKE2B 7ef3e149f4564939a86ad407326ffdb4df53abe4b50ab916e598ec18f4090a800347b544d7845835b674ffc06c6f7bf3200cb71c71cab405a6a3e2743a6ebc1e SHA512 ffe1f1daeb279907c96c5711fbe81df26a8c21311c94a1d686b39122fe3c217e2c7e646471c3a3c3e7c0a689213f1732cf1c484be24e46ecdb496acbbd979c6e
 EBUILD erlang-21.1.ebuild 4451 BLAKE2B 51029e626d6cc24b9eacd6e3360890a3b01c2ca855e210b278a12c32f1e43be408709f9d2ebd177130fe52425e7645cdaa933070ac2db8392dd99ff5dcf8f243 SHA512 e4e3605c8943b5370e4745c87a49d946ff50414279d834e1567c2125d0c695ca18760c36d7f9e21d033804bc461ddfc857d315f014473de68529fa20e173566b
 MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
diff --git a/dev-lang/erlang/erlang-19.3.6.12.ebuild b/dev-lang/erlang/erlang-19.3.6.12.ebuild
new file mode 100644
index 000000000000..0e30f8b86d26
--- /dev/null
+++ b/dev-lang/erlang/erlang-19.3.6.12.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sctp? ( net-misc/lksctp-tools )
+	sys-libs/zlib
+	tk? ( dev-lang/tk )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+		virtual/glu )
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+		"${FILESDIR}/18.2.1-wx3.0.patch"
+		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+	)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+# Taken from the upstream build script, build_otp
+erlang_create_lib_configure_in() {
+	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
+			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
+	local sdirs=
+	for lib_app in ${bootstrap_apps}; do
+		case "${lib_app}" in
+			lib/*)
+				if [[ -f "${lib_app}/configure.in" ]]; then
+					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
+					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
+					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
+				fi;;
+			*)
+			;;
+		esac
+	done
+
+	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
+
+	sdirs=
+	for lib_app in lib/*; do
+		local is_bapp=false
+		for bapp in ${bootstrap_apps}; do
+			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
+		done
+		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
+			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
+			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
+			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
+		fi
+	done
+
+	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
+
+	rm -f lib/configure.in || die
+	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
+
+}
+
+# Taken from the upstream build script, build_otp
+erlang_distribute_config_helpers() {
+	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
+	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
+
+	local aclocal_master="./erts/aclocal.m4"
+	local install_sh_master="./erts/autoconf/install-sh"
+	local config_guess_master="./erts/autoconf/config.guess"
+	local config_sub_master="./erts/autoconf/config.sub"
+
+	for dir in ${aclocal_dirs}; do
+		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
+	done
+
+	for dir in ${autoconf_aux_dirs}; do
+		"${install_sh_master}" -d "${dir}" || die
+		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
+		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
+		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Determines which directories to recurse into with autoconf
+	erlang_create_lib_configure_in
+
+	# Move local autoconf files into the neccessary directories
+	erlang_distribute_config_helpers
+
+	java-pkg-opt-2_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+
+	econf \
+		--disable-builtin-zlib \
+		$(use_enable dirty-schedulers) \
+		$(use_enable hipe) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_with java javac) \
+		$(use_with odbc) \
+		$(use_enable sctp) \
+		$(use_enable smp smp-support) \
+		$(use_with ssl) \
+		$(use_with ssl ssl-rpath "no") \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable systemd) \
+		--enable-threads
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
+	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
+	local ERL_ERTS_VER="$(extract_version erts VSN)"
+	local MY_MANPATH="/usr/share/${PN}/man"
+
+	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
+	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	einstalldocs
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+
+	if use smp; then
+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+	else
+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	fi
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install" || die
+
+	insinto "${MY_MANPATH}"
+
+	doins -r "${WORKDIR}"/man/*
+
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
+	doenvd "${T}/90erlang"
+
+	if use emacs ; then
+		pushd "${S}" &>/dev/null || die
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+		popd &>/dev/null || die
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/erlang-20.2.ebuild b/dev-lang/erlang/erlang-20.2.ebuild
deleted file mode 100644
index 04a771dbceaa..000000000000
--- a/dev-lang/erlang/erlang-20.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="http://erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
-	epatch "${FILESDIR}"/${P}-libressl-2.6.1.patch
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-
-	cd erts && mv configure.in configure.ac && eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit") \
-		$(use_enable dirty-schedulers)
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS README.md
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		dohtml -A README,erl,hrl,c,h,kwc,info -r \
-			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
-	fi
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-20.3.2.ebuild b/dev-lang/erlang/erlang-20.3.2.ebuild
deleted file mode 100644
index 8f13394dbd27..000000000000
--- a/dev-lang/erlang/erlang-20.3.2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	virtual/glu
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-		"${FILESDIR}/18.2.1-wx3.0.patch"
-		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
-	local ERL_ERTS_VER="$(extract_version erts VSN)"
-	local MY_MANPATH="/usr/share/${PN}/man"
-
-	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
-	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${ED}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install" || die
-
-	insinto "${MY_MANPATH}"
-
-	doins -r "${WORKDIR}"/man/*
-
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-20.3.8.10.ebuild b/dev-lang/erlang/erlang-20.3.8.10.ebuild
new file mode 100644
index 000000000000..0e30f8b86d26
--- /dev/null
+++ b/dev-lang/erlang/erlang-20.3.8.10.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
+
+RDEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2:* )
+	odbc? ( dev-db/unixODBC )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sctp? ( net-misc/lksctp-tools )
+	sys-libs/zlib
+	tk? ( dev-lang/tk )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+		virtual/glu )
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+		"${FILESDIR}/18.2.1-wx3.0.patch"
+		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+	)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+# Taken from the upstream build script, build_otp
+erlang_create_lib_configure_in() {
+	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
+			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
+	local sdirs=
+	for lib_app in ${bootstrap_apps}; do
+		case "${lib_app}" in
+			lib/*)
+				if [[ -f "${lib_app}/configure.in" ]]; then
+					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
+					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
+					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
+				fi;;
+			*)
+			;;
+		esac
+	done
+
+	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
+
+	sdirs=
+	for lib_app in lib/*; do
+		local is_bapp=false
+		for bapp in ${bootstrap_apps}; do
+			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
+		done
+		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
+			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
+			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
+			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
+		fi
+	done
+
+	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
+
+	rm -f lib/configure.in || die
+	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
+
+}
+
+# Taken from the upstream build script, build_otp
+erlang_distribute_config_helpers() {
+	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
+	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
+
+	local aclocal_master="./erts/aclocal.m4"
+	local install_sh_master="./erts/autoconf/install-sh"
+	local config_guess_master="./erts/autoconf/config.guess"
+	local config_sub_master="./erts/autoconf/config.sub"
+
+	for dir in ${aclocal_dirs}; do
+		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
+	done
+
+	for dir in ${autoconf_aux_dirs}; do
+		"${install_sh_master}" -d "${dir}" || die
+		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
+		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
+		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Determines which directories to recurse into with autoconf
+	erlang_create_lib_configure_in
+
+	# Move local autoconf files into the neccessary directories
+	erlang_distribute_config_helpers
+
+	java-pkg-opt-2_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+
+	econf \
+		--disable-builtin-zlib \
+		$(use_enable dirty-schedulers) \
+		$(use_enable hipe) \
+		$(use_enable kpoll kernel-poll) \
+		$(use_with java javac) \
+		$(use_with odbc) \
+		$(use_enable sctp) \
+		$(use_enable smp smp-support) \
+		$(use_with ssl) \
+		$(use_with ssl ssl-rpath "no") \
+		$(use_enable ssl dynamic-ssl-lib) \
+		$(use_enable systemd) \
+		--enable-threads
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
+	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
+	local ERL_ERTS_VER="$(extract_version erts VSN)"
+	local MY_MANPATH="/usr/share/${PN}/man"
+
+	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
+	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	einstalldocs
+
+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
+	dosym \
+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
+		/usr/bin/erl_call
+
+	if use smp; then
+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
+	else
+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
+	fi
+
+	## Clean up the no longer needed files
+	rm "${ED}/${ERL_LIBDIR}/Install" || die
+
+	insinto "${MY_MANPATH}"
+
+	doins -r "${WORKDIR}"/man/*
+
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
+	doenvd "${T}/90erlang"
+
+	if use emacs ; then
+		pushd "${S}" &>/dev/null || die
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+		popd &>/dev/null || die
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/erlang-20.3.8.9.ebuild b/dev-lang/erlang/erlang-20.3.8.9.ebuild
deleted file mode 100644
index ac47c4ad59c7..000000000000
--- a/dev-lang/erlang/erlang-20.3.8.9.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		virtual/glu )
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-		"${FILESDIR}/18.2.1-wx3.0.patch"
-		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
-	local ERL_ERTS_VER="$(extract_version erts VSN)"
-	local MY_MANPATH="/usr/share/${PN}/man"
-
-	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
-	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install" || die
-
-	insinto "${MY_MANPATH}"
-
-	doins -r "${WORKDIR}"/man/*
-
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.0.2.ebuild b/dev-lang/erlang/erlang-21.0.2.ebuild
deleted file mode 100644
index 0986f06d7fb5..000000000000
--- a/dev-lang/erlang/erlang-21.0.2.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]	virtual/glu )
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-		"${FILESDIR}/18.2.1-wx3.0.patch"
-		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
-	local ERL_ERTS_VER="$(extract_version erts VSN)"
-	local MY_MANPATH="/usr/share/${PN}/man"
-
-	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
-	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${ED}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install" || die
-
-	insinto "${MY_MANPATH}"
-
-	doins -r "${WORKDIR}"/man/*
-
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
new file mode 100644
index 000000000000..28d0e2dc1553
--- /dev/null
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets"
+
+RDEPEND="
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	tk? ( dev-lang/tk:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/18.2.1-wx3.0.patch"
+	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
+	"${FILESDIR}/${PN}-custom-autoconf.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf
+	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
+	eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_with odbc)
+		$(use_enable sctp)
+		$(use_with ssl)
+		$(use_with ssl ssl-rpath "no")
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(use_enable pgo)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+		--enable-threads
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo; then
+		# disable distcc and ccache
+		export DISTCC_HOSTS=""
+		export CCACHE_DISABLE=1
+	fi
+
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${ED}" install
+
+	if use doc ; then
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init epmd
+	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch b/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch
deleted file mode 100644
index 89f8fc8b323d..000000000000
--- a/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From b5b6c7695c5377b5aa474d8620df7c3e9a1ba629 Mon Sep 17 00:00:00 2001
-From: Hans Nilsson <hans@erlang.org>
-Date: Thu, 11 Jan 2018 15:29:23 +0100
-Subject: [PATCH] crypto: Disable RSA sslv23 padding for LibreSSL >= 2.6.1
-
-Not supported in newer LibreSSL.
----
- lib/crypto/c_src/crypto.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
-index 6957d25774..9a3ea07c97 100644
---- a/lib/crypto/c_src/crypto.c
-+++ b/lib/crypto/c_src/crypto.c
-@@ -179,6 +179,12 @@
- # define HAVE_ECB_IVEC_BUG
- #endif
- 
-+#define HAVE_RSA_SSLV23_PADDING
-+#if defined(HAS_LIBRESSL)                                             \
-+    && LIBRESSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(2,6,1)
-+# undef HAVE_RSA_SSLV23_PADDING
-+#endif
-+
- #if defined(HAVE_CMAC)
- #include <openssl/cmac.h>
- #endif
-@@ -659,7 +665,9 @@ static ERL_NIF_TERM atom_rsa_oaep_md;
- static ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
- static ERL_NIF_TERM atom_rsa_padding;
- static ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
-+#ifdef HAVE_RSA_SSLV23_PADDING
- static ERL_NIF_TERM atom_rsa_sslv23_padding;
-+#endif
- static ERL_NIF_TERM atom_rsa_x931_padding;
- static ERL_NIF_TERM atom_rsa_pss_saltlen;
- static ERL_NIF_TERM atom_sha224;
-@@ -1064,7 +1072,9 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
-     atom_rsa_pad = enif_make_atom(env,"rsa_pad"); /* backwards compatibility */
-     atom_rsa_padding = enif_make_atom(env,"rsa_padding");
-     atom_rsa_pkcs1_pss_padding = enif_make_atom(env,"rsa_pkcs1_pss_padding");
-+#ifdef HAVE_RSA_SSLV23_PADDING
-     atom_rsa_sslv23_padding = enif_make_atom(env,"rsa_sslv23_padding");
-+#endif
-     atom_rsa_x931_padding = enif_make_atom(env,"rsa_x931_padding");
-     atom_rsa_pss_saltlen = enif_make_atom(env,"rsa_pss_saltlen");
-     atom_sha224 = enif_make_atom(env,"sha224");
-@@ -4449,8 +4459,10 @@ static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NI
- 			opt->rsa_padding = RSA_PKCS1_PADDING;
- 		    } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
- 			opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
-+#ifdef HAVE_RSA_SSLV23_PADDING
- 		    } else if (tpl_terms[1] == atom_rsa_sslv23_padding) {
- 			opt->rsa_padding = RSA_SSLV23_PADDING;
-+#endif
- 		    } else if (tpl_terms[1] == atom_rsa_x931_padding) {
- 			opt->rsa_padding = RSA_X931_PADDING;
- 		    } else if (tpl_terms[1] == atom_rsa_no_padding) {
-@@ -4516,7 +4528,10 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
- #endif
-     PKeyCryptOptions crypt_opt;
-     ErlNifBinary in_bin, out_bin, tmp_bin;
--    size_t outlen, tmplen;
-+    size_t outlen;
-+#ifdef HAVE_RSA_SSLV23_PADDING
-+    size_t tmplen;
-+#endif
-     int is_private = (argv[4] == atom_true),
-         is_encrypt = (argv[5] == atom_true);
-     int algo_init = 0;
-@@ -4596,6 +4611,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
- 	if (crypt_opt.signature_md != NULL
- 	    && EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) <= 0)
- 		goto badarg;
-+#ifdef HAVE_RSA_SSLV23_PADDING
- 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
- 	    if (is_encrypt) {
- 		RSA *rsa = EVP_PKEY_get1_RSA(pkey);
-@@ -4607,9 +4623,11 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
- 		in_bin = tmp_bin;
- 	    }
- 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
--	} else {
-+	} else
-+#endif
-+                {
- 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) <= 0) goto badarg;
--	}
-+        }
- #ifdef HAVE_RSA_OAEP_MD
- 	if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
- 	    if (crypt_opt.rsa_oaep_md != NULL
-@@ -4728,6 +4746,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
- #endif
- 
-     if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
-+#ifdef HAVE_RSA_SSLV23_PADDING
- 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
- 	    RSA *rsa = EVP_PKEY_get1_RSA(pkey);
- 	    unsigned char *p;
-@@ -4745,6 +4764,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
- 		i = 1;
- 	    }
- 	}
-+#endif
-     }
- 
-     if (tmp_bin.data != NULL) {
--- 
-2.16.0
-
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 794c945bef19..8546ccac15ef 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,6 +12,7 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59
 DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415
 DIST go1.10.2.src.tar.gz 18308678 BLAKE2B 5f16757f879e9be9d2e936bc5e3cefcfd32914dbe7def8252b20ac647c90cfae09dfd7ff782f55cee4b3fecda6cc88c547f20087b571dbd06bc7600510c788bc SHA512 754e60bce1ea3479ebb57bbbb625e3d7875a151e7a6d7a1067478a9e45bde5423f47123d084832bb838acf7675a9d05057b76c1d773e43cae0fb4e7a52acf4a9
 DIST go1.10.3.src.tar.gz 18323736 BLAKE2B f07ea774378eb25e28fc29ce6d8d7ed84227d4b93bfa93d38a071fe294da30c3cdc3a559d643e7379873df56b0e2731dbd772e385ffcb4b2e93819db3b4e33f2 SHA512 fd2bd5fcb5c6d0a5336c4b1d2cacb368edbb01359297a83bdedc53f6018642598232f00633fc60fde879050f5f26a810c828d46b5d6626cbcc0702d93ad33fbb
+DIST go1.10.4.src.tar.gz 18331174 BLAKE2B e16998d81d286f132894fefd31f4139f757b7da3dfc829c389e41ef770bed22b3c9ae7bcf190fb4c83da16cf8e8c34681cfdc5bbc786f9036710e821c9bbd483 SHA512 ead2c06d903670ff4530748aa2fa6a1140fdf32cf3b8d74cd7d6e046af73c79fd5f98d2188062e6845e5c0513c080ed7079a210720c30338cb8730b95aede9f5
 DIST go1.11.1.src.tar.gz 21097206 BLAKE2B 12303f57a92ec64badffea9e98a0361f48b844d423f3ed454ba4bfdd367425e7b318de1cf9b3e7835585f6dbb01f5c07bfb43adbfcc90a590b35984752ef8d3c SHA512 9c19f40b24f2180563705511a5692932c0db3585939053e6d78eea1f394902d37f05b0386f0e7d0c0266178de7e9bd7b003324ed232ce2e5050c9faafafdd979
 DIST go1.11.src.tar.gz 21091932 BLAKE2B 029b1c43b6244ab320b24fccca2bac693a0df0f975da2880a24e85fafbd7d6c836f63c609f1df44fb3eacc1c66c3d147858b7a2b9c0c370bb8fdbc8614b35713 SHA512 2758b7924b4b8cffc30b56fbf039b8e23d1a3c42506ed4997bd64531ba742e2c60e95d1fa70cae2ccda45d1959fadccfd2404af87d962530e4b1d3556c4aaf43
 DIST go1.9.6.src.tar.gz 16397247 BLAKE2B 36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd SHA512 f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2
@@ -19,6 +20,7 @@ DIST go1.9.7.src.tar.gz 16401688 BLAKE2B f6fa7b7171595f6bb2b1860c10a34c386b78150
 EBUILD go-1.10.1.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
 EBUILD go-1.10.2.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
 EBUILD go-1.10.3.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
+EBUILD go-1.10.4.ebuild 5653 BLAKE2B 06e491cb9a25870709a9cc04f6e5d45121153bc02b9ff9f6390a006ba175550a2b3ca0adf4f9245b6726ae0b9db39146547f764dd0d466e04fb6552b7f0a26d6 SHA512 30f3f945be04c191e44cbaf2fff47a89cbe910bb2230bafe2817c39cfe4f3da7ea7ad586fa2752bdf378a1e7334e2fd6f392ffeb6d9b3d924c4be765b89a628e
 EBUILD go-1.11.1.ebuild 5653 BLAKE2B 06e491cb9a25870709a9cc04f6e5d45121153bc02b9ff9f6390a006ba175550a2b3ca0adf4f9245b6726ae0b9db39146547f764dd0d466e04fb6552b7f0a26d6 SHA512 30f3f945be04c191e44cbaf2fff47a89cbe910bb2230bafe2817c39cfe4f3da7ea7ad586fa2752bdf378a1e7334e2fd6f392ffeb6d9b3d924c4be765b89a628e
 EBUILD go-1.11.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
 EBUILD go-1.9.6.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
diff --git a/dev-lang/go/go-1.10.4.ebuild b/dev-lang/go/go-1.10.4.ebuild
new file mode 100644
index 000000000000..3eecca0eb622
--- /dev/null
+++ b/dev-lang/go/go-1.10.4.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index a3fda4e60f62..76bad2df7673 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,10 +1,4 @@
-DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 BLAKE2B b323347ce98ecbc412cbd8683f8236b38b048e331c2b41d74874acdf17cc8b132211c15a2d29f8b98b7238e0e4e7cc1492b8e0a5ade4d348eb679fd322a22b2d SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef
-DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 BLAKE2B 8a0792150a30ee552d1877e8736e25b0554ac68aaa7074e296886ea445c31a4b1593a438220da7bca45f49b2e49b0e4848f1e4ab852502bd3865632d378439c8 SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c
 DIST mercury-extras-14.01.1-gentoo-patchset-1.tar.gz 3847 BLAKE2B ce30b98c5cfe96ad67bd6fa5a8d03ebdfe6f4539e39a970ce48eb794b663d7164ae38a619beb4ce85d6cc3a1e3b5a5ee8fa59b6acd00dc6d23670fceac87734e SHA512 2afad01fb778d0e84e8d83a507b37080974840c81408827559df455d8082552131cdbfdae59c77f2f7bc3a643a087f1563c6c67d527f7b0bdef3412385bf4818
-DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f
-EBUILD mercury-extras-13.05.2.ebuild 4700 BLAKE2B db54c99ed0c1fd44467ace60c83d245208a52911fc84eaf8a4af490e740f9ab53317af8e1bac353048de31e9fb2b16e26c770464c0033080db842579d65a93d3 SHA512 df9663114548982f6f3453e8e1550712faa09093de7a2f24db4102ad4ac0856e2510cdb1f2841d6cec03f98311b0c170e0818507b7b7d7cd6b9e8dc22d13a33f
 EBUILD mercury-extras-14.01.1.ebuild 4599 BLAKE2B ba26033f215cf28b7b2aa28180396fb65e39cd281b08fb4ac877744a6fb97af85f89f7ec0ed3ff2dd10162d5813f1be16f2f6bca5248868a39d72881dfa498d5 SHA512 c451c8d2b49b1eeccfc896d9012d7ab67147767f52c8aae52fda013a8ca26de758d2cc246a1d40d75de08623760b57529f56c2edef5ecaaeaf1bc0dbc5788964
-EBUILD mercury-extras-14.01.ebuild 4582 BLAKE2B c2de2efefcc2ca6e36d6dff317e3bde8d33d0e8679bf885227fb2c36e40a5f0beceddacdc8cf4c761eaa1d9740ca327567ab8a9c83b3ac475c0fd4d51e2dbe91 SHA512 4f9d352fe306c95f3cf22acfcd9ac6623c51d4575140452cca095eebdf52271bf3061da52c735ad0d00d943792f332711de46b67773a26bab1e2d1c44813723a
 MISC metadata.xml 240 BLAKE2B 6b5ab0d76c5748af7bd1800d11864869d7365b8d53e2fd2ec66c1092dd1fdac8461b20c029ffe835357542ca69f789ce867988d64c43019e02fe9e3691f0f9bd SHA512 7cd99ce62ca4f9307fa7dfdbfd0ff9d8ff7485c58cd08cd684065aca4b570f8655587425f6a240453a9e86452de41f26f8b82aa81c023764d0beb47daa1b15d3
diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
deleted file mode 100644
index a3abc55dadf1..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils multilib
-
-PATCHSET_VER="3"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-
-RDEPEND="~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	ncurses? ( sys-libs/ncurses )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	if use odbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
-	fi
-
-	cd "${S}"
-	sed -i	-e "s:references:references solver_types/library:" \
-		-e "s:windows_installer_generator::" \
-		Mmakefile || die "sed default packages failed"
-
-	if use cairo; then
-		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_cairo lex \\\\:" Mmakefile \
-			|| die "sed cairo failed"
-	fi
-
-	if use glut; then
-		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_glut lex \\\\:" Mmakefile \
-			|| die "sed glut failed"
-	fi
-
-	if use opengl; then
-		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_opengl lex \\\\:" Mmakefile \
-			|| die "sed opengl failed"
-	fi
-
-	if use tcl && use tk; then
-		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_tcltk lex \\\\:" Mmakefile \
-			|| die "sed tcltk failed"
-	fi
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile \
-			|| die "sed odbc failed"
-	fi
-
-	if use ncurses; then
-		sed -i -e "s:complex_numbers:complex_numbers curs curses:" Mmakefile \
-			|| die "sed ncurses failed"
-	fi
-
-	if ! use xml; then
-		sed -i -e "s:xml::" Mmakefile \
-			|| die "sed xml failed"
-	fi
-
-	sed -i -e "s:@libdir@:$(get_libdir):" \
-		dynamic_linking/Mmakefile \
-		|| die "sed libdir failed"
-
-	# disable broken packages
-	sed -i -e "s:references::" Mmakefile \
-		|| die "sed broken packages failed"
-}
-
-src_compile() {
-	# Mercury dependency generation must be run single-threaded
-	mmake \
-		-j1 depend || die "mmake depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/base64
-		doins base64/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m || die
-
-		insinto /usr/share/doc/${PF}/samples/error
-		doins error/* || die
-
-		insinto /usr/share/doc/${PF}/samples/fixed
-		doins fixed/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/gator
-		doins -r gator/* || die
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/log4m
-		doins log4m/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/monte
-		doins monte/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/net
-		doins net/*.m || die
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/* || die
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/* || die
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m || die
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/* || die
-			doins graphics/samples/gears/* || die
-			doins graphics/samples/maze/* || die
-			doins graphics/samples/pent/* || die
-		fi
-
-		if use opengl && use tcl && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m || die
-		fi
-
-		if use ssl; then
-			insinto /usr/share/doc/${PF}/samples/mopenssl
-			doins mopenssl/*.m || die
-		fi
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
deleted file mode 100644
index e6be7669abd1..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-14.01.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-PATCHSET_VER="1"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-
-RDEPEND="~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	glut? ( media-libs/freeglut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	ncurses? ( sys-libs/ncurses:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)
-	tcl? ( tk? (
-			dev-lang/tcl:0
-			dev-lang/tk:0
-			x11-libs/libX11
-			x11-libs/libXmu
-		)
-	)"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs()
-{
-	echo   "base64
-		cgi
-		complex_numbers
-		dynamic_linking
-		error
-		fixed
-		lex
-		moose
-		posix
-		solver_types/library
-		$(use ncurses && echo curs curses)
-		$(use glut && echo graphics/mercury_glut)
-		$(use opengl && echo graphics/mercury_opengl)
-		$(use tcl && use tk && echo graphics/mercury_tcltk)
-		$(use odbc && echo odbc || use iodbc && echo odbc)
-		$(has_version dev-lang/mercury[-minimal] && echo references)
-		$(usev xml)"
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	cd "${S}"
-	if use odbc; then
-		cp odbc/Mmakefile.odbc odbc/Mmakefile
-	elif use iodbc; then
-		cp odbc/Mmakefile.iodbc odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Mercury dependency generation must be run single-threaded
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		depend || die "mmake depend failed"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		mmc --make libmercury_cairo \
-			|| die "mmc --make libmercury_cairo failed"
-	fi
-}
-
-src_install() {
-	local MERCURY_PKGS="$(mercury_pkgs)"
-
-	# Compiling Mercury submodules is not thread-safe
-	mmake -j1 \
-		SUBDIRS="${MERCURY_PKGS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	if use cairo; then
-		cd "${S}"/graphics/mercury_cairo
-		INSTALL_PREFIX="${D}"/usr \
-		mmc --make libmercury_cairo.install \
-			|| die "mmc --make libmercury_cairo.install failed"
-	fi
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/base64
-		doins base64/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m || die
-
-		insinto /usr/share/doc/${PF}/samples/error
-		doins error/* || die
-
-		insinto /usr/share/doc/${PF}/samples/fixed
-		doins fixed/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/gator
-		doins -r gator/* || die
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/log4m
-		doins log4m/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/monte
-		doins monte/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/net
-		doins net/*.m || die
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/* || die
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/* || die
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m || die
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/* || die
-			doins graphics/samples/gears/* || die
-			doins graphics/samples/maze/* || die
-			doins graphics/samples/pent/* || die
-		fi
-
-		if use opengl && use tcl && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m || die
-		fi
-
-		if use ssl; then
-			insinto /usr/share/doc/${PF}/samples/mopenssl
-			doins mopenssl/*.m || die
-		fi
-
-		ecvs_clean
-	fi
-
-	dodoc README || die
-}
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 47d0e278db6a..ebb69e5f84e9 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,11 +1,5 @@
 AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
-DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 BLAKE2B c22b3c21a53d10e564b703adbcde2d7986aecad378fc7f904642ad1c59e7de8a1a34c302309a03f35927782eaaa36d9b3f639fd654750d36c1af612b97cb35af SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f
-DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 BLAKE2B acfc49facf63c3ce4dc50463a5cd38fbfe45bc463b619c1e01d653bfe13172ce9773a3c652c0ad9f1f929ad7806d0e69327249575a2065b77a9ac02de2188469 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e
 DIST mercury-14.01.1-gentoo-patchset-3.tar.gz 4676 BLAKE2B 05a927ff9785fc03a94e56e2abc50f38692dbc81462e107be2b1982ea4a09916066420bef2a95c505c1a475aaa318a1679a3f377a3ac100e57493c987768d10f SHA512 acf3c04dbcf2700e6543d4a0085bad5de8e752c77f1a1f2d456ec57121e956e41cb22438a61ce602c9a355e9ad943ec27ae73c35433599e3252f2b382ee432d5
-DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f
-EBUILD mercury-13.05.2.ebuild 5152 BLAKE2B b8dc2001cb09c8e2d650c5da88e547033deb0658a25b622722cbabed16d93a13a571b62ff19b67c5abf576ceab44c11641d934bcd88e646cd2c54779d4532953 SHA512 6f8626feb482d14df74dfc92b2ede7dcf2bf20123d35844ccb6be82d930a89aefa50595f9e06ba9f4f3eeec37facaea2001bcc27452106f398b72db1d24d5a42
-EBUILD mercury-14.01.1.ebuild 5641 BLAKE2B 8cd31808725d2ff9a7c0d514354490ffeccaa983849f1ba680103fd7a691da469501d8da7aed37be1281309f11e92762f874fbedd2b02bee6b1b4e1629047e29 SHA512 d8f9585ab946319246d43df724a4c63dbb608ebc93f123ca68038211bbb210c31247212c8a0029a561c932c2edf3aa336a1fca7c2058007bef46452e64f75a3c
-EBUILD mercury-14.01.ebuild 5246 BLAKE2B 2dea0f6f2c474e48e3a189ffd366fb5501bcfb1fc1d82782a5a3f65a3a59a2ab32542b91a65375cc682da66df955cc5e78690b92f5b4d347c9c25b54c2b04ae0 SHA512 11ea88c393886743c926f0ee5fb19f6e2b1ce9386f1c2a5dcd6d9afde23a70d63af31217f3148ed26359300c180a6ceadbebc9be6d52f290d6bd108eed5c79e1
+EBUILD mercury-14.01.1.ebuild 5776 BLAKE2B c10d6796feb3444789d94f197cd3a749c56397bb44bcca1eadcaed4292262dadb93041ebfa3937cbdc113d2632a9b35302158f341b9eb1549ac79eb706407b2d SHA512 719728c2b2aca118f788fba427cc6dee1a72f670c1119924f1054c6edefed6e14c766555f96260e2111702f9dc26a52e26274a6d9b7d764683738352033b0691
 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf
diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
deleted file mode 100644
index 99339c2a2bc4..000000000000
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		--without-hwloc \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}-mmc
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_LDFLAGS='${LDFLAGS}' \
-			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index ff23c0e2a730..f09175693e3e 100644
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="debug emacs erlang examples java mono profile readline threads trail"
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
 
 DEPEND="!dev-libs/mpatrol
 	!dev-util/mono-debugger
@@ -25,7 +25,8 @@ DEPEND="!dev-libs/mpatrol
 	readline? ( sys-libs/readline:= )
 	erlang? ( dev-lang/erlang )
 	java? ( >=virtual/jdk-1.6:= )
-	mono? ( dev-lang/mono )"
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
 
 RDEPEND="${DEPEND}
 	emacs? ( virtual/emacs )"
@@ -87,6 +88,7 @@ src_compile() {
 	# Build Mercury using bootstrap grade
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX="" \
 		|| die "emake failed"
 
 	# We can now patch .m Mercury compiler files since we
@@ -106,6 +108,7 @@ src_compile() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		compiler || die "emake compiler failed"
 
 	# The default Mercury grade may not be the same as the bootstrap
@@ -114,6 +117,7 @@ src_compile() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		default_grade || die "emake default_grade failed"
 }
 
@@ -158,6 +162,7 @@ src_install() {
 	emake \
 		PARALLEL="'${MAKEOPTS}'" \
 		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
 		DESTDIR="${D}" \
 		INSTALL_PREFIX="${D}"/usr \
 		INSTALL_MAN_DIR="${D}"/usr/share/man \
diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
deleted file mode 100644
index 3ef81523edac..000000000000
--- a/dev-lang/mercury/mercury-14.01.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang examples java minimal readline threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/scripts/Mmake.vars.in \
-		|| die "sed libdir failed"
-
-	cd "${S}" || die
-	eautoconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		--without-hwloc \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Build Mercury using base llds grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		|| die "emake failed"
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		epatch "${WORKDIR}"/${PV}-mmc
-	fi
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/file_util.m \
-		"${S}"/compiler/make.program_target.m \
-		|| die "sed libdir failed"
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		compiler || die "emake compiler failed"
-
-	# The default Mercury grade may not be the same as the grade used to
-	# compile the llds base grade. Since src_test() is run before
-	# src_install() we compile the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
-			    EXTRA_CFLAGS='${CFLAGS}' \
-			    EXTRA_LDFLAGS='${LDFLAGS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "emake install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-	if use erlang; then
-		dodoc README.Erlang || die
-	fi
-
-	if use java; then
-		dodoc README.Java || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples
-		doins samples/{*.m,README,Mmakefile} || die
-		doins -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types || die
-
-		if use java; then
-			doins -r samples/java_interface || die
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index de92b5079396..ba1f4638f204 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -17,9 +17,9 @@ DIST php-7.3.0RC3.tar.xz 11927028 BLAKE2B b88b2abeac532a5c0de6ee92982514e78ef6ef
 EBUILD php-5.6.38.ebuild 22798 BLAKE2B 8bef3ae060eeb63fcc492a7c8c8a8b642b84f46ef7ed29e69badeecf26c0f853e974c8f224739875fee1b345987775c05f451908d4731550eab156993a55d23a SHA512 0a97787e0b80643e620815c32b29a56063ddb92c31516ad34f89be9769cc3cf9ba07eb0271d433f330d6493df2b1a63af29bf8b7ede81bdd3fbc2751be5ce561
 EBUILD php-7.0.32.ebuild 22008 BLAKE2B 26829e446d9608f52212a32e0092d83d65966a270a8e4d35f8ac4559f0679a4ff955848eb9c9ae3f7d25300d347a226adc1b71d1b322d09fe512188360f2182f SHA512 a9fdfe7a831fa4ad71ddd4bae29582053ee86a824dc93f02581a3add372561f34d457f2c9198c72c619b10666b679d3f929f6aaf309c2d446a60e9447e8d3cc2
 EBUILD php-7.1.22.ebuild 21715 BLAKE2B 13f34b9730b2f0f22cfcbf26af6575259d08d61f158b0c9bd9b6e7756326037e32e92992ec510bc1649eca0beb2044f820888c7e9b1fa48174974e754947f181 SHA512 187fd61cf4df1cda5c53e14aea0ac327c5e9fab193843165de2afe7e13fdb5b8be1ebab70fcb776dcb8ebe1966feedcc075e589c4ddf1f9f6d3d58f45519a9d4
-EBUILD php-7.1.23.ebuild 21727 BLAKE2B b35aa713090ba294565fee4d2c6edf5ede683083f349b8cb15a3bbed1d4f3761ca5d672891584b9853cd1c7f802898bf604da3d5508cd5c2ad367bb47a2f742d SHA512 8096b4d259c06c0ea3afff51ece85b6d0a7626676fc09c1df027b4f2ce17c6b8ff7d99dfdf8781d3bdc2ed13460e18d4dcdcc9eb7c1149b28687c6b0be976f40
+EBUILD php-7.1.23.ebuild 21933 BLAKE2B 4080e9f9bea273c051f26db5ccd8781f5b448cc800999f71e527f7e0a243f84dd5fc420aa9b6ae86d293588e8de13644c14a48212cc77a3197801c4bb118cb19 SHA512 dcc63f2e7373a9b57a2d3bb010a125d3ce74b7bcb030490b4051853cac78964ac59bd7d1309c5c8f1d11cf2b52615c075c846575528eb6968422736b08add279
 EBUILD php-7.2.10.ebuild 22246 BLAKE2B e06f62b7f5563d48d9e381b6ab44cc72e9e63831e209ee638321e93b90a1f42abb9a41b757629b45cfa610f7e985f40fbd002c5121acf86d862f8d648ee16f44 SHA512 c662c27b70663131899ffe595476bff326a337d584855e27f62480bf8824e3a3f49caee7c80b4f3aa19ccc40d1f95f3a9c4518621cbd43abd751981ba334e190
-EBUILD php-7.2.11.ebuild 22258 BLAKE2B 3ae1771b15208cdba10d534f69bfcea8ac4930a5f7e31d7bd976dfb7904fe3e60ae80b44c0ca65fa300a1d086587c3754821411059942f8db9df7d4cb6758f0b SHA512 c6aca341ff51f7fd5437b2578e9ce7ee4055a67603c4ad9a25f07ca030c75d58c627db6cdb979aa5ab9619051d1f3de4155cded38e4a17b09562a5842ea5a96a
+EBUILD php-7.2.11.ebuild 22464 BLAKE2B 43c52b71820962862ce7e208e45bea5180014075894125075fbfd0f217412f3cbe5b6bf6642e76ad9145d2cb26a1ae94b6880186c86a196eac851d97f10fe000 SHA512 44b1f8a4eb74480d878fc8e8f9a1eb1ed8cdc35c9f4091cce2b6668d0b9afa86538e7dab5271ef9e6ea07d71e0e3cf4d9325297c3abfe2a63a754134166c02f1
 EBUILD php-7.3.0_rc2.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7
-EBUILD php-7.3.0_rc3.ebuild 22329 BLAKE2B 7841e7d459849f06a47128e2c0a8f1997b3d1b6be02081d3dafa624f7ea319da13974cd904ce772260c8e001ae5c594508cf5be9f0426d8fd5da9ff6107111ca SHA512 f81a2d251ded29e6f91f72c736c27f44e8f8f6ef9cdfe57d7b8fefc0c3c27869a83972355d03532db95ba0c9c0b3322870174b7c8c0e57a1f9ea8ec4c40ca4c7
-MISC metadata.xml 2525 BLAKE2B 38170625904c1d6cb24a0bfef829b9e819d1ad3de42a69452205520620aaeffef7e2cc3a86a836940a7f0d19d5dcddfd256b970c9d5546c484bd1cba17484154 SHA512 666320279375242858d994456da112111b994445f6c1c5b379294b1d0b981fd103cc52b4c2dfcfb1b1eb49de77d502c8b7cbfb4c1c7ebe1602fdf9fd3b3a8242
+EBUILD php-7.3.0_rc3.ebuild 22535 BLAKE2B add28e6c6a24b502a36417c3afb5b71995f510ecff7ec65380d9413aede5a2f182e7caaf31a4a0e1cb8299a3059f1a5aa70a16ab3f4135a85028bc3793445b8e SHA512 2ba2c9420d73355e3cdedbf46de520933b7cace0f73396f2b999ae2eaa6d64e1d3816b1a3054669f04d03e69453bd80673d9b0ad66c1b920f6bf59faa5daa8f7
+MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4
diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 609c0dce3af1..d7d65eb7f92f 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -7,18 +7,22 @@
   </maintainer>
   <use>
     <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
+    <flag name="bcmath">Add support for libbcmath</flag>
     <flag name="cli">Enable CLI SAPI</flag>
     <flag name="coverage">
       Include gcov symbols for test coverage and lcov reports. Only
       useful for extension developers, and requires GCC.
     </flag>
+    <flag name="ctype">Enable ctype functions</flag>
     <flag name="embed">Enable embed SAPI </flag>
     <flag name="enchant">Add supports Enchant spelling library. </flag>
     <flag name="fileinfo"> Add fileinfo extension support</flag>
     <flag name="filter">Add filter extension support</flag>
+    <flag name="flatfile">Add dbm support for flat files</flag>
     <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
     <flag name="gd">Adds support for gd (bundled with PHP)</flag>
     <flag name="hash">Enable the hash extension</flag>
+    <flag name="inifile">Add dbm support for .ini files</flag>
     <flag name="json">Enable JSON support</flag>
     <flag name="ldap-sasl">Add SASL support for the PHP LDAP extension</flag>
     <flag name="libmysqlclient">
@@ -31,6 +35,7 @@
     <flag name="opcache">
       Enables built-in opcode cache, replacing pecl-apc et al.
     </flag>
+    <flag name="pcntl">Add support for process creation functions</flag>
     <flag name="pdo">Enable the bundled PDO extensions</flag>
     <flag name="phar">
       Enables the phar extension to provide phar archive support
@@ -41,15 +46,23 @@
     <flag name="session-mm">
       Include <pkg>dev-libs/mm</pkg> support for session storage
     </flag>
+    <flag name="sharedmem">Add support for shared memory use</flag>
+    <flag name="simplexml">Support for SimpleXML</flag>
     <flag name="sodium">
       Enable support for crypto through <pkg>dev-libs/libsodium</pkg>
     </flag>
+    <flag name="sybase-ct">Add support for Sybase-CT</flag>
+    <flag name="sysvipc">
+      Support for System V-compatible inter-process communication
+    </flag>
+    <flag name="tokenizer">Add support for the PHP file parser</flag>
     <flag name="tokyocabinet">
       Enable support for <pkg>dev-db/tokyocabinet</pkg> db backend</flag>
     <flag name="xmlreader">Enable XMLReader support</flag>
     <flag name="xmlwriter">Enable XMLWriter support</flag>
     <flag name="xslt">Enable the XSL extension</flag>
     <flag name="vpx">Enable webp support for GD in php-5.x</flag>
+    <flag name="wddx">Add support for Web Distributed Data eXchange</flag>
     <flag name="webp">Enable webp support for GD in php-7.x</flag>
     <flag name="zip-encryption">Enable ZIP file encryption from <pkg>dev-libs/libzip</pkg></flag>
   </use>
diff --git a/dev-lang/php/php-7.1.23.ebuild b/dev-lang/php/php-7.1.23.ebuild
index 4f54e9a7a856..b5d12b4aed60 100644
--- a/dev-lang/php/php-7.1.23.ebuild
+++ b/dev-lang/php/php-7.1.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic eapi7-ver systemd
+inherit flag-o-matic eapi7-ver systemd autotools
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
@@ -219,6 +219,11 @@ src_prepare() {
 	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
 		sapi/fpm/php-fpm.conf.in \
 		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-lang/php/php-7.2.11.ebuild b/dev-lang/php/php-7.2.11.ebuild
index 761d9460704b..818e210d1a58 100644
--- a/dev-lang/php/php-7.2.11.ebuild
+++ b/dev-lang/php/php-7.2.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic eapi7-ver systemd
+inherit flag-o-matic eapi7-ver systemd autotools
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/"
@@ -224,6 +224,11 @@ src_prepare() {
 	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
 		sapi/fpm/php-fpm.conf.in \
 		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-lang/php/php-7.3.0_rc3.ebuild b/dev-lang/php/php-7.3.0_rc3.ebuild
index 38dbc82aca6b..865dac62201a 100644
--- a/dev-lang/php/php-7.3.0_rc3.ebuild
+++ b/dev-lang/php/php-7.3.0_rc3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic eapi7-ver systemd
+inherit flag-o-matic eapi7-ver systemd autotools
 
 MY_PV=${PV/_rc/RC}
 DESCRIPTION="The PHP language runtime engine"
@@ -226,6 +226,11 @@ src_prepare() {
 	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
 		sapi/fpm/php-fpm.conf.in \
 		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
 }
 
 src_configure() {
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index bef242bf00d1..3cd5e8d4b39f 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,10 +1,4 @@
-AUX qu-prolog-10.0-associated-item.patch 335 BLAKE2B f80af03e270ca823452a8fe88e83d915d394d9ba7d043d3afdee5bdb7bfdce1bdb1b268a13b65c024f75005b78126f1f0ae04c6eda7aba234acc47fd51a64298 SHA512 3b4cefaecacb1e1fb8df8804f198563e99ee69b2ffbdc421e56fb34faeb5ed1a87809b4acf917999ac5e25982e522c8b08775cf9bcf1c01675a77521d372913f
-AUX qu-prolog-10.0-configure.patch 518 BLAKE2B f63f876b8b3048e74092bf398df89f951e976019e548e3563506c20aa69e9a08bd7d21a8a13240c7416a0b5edd592c8d86b43e13586acaa2366770729cf578b7 SHA512 85e484b8086054166740dd757b95547179afa5c199c240b43dcef531aeedd812f4fcb35003a888708c90db5d7bb1ffd22cf9bef1fd31f339ec0894ddde365cd9
-AUX qu-prolog-10.0-gcc6.patch 906 BLAKE2B 5d1e1b7632faa993c2a0bfc087cce0d73ed33e65997615aec0c053dbf2905e58506fbeed3934a4944ad0309bfbffc748285a75095ef5483703e33250cb617cc1 SHA512 bbf5a1d5749964bc5c0e8e530de3729bf1666e541f908ddc66debc696a6b6b4dc55373ef788348f02e33aa58afa5a350f7be866bfb1e4c31c917f334e9dc9ca6
-AUX qu-prolog-10.0-qt5.patch 1037 BLAKE2B d66f62aee4ad43eb400d33895c5222b6ccaa407dbb33d44326f7d29375b57ee846d90d48708915a31a9586481f354e65c93b2f7da06ccd2e49ab984850ec74e7 SHA512 8c82d180adfc290885273dd4dafbbb7cdcca3c2854854401f1123dd562699490c8fd77a54a5707425c852871091074ed4bbefa96b53782dbb06b6c1c57dfce53
 AUX qu-prolog-10.1-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
-DIST qp10.0.tar.gz 1521469 BLAKE2B ab293e5b14529c3714ba123c5f37f7fe2ac4f6238ebaca00fa7781407ccf7df67515b1b6b3c80a358fae5988c799bf16b8f02eb52a9b3a690b155a150ac90063 SHA512 491ef9cc01f0d34163d47163b3103dcbd52cc5672f64057b898c2d234384ac2e3b64b4e59a1795765ff92de4c97ebdb11a82d394213685c387e4dd7d598c5c60
 DIST qp10.1.tar.gz 1521610 BLAKE2B a4d6d277a35284accfff1afd70901218df198b2b33f5c95ca5649bf06abcb153890f2f21b0e8d62ed93484b452a230074f93c983ab231c8fc58b51a29119d838 SHA512 8fb30fcbc086384d7e265695a7d24a9599ed306b5da0ea964e60aef4bb01c7b6789fc361449f908736c57d86c204e574d745f277d5b0ec2b725a8eca52f14f1a
-EBUILD qu-prolog-10.0-r1.ebuild 2060 BLAKE2B fd1e87efd1d94a7e182b0a0e5d9d3c1e7a47dc14c63c1ccc53c3bf0f96aff4124300eab160c608a583b65eec0a63fb0f7f95e19cfc31650657e6a20985c50b92 SHA512 ed36521f4ac5148fa11526bd07037b46daa4bb3027c8e4e8d8b089397611e975abb334842d6717a7b513cdfcb8f813a85beaf3226ee4385742e0768f34fd606c
 EBUILD qu-prolog-10.1.ebuild 1944 BLAKE2B fe102881c65e68fd6003c37da96195ef4f8f709c296f4679531b7c12e336182efacd29792103a0c8c5761e9adc53079d1615fdd8365de448f58c406f5027937c SHA512 c3119e71e850850ab4d7689f70da79de78ad7aa34386880c641bb20c1765dddf0379bf0371e0e831e7a9c08adc17efb7e44e4a79fed33894f24935f628c72e59
 MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch
deleted file mode 100644
index d5e992d51c26..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qp10.0.orig/src/objects.h	2016-06-07 02:54:35.000000000 +0200
-+++ qp10.0/src/objects.h	2016-10-03 18:26:49.924782008 +0200
-@@ -1210,7 +1210,7 @@
-        << this->getName() << "\" ";
-   
- #ifndef WIN32
--  switch (hasAssociatedItem())
-+  switch (tag & AssociatedMask)
-     {
-     case AssociatedNone:
- 	    std::cerr << "(no info)";
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch
deleted file mode 100644
index b3c109613912..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- qp10.0.orig/configure	2016-06-07 02:54:42.000000000 +0200
-+++ qp10.0/configure	2016-10-03 18:30:22.360786524 +0200
-@@ -2256,12 +2256,16 @@
- #
- # Check for addtional command line options.
- #
--DEBUGGING=" -DNDEBUG "
- # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then :
--  enableval=$enable_debug;  DEBUGGING=
-+  enableval=$enable_debug;
- fi
- 
-+if test "$enable_debug" = yes; then
-+	DEBUGGING=
-+else
-+	DEBUGGING=" -DNDEBUG "
-+fi
- 
- 
- # Single versus multiple thread configuraation.
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch
deleted file mode 100644
index 626a15b5de99..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- qp10.0/src/io_qp.h.old	2016-10-12 02:50:04.343499674 -0400
-+++ qp10.0/src/io_qp.h	2016-10-12 02:50:10.605264154 -0400
-@@ -662,7 +662,7 @@
- 
-   bool seekp(streampos pos, ios::seekdir d = ios::beg)
-     {
--      return stream->seekp(pos, d);
-+      return !stream->seekp(pos, d).fail();
-     }
- 
-   bool put(char ch)
-@@ -736,7 +736,7 @@
- 
-   bool seekp(streampos pos, ios::seekdir d = ios::beg)
-     {
--      return stream.seekp(pos, d);
-+      return !stream.seekp(pos, d).fail();
-     }
- 
-   bool put(char ch)
-@@ -816,7 +816,7 @@
- 
-   bool seekp(streampos pos, ios::seekdir d = ios::beg)
-     {
--      return stream.seekp(pos, d);
-+      return !stream.seekp(pos, d).fail();
-     }
- 
-   bool put(char ch);
-@@ -876,7 +876,7 @@
- 
-   bool seekp(streampos pos, ios::seekdir d = ios::beg)
-     {
--      return stream.seekp(pos, d);
-+      return !stream.seekp(pos, d).fail();
-     }
- 
-   bool put(char ch);
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
deleted file mode 100644
index d82e78cada16..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur qp10.0.orig/src/xqp/term.cc qp10.0/src/xqp/term.cc
---- qp10.0.orig/src/xqp/term.cc	2008-07-09 07:32:37.000000000 +0200
-+++ qp10.0/src/xqp/term.cc	2018-01-27 14:06:54.101545854 +0100
-@@ -38,7 +38,7 @@
- 
- bool graphic_char(QChar c)
- {
--    switch (c.toAscii())
-+    switch (c.toLatin1())
-     {
-        case '-':
-        case '/':
-diff -ur qp10.0.orig/src/xqp/xqp.cc qp10.0/src/xqp/xqp.cc
---- qp10.0.orig/src/xqp/xqp.cc	2011-07-14 01:08:42.000000000 +0200
-+++ qp10.0/src/xqp/xqp.cc	2018-01-27 14:07:53.902543353 +0100
-@@ -167,7 +167,7 @@
- 
- void Xqp::send_cmd_to_qp(QString cmd)
- {
--   write(qp_stdin, cmd.toAscii(), cmd.length());
-+   write(qp_stdin, cmd.toLatin1(), cmd.length());
- }
- 
-   
-diff -ur qp10.0.orig/src/xqp/xqp.pro qp10.0/src/xqp/xqp.pro
---- qp10.0.orig/src/xqp/xqp.pro	2008-07-09 07:32:37.000000000 +0200
-+++ qp10.0/src/xqp/xqp.pro	2018-01-27 14:01:24.764559627 +0100
-@@ -4,6 +4,7 @@
- 
- TEMPLATE = app
- INCLUDEPATH += .
-+QT += widgets
- 
- # Input
- HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h
diff --git a/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild
deleted file mode 100644
index 6506c3bce9f2..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
-	!dev-util/mpatch
-	!dev-util/rej
-	!games-rpg/kqlives
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtgui:5
-	 )
-	pedro? ( net-misc/pedro )
-	readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-associated-item.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	epatch "${FILESDIR}"/${P}-qt5.patch
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads)
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		eqmake5 xqp.pro
-	fi
-}
-
-src_compile() {
-	emake OPTIMISATION="${CXXFLAGS}"
-
-	if use qt5; then
-		cd "${S}"/src/xqp || die
-		emake
-	fi
-}
-
-src_install() {
-	sed \
-		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
-		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
-	dobin bin/{qc,qecat,qp,kq}
-
-	use qt5 && dobin src/xqp/xqp
-
-	into /usr/$(get_libdir)/${PN}
-	dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/rl_commands
-	doins bin/{qc1.qup,qecat,qg,qp}.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d6b1097817cc..32abc78d7be6 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -18,7 +18,7 @@ DIST ruby-patches-2.3.8.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b
 DIST ruby-patches-2.4.4.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 DIST ruby-patches-2.5.1.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924
 EBUILD ruby-2.3.7.ebuild 6872 BLAKE2B d7cf4b0319f63d9485130c17a393671da672e4f6a4227147be161f0f3e941b8f9b2da4b43168018909ac38b002bea7348f8781fa5a7868913e0b88261dbbd874 SHA512 302d8e3feb1d532eab9e9b5e60d258ceec22a44d40c9adba4cc27d5460dc05deb932777163f06e39975756090a448a73af96c801288b0c3912cca4c591a3cd43
-EBUILD ruby-2.3.8.ebuild 6881 BLAKE2B 530d73cf9111885a8ac4c83e22e1f0f00bf309cc06f91f79e03cf40ffaca4c857f29387e3a3f9bd40fad279745afe77880c44f5ff36b9ddb01269448533d8a99 SHA512 31e52b200f366cdac1d3f3b9283f20a12478cb31b7e130417d4ff604ff2dee108ad6655b78176b41c24bd42b18c51ee21cb39718a36e7dfd218d4870ecf39703
+EBUILD ruby-2.3.8.ebuild 6877 BLAKE2B f18ad1ec414678aa7db4450bef871691a763f476c65be49661f620bb7312d73c9df0f91634a6cedb927f767bd904fd4799123277a323e0a8cd67f668a03b6462 SHA512 08f80b3d17fadf98682b7b24c5b2d3599861105cd5eeaa071c5747fcf47ecbfc0aa77ac8d7daf205db9c37a2fd436951462ee3b100671c4294458573feaa5255
 EBUILD ruby-2.4.4-r1.ebuild 6613 BLAKE2B 22c7fc546104b77e29e507bcf7a57d23d34df1aaaa3bc7e9e6a865152977718bfe0af970a8defbd5ee2bb22ef1f2d1b4724ef5d80501d000dc109ba5fa5a1715 SHA512 efcdcb89d71e85d03c8b6d076f85ee87fb850327a509ac2f7f1b94e55f212310b5983c3494c8c1a60ace8df3624b0c6518d4421339c63b27d56f967734213291
 EBUILD ruby-2.4.4.ebuild 6979 BLAKE2B 70d16f9f2f92572be797934936f8dd25fe074e8bb0aa24e80b86043f38b2dd8f0fc41e2bc4b603894d4026c1d724170dfe094e7a97e621c2bab37a2c968cd224 SHA512 0186b663596a9304c90e18e679f5736a509fd9cb7b456a0294c2b7da5be406467552da80dcfd2d50a5033de03a4ddf213642c139263282228aa3db02ca180c17
 EBUILD ruby-2.4.5.ebuild 6626 BLAKE2B 80e2a13b383820d0cc72a55f8e90b6bda55eac48bcd8b6f5701c1f74c4df18a136ff1e283c6f5d798414d8123f0dc496b1a00dca06568afecb1824fd0037d016 SHA512 95de895451d3688cbba12da2de466b88fd0396960be3309bb2add42d477d19898f2f904339bc4dc5b2c0301765d01c5db47cc1564427e1a30ed6c01877323ff0
diff --git a/dev-lang/ruby/ruby-2.3.8.ebuild b/dev-lang/ruby/ruby-2.3.8.ebuild
index b5d01be70e1d..7c2584bd85e9 100644
--- a/dev-lang/ruby/ruby-2.3.8.ebuild
+++ b/dev-lang/ruby/ruby-2.3.8.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index c4cb117c1a81..a93651dbb08c 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,6 +1,6 @@
 DIST sassc-3.4.7.tar.gz 25834 BLAKE2B 7eaeed2f3e454420c82e0f0b8b3877a3256835297d33e35b34517a8981d96e708de5e94364db97ffc6b702e4c136bc37db6e6d11347388b8dbecb75373bf1593 SHA512 f515241260557f17932ed2fc205375169c40d5b83c7a24577487426e33be607a5a8a90e58512a4e6d4ed3796f391b09ef6e148f9b293a76c73cea267dcf9440b
 DIST sassc-3.5.0.tar.gz 25834 BLAKE2B 69bb085f537ca2fba70aa96326e49f756cab52a8cac631dbe0dc88459a488c65dd856deebea335d4b3539b30658b327c3d32d1e79dae1021893a0627508ceadd SHA512 9c94056f66688016dd8eaae9cc791be4b397406b89f1289946c4481b5e1904486878d22fd65e695ed89f9b41a9f902932eb4074e7b0923ce3d4823ea3140334f
 EBUILD sassc-3.4.7.ebuild 678 BLAKE2B 72fa74989e023caea6c1b800e3e139336078e1f317b78a3d2bc984083e97f490e7b9396d942da4c8f16e7e16415994b1f018f800a9512b4cc093edcd5db54f84 SHA512 470281240d1b5e69cb1f0ffa386a75be8e614389f82458ff35acc1260a6b22abe71d23347a1cc1b04581f2bb8e5935c645ac808e1e7fae21c77234080286ec26
-EBUILD sassc-3.5.0.ebuild 680 BLAKE2B ed360105f73bd870f5cde3b8df5a05a5b0cdd69909ee7621923d9930d50e797ebdca188fca46ab3fed61579fa7cc92ea12892462f3cea808613624c944ae589e SHA512 7a2f9ffa9074dbf0715cf7583e50629faf8c6ed7b43251ed0fb5b3f9d1860ea39495303bc30403aa882cf07e2fa9000945072a6ac1258ca0624261c17c9d5c9b
+EBUILD sassc-3.5.0.ebuild 682 BLAKE2B 08963ec1257aba2c3708b08881e12888a98873959448a3cb9922842fd5a878bddf3c3f36ef398d0f1a11447963d9bf7fa60b61ee0797dcbc4231bce9b514528a SHA512 e0bfce4771aea8522b0d323ec93dc0f6fc83c36f6ef9a70d447f903a7085a980d861243bb045c3b28064ecc0deecafbb40fc1ee4dcc5de431e379f2c2ccee13e
 EBUILD sassc-9999.ebuild 680 BLAKE2B ed360105f73bd870f5cde3b8df5a05a5b0cdd69909ee7621923d9930d50e797ebdca188fca46ab3fed61579fa7cc92ea12892462f3cea808613624c944ae589e SHA512 7a2f9ffa9074dbf0715cf7583e50629faf8c6ed7b43251ed0fb5b3f9d1860ea39495303bc30403aa882cf07e2fa9000945072a6ac1258ca0624261c17c9d5c9b
 MISC metadata.xml 558 BLAKE2B 9a9f78b0e8cae59592abf94d60a419e3e33f88669c4c15daf6a0d714f2e2fd2e671c75e6a1438909780ff98753e473a36fc46dd989df0a6be342b65fedf2e8fd SHA512 1773373127612aea252592885f6d9f9625d354681a6fde25bab76ee39bd1d6a65dccae87edaf55fe59a1b6d4bd7320d4fa80246a91c475af337eb69ea518f372
diff --git a/dev-lang/sassc/sassc-3.5.0.ebuild b/dev-lang/sassc/sassc-3.5.0.ebuild
index 847d2e349e3a..aae4af4b71ed 100644
--- a/dev-lang/sassc/sassc-3.5.0.ebuild
+++ b/dev-lang/sassc/sassc-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A libsass command line driver"
-- 
cgit v1.2.3