gentoo resync : 21.09.2018

10 files changed, 479 insertions, 20 deletions

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index cfc75342dc4c..b1a14529dd22 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,8 +6,10 @@ AUX erlang-20.2-libressl-2.6.1.patch 4228 BLAKE2B 8c671d3aa8329562b274e6b9f233a3
 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
 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-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_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_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
@@ -24,11 +26,13 @@ DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1
 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 4482 BLAKE2B 36a4249649473f50cce66f542c98dbefee41a56d57bd6327f911e6137d5d9bd5fc0656e3f5770f804ae425d428739530be8395a078cc6d930e6c4df2e44edc90 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60
-EBUILD erlang-19.3.ebuild 4535 BLAKE2B 248bcab46bc6830e6ffcc626d8170b99f5705c7955fd7184e2f8b8799e0ab4fc97c9741bf4ad9413da479c703b585589e2eae63c9fb298d7e36750fadcb1b56b SHA512 c1b60ca3420d5a3cb1561376c6622d346dbd483e8ff5965f2823a6b1e1e3b0146b32a805307d0a7563ae5171d005cfc27a6662ae2ba8fff0511c5db221851b14
-EBUILD erlang-20.2.ebuild 4586 BLAKE2B e3eed51b916285c87e212446047d07d47492410580464a2c800642be36426848f859573387204afd7ab67d72bbfaefec4189b973525f23829bed9f7a365d436b SHA512 80d5567d6233c7d9fcd53ca64814dd8cf188094decc6f8708563c22bef77b0b85bd23623df825f085f738547bf64b68fdde160b2ca9389b743a2c56259bf37b6
-EBUILD erlang-20.3.2.ebuild 6673 BLAKE2B 47afb094d4d6b0866075a7db996d59bf6836a559b8cc17396622f6fee8248b7c116601f95d8ade51ecf218546dad9c105ea16d0ec0fc24072f0aebb5ebc88d92 SHA512 3150ebee49b8739ec42c4562743b51a3b4c0501297a2b1fdb6eedd642ed45c5b1b3e5aa30f8f8fa99898f255cc8418fc2911b0005a0d8fc2ffdcad8a155af3c0
-EBUILD erlang-20.3.8.ebuild 6715 BLAKE2B 17490339c9a438c11464a62918b7b16ae9a6f9e15fa554b52c943fe51075d04c3e22e3f6cce1996bc241c6fd98d84196f7abd13545a84488432eb5bff0ea0c6d SHA512 b5a225da6d0029cac2cf64ba2966fc09fd48357c8f018c7851bd62bc15186bc0732e70a9b4973f7893d3768f1292b45b3797bdfee5818b87102fdcd911cdac5b
-EBUILD erlang-20.3.ebuild 4762 BLAKE2B 441de4c69a235e22d6105ce65569d77254684edaf7bf03812e591e2da7015eb0bac1e70193682ed49c7cbd27870ebbb1d2d667b62c212439e37a73a441a4eaf1 SHA512 f9358e7e3f4207b89f02f719c30a529b9cbe56bba679b31ed94cfc3a7736005f91b7248b14e644109406c32cb0ba00403a076aa8a4ca42b4e20533206043b0c1
-EBUILD erlang-21.0.2.ebuild 6714 BLAKE2B e8a082a1b0c7b57182e6bae6d878ff226b2ebd3f49fa92d755f79c825c5b9b185da64b8f826c31c4f9f66f5fa6e37492074c6415ecaf8ac2010eb9568c810bb1 SHA512 3c495fe4c31c6e84f2666bd208a5d2c7871d28adb59dcb981af2f9d2119d50820f0eb50d18789903960c9c1251f3b1c00c3df07afee56dc01153ac5e56f12f50
+EBUILD erlang-19.1.ebuild 4479 BLAKE2B 671c00139feb254a2d053abd6006504aac816ad56b68291653f663d482138c4b8672b0893ef4e7d37f1610a581aa07695a722fcefa4c233523ab459b9adb292d SHA512 61ed8db5368a33c031588f896ea7f62cd770567dd61e8dbbb1793e4020cc540877e2823291a90227a9bc55811f7057448e49becdba792c600bd5d6168dd3af18
+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.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
 MISC metadata.xml 700 BLAKE2B f71879bdfc301ed27bd8212f074e5dbb176b29bcdab9edeb5ce0ba3dab3d8cb888977a140e91b0a50fbe35960799ab487afa3cd26a7b3b52d01909c678c1f30c SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84
