gentoo resync : 15.01.2020

10 files changed, 73 insertions, 172 deletions

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 6c0cb476dd76..b9b0a5c3bd81 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -8,13 +8,14 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
+AUX erlang-22.2.2-gcc-10.patch 2963 BLAKE2B ea83306f31011d75119c8dc9dba0eb531f093151242aec5a4aef658cd1eebcb6600dbc2f86f1b1a5714d77f6cc2136385950bfb85eef462c38cfb25ce2cf57bd SHA512 b285418d474fca8d85da214575ecb3b05c41ae5c73323516e9cb3320da7276375c180a9b4a92359b0003313639d8cc2df265e4e9b4b9051823b059dd61a5d651
 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-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
-DIST erlang-22.1.1.tar.gz 54951145 BLAKE2B 917813f750eacd3dc7da25f1fa9e1f9c55e6cf1b88ba4e5576caae8554bbac667c87830935c7ddd58723f61e54f3c99ae4ef08660344035dea460e92a40832cc SHA512 ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39
 DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec230d5a9051d1888269770f6c44b379b6ba85ce9106f7d37b76c41b7683a545ba80569e33195e3e9211f6ced4ee3 SHA512 271a188d46a79cd1c43c3b8059b77c0802af624ff88c6916e0b84994040750d9792f0416937ed98e874256562f27d858916239d79f93b545c98b9703e5018f7b
-DIST erlang-22.1.7.tar.gz 54969082 BLAKE2B 4168b93e146de3dd22ec0d6088d2a2b62dc1a3d96d3c2859f65ef721a32f24ef74fb6baf3467da7b2c5b13a3b8d62602d3e94ddd359f091f548f958d9b8a77ea SHA512 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05
 DIST erlang-22.1.8.tar.gz 54967877 BLAKE2B cb022e3c5f577605872e7689639fced6c1f6cb7600314f5939107605f0767ca080c65c2f9e0695a04bf53a9e0727553d854a9df57f09ce5f4a958ebd035756e7 SHA512 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda
+DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b92febb7d41538166916989e80b612f13bae4ae2ba305aa12c790a74bcd9dc8412207413ba512537193811d177ad SHA512 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4
+DIST erlang-22.2.2.tar.gz 55743605 BLAKE2B f316b78f33d81f05d22eb4eab52756a46c39df31ce93bf57ddbc6d663d0165f6cdcb4de2e4a70308024e7648a54267364ec19c94c425d643d03dc741112acaff SHA512 c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42
 DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
@@ -22,11 +23,10 @@ DIST erlang_doc_html_22.2.tar.gz 33943680 BLAKE2B 4a0df88fe99c882272b07b928541f4
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
 DIST erlang_doc_man_22.1.tar.gz 1355169 BLAKE2B eca02e36709587d59099dd87263b3ffcea55002cbcbf0a9980fface3cc30cb4ce0210fbdf80c8957da7a09a3b866ca81be22fd577f7f948562ef4e4ca516cbf5 SHA512 4f590f82293c97529c827c042bce673e6777c577e52e0e1876a8d6c1a0dc774c09637e85e3562f9a8af44372219d57174c002cc12a9646ae015c7bb1da34c750
 DIST erlang_doc_man_22.2.tar.gz 1359216 BLAKE2B 943d8ac1d0ceab41e252cab18248b74592d90305a39a41c21421efb1a0c031b5b2dd430274bb6f23a5334aba87df65975549c83778afa6334826552b1e42e8b0 SHA512 94cdceda3f8710bf44e78eef854e9399a802d82051a49544abd75d9367240b268c5e58b4d62170fa044d850fc04f998594cd1fc312bec867ac6395b292c94ad4