diff --git a/dev-lang/erlang/erlang-19.1.ebuild b/dev-lang/erlang/erlang-19.1.ebuild
index 19224daf6a1d..de5385b19eec 100644
--- a/dev-lang/erlang/erlang-19.1.ebuild
+++ b/dev-lang/erlang/erlang-19.1.ebuild
@@ -10,8 +10,8 @@ inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionato
 # open up a bug to let it be created.
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+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 )"
 
diff --git a/dev-lang/erlang/erlang-19.3.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index c18492150753..11a906c9f8eb 100644
--- a/dev-lang/erlang/erlang-19.3.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -10,8 +10,8 @@ inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionato
 # open up a bug to let it be created.
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+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 )"
 
diff --git a/dev-lang/erlang/erlang-20.2.ebuild b/dev-lang/erlang/erlang-20.2.ebuild
index f72b025e3ab4..04a771dbceaa 100644
--- a/dev-lang/erlang/erlang-20.2.ebuild
+++ b/dev-lang/erlang/erlang-20.2.ebuild
@@ -10,8 +10,8 @@ inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionato
 # open up a bug to let it be created.
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+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 )"
 
diff --git a/dev-lang/erlang/erlang-20.3.2.ebuild b/dev-lang/erlang/erlang-20.3.2.ebuild
index fa93bdca5607..8f13394dbd27 100644
--- a/dev-lang/erlang/erlang-20.3.2.ebuild
+++ b/dev-lang/erlang/erlang-20.3.2.ebuild
@@ -12,7 +12,7 @@ inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
 UPSTREAM_V="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
+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 )"
diff --git a/dev-lang/erlang/erlang-20.3.8.9.ebuild b/dev-lang/erlang/erlang-20.3.8.9.ebuild
new file mode 100644
index 000000000000..ac47c4ad59c7
--- /dev/null
+++ b/dev-lang/erlang/erlang-20.3.8.9.ebuild
@@ -0,0 +1,227 @@
+# 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-20.3.8.ebuild b/dev-lang/erlang/erlang-20.3.8.ebuild
index e9f4f68c03bd..ac47c4ad59c7 100644
--- a/dev-lang/erlang/erlang-20.3.8.ebuild
+++ b/dev-lang/erlang/erlang-20.3.8.ebuild
@@ -12,7 +12,7 @@ inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
 UPSTREAM_V="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
+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 )"
diff --git a/dev-lang/erlang/erlang-20.3.ebuild b/dev-lang/erlang/erlang-20.3.ebuild
index 80b1e5b08a41..6d717177588c 100644
--- a/dev-lang/erlang/erlang-20.3.ebuild
+++ b/dev-lang/erlang/erlang-20.3.ebuild
@@ -10,8 +10,8 @@ inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
 # open up a bug to let it be created.
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
+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 )"
 
@@ -146,10 +146,12 @@ src_install() {
 	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-*
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* )
+		docompress -x /usr/share/doc/${PF}
 	fi
 
+	einstalldocs
+
 	if use emacs ; then
 		pushd "${S}"
 		elisp-install erlang lib/tools/emacs/*.{el,elc}
diff --git a/dev-lang/erlang/erlang-21.0.2.ebuild b/dev-lang/erlang/erlang-21.0.2.ebuild
index 874512907a2a..0986f06d7fb5 100644
--- a/dev-lang/erlang/erlang-21.0.2.ebuild
+++ b/dev-lang/erlang/erlang-21.0.2.ebuild
@@ -12,7 +12,7 @@ inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
 UPSTREAM_V="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
+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 )"
diff --git a/dev-lang/erlang/erlang-21.0.9.ebuild b/dev-lang/erlang/erlang-21.0.9.ebuild
new file mode 100644
index 000000000000..0986f06d7fb5
--- /dev/null
+++ b/dev-lang/erlang/erlang-21.0.9.ebuild
@@ -0,0 +1,226 @@
+# 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
+}