-EBUILD erlang-21.1.1.ebuild 4633 BLAKE2B dbfcd2e556fa00ff7c1c0b442b234465a9876e98769132081fdcd05f13960a4ea5cba2c68776fa435f09ef91533538808569a25046706178df0d7a3477341c56 SHA512 68789a64ab677d7215f7796d3d4a1c1dd7001101174fc948c2c596fff01dbf3d3233407c88c21f19991c2390d51f8388da9fb3abccebec2697c6677c63adc7fb
-EBUILD erlang-22.1.1.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe
-EBUILD erlang-22.1.4.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe
-EBUILD erlang-22.1.7.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042
-EBUILD erlang-22.1.8-r1.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108
-EBUILD erlang-22.1.8.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042
-EBUILD erlang-22.2.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108
-MISC metadata.xml 684 BLAKE2B fff20139a02c18f3bc978ed0b3920f32fc9b54ef58c809fe504284e74fdb490a6534d90d7835159a57065cd2a0404e1468c5c925ebdc65968c61ba09926f4dbf SHA512 0e85aeb8b4e13fcdd98bb2547bf448504d9cd86399d1afc580629c7f0364595b15f96a05a4727fd7ceee615111c2e533b126548389222945f6c61190d77b215c
+EBUILD erlang-21.1.1.ebuild 4646 BLAKE2B 50adc94870a8efc3d0762bcfd3dd21e9edb746ec0313fd9dd5f30fdffbb4441fd1967a47937c3d23cd7e2b6b10554208448ac52b4a2302e9fa28149226678087 SHA512 66b7743c497112da8a4c56cd6f9279e3ea88c672d0a6d2b311e828e7e057f2ff2950816dc294bd87e98d3f589bb67c0c0c24633a34df183a10ef61967aea2f7e
+EBUILD erlang-22.1.4.ebuild 4361 BLAKE2B 8d8464af12fab6da99c5f38bd08c6be8cf6437d0fd3753be01016cc16051dcf2a98a9f80e6e42bdb02e7d283bd4bc396d5913054d8cd904dbe1d0946766a4c0a SHA512 9df155d85f34054933bc09c0fcfdd08146f70b68f8f8e778994ed9a4d654131ec94e68cf166d725af6aa9bfdf99f8ebff326871e7b3dd88bb6c529e9c306f190
+EBUILD erlang-22.1.8-r1.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da
+EBUILD erlang-22.2.1-r1.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da
+EBUILD erlang-22.2.2.ebuild 4407 BLAKE2B b280cd3d3720ff21d79bbe7555f360a993d411afe07f602b46d4c665ccd56ea78000eaa66bfc749b45871c209611cf5255c3078ea6625b5603097ec321dcbf7f SHA512 fb3ca493119d9250eb072bc682be1d322649abe50039e5276424e05d3564779e00e99b84873e3d4b3487dab53419bfb7cba0fc53fe917955ad9193e892f6a63a
+EBUILD erlang-22.2.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da
+MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
index 45a87c37a08e..8eae33756bb8 100644
--- a/dev-lang/erlang/erlang-21.1.1.ebuild
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
@@ -28,7 +28,7 @@ IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidget
 RDEPEND="
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-22.1.1.ebuild b/dev-lang/erlang/erlang-22.1.1.ebuild
deleted file mode 100644
index 8e47b9bf050d..000000000000
--- a/dev-lang/erlang/erlang-22.1.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-
-inherit 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"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	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}-22.0-dont-ignore-LDFLAGS.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf || die
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	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="${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}
-	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-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r1 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-22.1.4.ebuild b/dev-lang/erlang/erlang-22.1.4.ebuild
index 8e47b9bf050d..83d78ce48e10 100644
--- a/dev-lang/erlang/erlang-22.1.4.ebuild
+++ b/dev-lang/erlang/erlang-22.1.4.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-22.1.8-r1.ebuild b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
index 9f0146d89695..3ffd63edd06e 100644
--- a/dev-lang/erlang/erlang-22.1.8-r1.ebuild
+++ b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/erlang-22.1.7.ebuild b/dev-lang/erlang/erlang-22.2.1-r1.ebuild
index 36b698f35975..3ffd63edd06e 100644
--- a/dev-lang/erlang/erlang-22.1.7.ebuild
+++ b/dev-lang/erlang/erlang-22.2.1-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
@@ -140,7 +140,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r1 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
 	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 
diff --git a/dev-lang/erlang/erlang-22.1.8.ebuild b/dev-lang/erlang/erlang-22.2.2.ebuild
index 36b698f35975..97a529061f4c 100644
--- a/dev-lang/erlang/erlang-22.1.8.ebuild
+++ b/dev-lang/erlang/erlang-22.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
@@ -51,6 +51,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}/18.2.1-wx3.0.patch"
 	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
 )
 
 SITEFILE=50"${PN}"-gentoo.el
@@ -140,7 +141,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r1 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
 	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 
diff --git a/dev-lang/erlang/erlang-22.2.ebuild b/dev-lang/erlang/erlang-22.2.ebuild
index 9f0146d89695..3ffd63edd06e 100644
--- a/dev-lang/erlang/erlang-22.2.ebuild
+++ b/dev-lang/erlang/erlang-22.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
diff --git a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch
new file mode 100644
index 000000000000..9a7d5939419e
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch
@@ -0,0 +1,45 @@
+https://github.com/erlang/otp/pull/2503
+
+From 9fad0c9b71808458e857cbd3871cf80f46a75af1 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 14 Jan 2020 23:15:01 +0000
+Subject: [PATCH] ei_portio.h: avoid ODR violation of
+ 'ei_default_socket_callbacks'
+
+Noticed as a build failure against fresh gcc-master:
+
+```
+LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call
+ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
+ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
+ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
+ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
+ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here
+collect2: error: ld returned 1 exit status
+make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1
+```
+
+The failure looks legitimate: `ei_default_socket_callbacks` is a
+struct defined in 'ei_portio.h' and in 'ei_portio.c'.
+
+The change flips 'ei_portio.h' definition to declaration.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lib/erl_interface/src/misc/ei_portio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/erl_interface/src/misc/ei_portio.h
++++ b/lib/erl_interface/src/misc/ei_portio.h
+@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov
+ int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs);
+ #endif
+ 
+-ei_socket_callbacks ei_default_socket_callbacks;
++extern ei_socket_callbacks ei_default_socket_callbacks;
+ 
+ #define EI_FD_AS_CTX__(FD)                                              \
+     ((void *) (long) (FD))
+-- 
+2.25.0
+
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 9c2e0b7c1bda..d5a2bb56fca6 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -5,6 +5,14 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="hipe">HIgh Performance Erlang extension</flag>
 		<flag name="kpoll">Enable kernel polling support</flag>