diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 9b31a7a..b4752c1 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,3 +1,5 @@
 DIST cache_tab-1.0.27.tar.gz 23633 BLAKE2B 5756e21162f2234239afd92fd2662f0507a11a2543807a4e14262432c8dde0377b4e530b7c7af754d586046b78dc2e31f049ecbb67cc1fcd9f8263c18285c2a6 SHA512 23c143467261d8c8d030bd70c7a6acc0b2a8a94f1dbd98658fef8c2b12e5d0bfa807886b4ea13112b801e4a8d6001e270d7959fd355bba9a205e22bd0e9b9bb3
+DIST cache_tab-1.0.28.tar.gz 24031 BLAKE2B 0d74e9e8992c512aa5a38606661f9ab1c72fb78cb2c76994e0d9b51e5453d8413694db16f8e58775bfd926c2de81aa381aa8a68f3f5387c0fc4d85c649eecd1a SHA512 1fcd95fd1a8e129e366ac633db6e4e65f57f8903fd9cc1f84b32bdb9b95697a16c411f04929dbf49bddd7733f69b405328f67a8aa397396a5e97b488194accd0
 EBUILD cache_tab-1.0.27.ebuild 511 BLAKE2B 72aef38b813e0b11cc402d03815178d9a556b3c1e880a9c7187849453f5c15f06d3a22314a202e5b7b99c919e2208205d64c5f00dd605673c964d7cbbfd09aa0 SHA512 39edfd1b11534aa749782783d442edbf92f3e78eb4927a8a7412df9b13551eeabedc1e38d48854c780f291924bab9081d37bc576f474af2c12dc7a5a8302616b
+EBUILD cache_tab-1.0.28.ebuild 509 BLAKE2B 1f03da67bee2dc1a7ab0d934ea28ccdc85084bfe780c97af0aafaf6e2725808c5060e6f5f7b82bdae1b44e2a9700a377497aa0249d5f83bfd0f5b2ea3da5092e SHA512 d2f297c4d0d1f2ebe5a60f558b3671565a86d604e2dc355525b5f2cebd72bf59f2488688c2e3a1cf39779ba221bb338d2121e4af7cb654ab981bee371970c9a1
 MISC metadata.xml 765 BLAKE2B 56bf8c63819d57e55ce37087e1556a6c7005ae01c20611800338c51adc6570d5495adc43526e1767a97c8ecae90760b18ab16f9a6d9d62b3ffdcac396795ea90 SHA512 d4ff8add477f79c8aa715932200412de793915060065fa41a5e94c4f7ff2e97a929c094dee5b04ed815874c20bfaaa6b8fe1289469e0566f9b4f8e5f58ad796b
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.28.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.28.ebuild
new file mode 100644
index 0000000..13f2f55
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.28.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/p1_utils-1.0.22"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/eimp/Manifest b/dev-erlang/eimp/Manifest
index f236c59..8c4f736 100644
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@@ -1,3 +1,5 @@
 DIST eimp-1.0.19.tar.gz 3477287 BLAKE2B 17802e96addd8ae0d517c3bab7a644aa9feea8c20e87e25946eecd1071c7d915533729f0b81100416fa8be1b692340ef1aaaebbddfabb1ba6d27af480225c031 SHA512 a81f965635898633837c2d18fb64e70ed50984a4276269f8694e220d67cbbd7ea62740bf7cc35da79313c9b361a744e16f3f2ce3cf5cf03cee8d299c8ef383d7
+DIST eimp-1.0.20.tar.gz 3477544 BLAKE2B 11785102419ca5e1f9c2a51fe29014fc044f2b5caeb70a1a78b664b9f619ef494687254e6e0148ed6a78fc32c6058e0f088e49d9bbc183a97003f3002365a297 SHA512 466fdff4e9be655a9de6d7c72564fc94f0328d471c691e27bfd839a1671a099dd562636de0f0b3d6432c146081008372591d3f527840390566be1bd3a906666a
 EBUILD eimp-1.0.19.ebuild 635 BLAKE2B d6b24f80e133973cec976baa672e1a3250ccd4cac65894df38d1be7f0c78a27c7ac07db42d35ae648ae8abd27ff9bc9534bdac66d5818f902d675a19d94f1a94 SHA512 fee9a2cb4fca7ee646db64197be5887abab7a6e552b9e5820034b5e76bf39ffdf558ff25cf08be407da7b83d85e950bbd119b6fc8f5cacd8458da1149eddb9ea
+EBUILD eimp-1.0.20.ebuild 633 BLAKE2B 4932a4c46bdf979a5c00abb487079c186e3dfe0e4b1d7afc2756bfd537c65cb208dbf9e899a91373892158f5c126989b055e4a33c0f5722606d1406b263038dd SHA512 ec975bd2b26f396e792b8a57aeb40f370bb6c9929ab2daecac7375fc1e1b4845e21d4465380a4e9ceb558db924acc66b9911ac78492030975822dcda970df300
 MISC metadata.xml 300 BLAKE2B 42710a5ed8bf7db4b090862b3a24ca028ebc0dda2f869857b11f7a02be03f2dd7bbd6fb0ede4d81c99fa0821642a092615aaab76dd3494b14a4b867a45e2e848 SHA512 bf280078b8e095533909d040da770268ff65d376e32f01745d1241758bc7bfd2f3d49eead64cffe409367ec852bbc3db5c578a80f52c914bab231fa7f018afa1
diff --git a/dev-erlang/eimp/eimp-1.0.20.ebuild b/dev-erlang/eimp/eimp-1.0.20.ebuild
new file mode 100644
index 0000000..a060107
--- /dev/null
+++ b/dev-erlang/eimp/eimp-1.0.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/p1_utils-1.0.22
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_test() {
+	mkdir -p .eunit/priv/bin || die
+	cp priv/bin/eimp .eunit/priv/bin/ || die
+	rebar_src_test
+}
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index c3adc6c..06f3907 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,3 +1,3 @@
 DIST epam-1.0.10.tar.gz 47727 BLAKE2B 9107bc991a32cf866ea1809a4d36ebb8b00c8c38e9d4eb9333298851fb6f00d89ac5df1e19ee95132f00064ba01c36725cb5351a0188a32e5be655dec7c848b2 SHA512 a659011a9ee8fdf59bd4950c78dcd0f001bf3c4512dfae156d6d66908b918968c80f836bc9801c98f0c3bb90d7bb2df6a36f2066086d623c74c96647d3637054
-EBUILD epam-1.0.10.ebuild 707 BLAKE2B 6cd9c48e416612767363023548dfac4cd67b41aea9541806da4a8180a3ed6eaaf93d31decda1f5b595d9633d928db4887744d87d816a431c5dba5768ecba8b99 SHA512 78e32e97ad3e3abae05e73f108b884ec61ef2f34f31ffebe15ace18ba100241d7c355c13f3e06a9f48e6b0539cc2501931ec477fa5b6955364ab620c5a340991
+EBUILD epam-1.0.10.ebuild 705 BLAKE2B b577a428aac171f7cb7839c3ac9d87e4357b266907e4dd1f4dc917e9a06969811599fffb059d42990a675ef42c12ef344befbfcd2390431dc274c2ecd088eb62 SHA512 07b30b929bde52055dda8c27a70ab4b66da190a068d840ef51571a8ba37da464dd529cea608aa71a5b0dd9ac4fcf5e0d3c9bb6114ae4e8c485a82e4716c14898
 MISC metadata.xml 300 BLAKE2B a33450cf19659d35cebd7c2af55112772ab91d24fb791b995bf71a87de6b16b1aed627620640f3abca6d5f6adf672a02ac0352a12fa1542b35168ecf0b99bf47 SHA512 2aae6f30853e3a91c983ea72464c4a09c1d8c8e24080d78f91d1f77c3f62db62621ca7e9bb17d69ae3be9f42acb17dfb77f1448de43be8bf9b8545e601780ef6
diff --git a/dev-erlang/epam/epam-1.0.10.ebuild b/dev-erlang/epam/epam-1.0.10.ebuild
index cef367b..6142758 100644
--- a/dev-erlang/epam/epam-1.0.10.ebuild
+++ b/dev-erlang/epam/epam-1.0.10.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND=">=dev-lang/erlang-17.1
+DEPEND=">=dev-lang/erlang-20
 	sys-libs/pam"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index 8283c72..ee58e7c 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,3 +1,5 @@
 DIST esip-1.0.41.tar.gz 89878 BLAKE2B 7d2e19e6ee47bd4cb5958ae610d1354746511c2c39c9c522073c50f60def5259e3c58141b35ff069634b0763bbdab30056253b2808f09bccccde2ecba747e44c SHA512 b14d61d66f1c2b2ac1174a22d87ef0902bf6a54b157957090edbe56d90ade4eedb3b1e007c6385501a83e92aff4927a767bfbb320feb97371ed50c3464759196
+DIST esip-1.0.42.tar.gz 90518 BLAKE2B 9a16df65dfe73efe7bc26e4ab584630001d9f4997f8830ec95584a51b29622ae15260a606f83797962e6391f1aae0360bac57fed9ed03d63d7dc59a4af66df82 SHA512 42d4c5d9334a117152a09ae0966ad6902d68c55dd0f4e963b840c188bffd88afbeef294a6f7c781fa5cd01b4c7c9f1de9647a418e9d1b9692cdaa72ef7a0c420
 EBUILD esip-1.0.41.ebuild 681 BLAKE2B d520a3a14f4271e1fc855365750efa6223a441f2dd2cf2a5796a9dffec61e562908f2dcb09eb300e097440c38a1a4a15747093e5aa697a3ebb895848108e894d SHA512 29000b4eae2fc954f8691ef43ca3b02b5124b8650d678e97d3d45fc8d29a22f3c454f27246c221c928537f8b316a59f3aa5ff9d6bdc4eee31e607a560af57187
+EBUILD esip-1.0.42.ebuild 682 BLAKE2B 129d494d0210e074dd8895d86400e8abe853b7639181e0a442880579e0281af8a4372e8a1718c92be1e3d7fbb62aa0b15b266ab71138b9b7e8ef486f87a7d3dd SHA512 62039d642944b69a007b337f683f55d9a1f3b6f508211911d72173d4f43e21c48697afa2af2f50f00448b279f6c3391ba083ecd1ddb3edc49ae092e03d5c1cd0
 MISC metadata.xml 300 BLAKE2B cb03126697327a4fc61963a6864f41bfcff8b1f61cc22af3ed9ead11e042c977e220f4c31dd9c1fd76af4e7c9114eee6615ad95c0bec8fc347e71b9d5abfb080 SHA512 a9dd8c6bbad69ddbe5ca9a2fc3fd5da67b41c9893414f81e3bc0450f1a313a2dd47fb8b6804936e7469a7f40f685b6462a7dac5c90b8c266632bd8f73ff05f58
diff --git a/dev-erlang/esip/esip-1.0.42.ebuild b/dev-erlang/esip/esip-1.0.42.ebuild
new file mode 100644
index 0000000..a5cb7cd
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.42.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/stun-1.0.43
+	>=dev-erlang/p1_utils-1.0.22"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+
+	# ebin contains lonely .gitignore file asking for removal.
+	rm -r "${S}/ebin" || die
+}
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index fc1a445..bab5986 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,3 +1,3 @@
 DIST ezlib-1.0.9.tar.gz 49395 BLAKE2B 7f64217bee4cd6924b98a4a34e32c63fd5acce75bcd8a0047fb0607ee928b05153b9adc9aedac5977a301ac8a6000454ca0334197b18373947689a165099c84f SHA512 b1358f4c86f0cdffce544c782e56b332378e991cebc945f0c6d75f25fdae5f011f154ec731c73eadb533087cc4a673c596523aa2300761f1033eb48af3f0e203
-EBUILD ezlib-1.0.9.ebuild 493 BLAKE2B 6c0e98b9d970962a206721a48e5f6f7304265abd73c6dc8cd19bd3ede1ac7e9ecf33ca74d3f94837f28f5e2ebb94a59654d6c19798497af44185ddc32799cd84 SHA512 052d9de27c2343f3fa7280935ac108a1fe8b6d91e8995da71a672d43fcaa951bc0d40d7b1c491440c8805b72b8997f4aa75284f419ac5121c491e8a7d7ec24d3
+EBUILD ezlib-1.0.9.ebuild 489 BLAKE2B d9317c109212107f1af2f02a28b924757190a0d5324e6c16abf76c99ea9b2a9d1c7e31bba1efb350c25a1719c55f045233c23ba7d95ff7de96e0a590683df4b8 SHA512 8a12254a409038a15a99641bca8b0cd51e3781776248b9a0fb9d06eba9a7e8512ce8f92b74db1e06dfb1983c9aae9997d62b9a382cea6f7058a0c43f6be688bf
 MISC metadata.xml 301 BLAKE2B 4775c3c3f47d311f08cb9acb60efc793519a72cf88df198c2e1b02b1752cd66927468da20d17d87c4361e4eb55d67e1be1232e8d9f3a83b6fbdd6c65a7f538ba SHA512 c666b05945b47891d00cedf53f827ae5e65be2b395146c79f694f2448dab72b8377bcd42d8e2d648c860a5fab2f1f2479bef9cb1cc5a0cb41ab44298ee08ef9a
diff --git a/dev-erlang/ezlib/ezlib-1.0.9.ebuild b/dev-erlang/ezlib/ezlib-1.0.9.ebuild
index b160950..ff6d6b3 100644
--- a/dev-erlang/ezlib/ezlib-1.0.9.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.9.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
-DEPEND=">=dev-lang/erlang-17.1:=
+DEPEND=">=dev-lang/erlang-20
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index af1a57b..e083ecf 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,3 +1,5 @@
 DIST fast_tls-1.1.11.tar.gz 80604 BLAKE2B 8d9b40306053960e953d336bb4ca7773df1a361c74f4974940268092fd211354614de3a79470256cc93b5f624632beebceb1fccb6e89a7765f0c3a322c867389 SHA512 0c415a61a9bf768f3a33d79e9d02acc30cdeee32550b49820f2ab8d809afb53bc6c7f9cf55b952ec3620b093c7cc172009255f76713492b2ea95bbb0b31e6ab3
+DIST fast_tls-1.1.12.tar.gz 80867 BLAKE2B 14f65be91fc3789cd390cf954ad69d70ca337a26ca87e99eb30dbbac454b3666e628764e9e8e43a1b4c0121c482e1f7fc4a3981c02174a63f0d7a220796fd1d1 SHA512 763666f05c8ebb504b39321c928e0c961cf399606e9e99def3dc6a8862cfb24abfa08542f7d1cb7fe1c5ea79003b6c9ab1c15d85baec266b4b5f586fbd0dd10d
 EBUILD fast_tls-1.1.11.ebuild 576 BLAKE2B 3e16377f480ede951f4f348294c676e49e343d8625fce66a6d6c5cda2b1e3d47d0c6df772be47ea84eeb412c7b3e0e5815952490ad40998ebc7d11c31a2eef32 SHA512 31f8eb5c88122fbe55845d29b62ed38f3490fa45f78fce3c67f52e825d2a7ab82be66410083de213eb83f9c432801962ae79f871090a80cb7a0d3eaa97d0231a
+EBUILD fast_tls-1.1.12.ebuild 576 BLAKE2B f4046ee0f68409f60a76d79d4dceef7d968b79e27651b3b231ba542a5b59431ed87b0eadbed8a92dabd25eb85379db8753e255bc527cb287275aaca2c855a0c5 SHA512 8f354a6eef59fa13935216cf116ecce691f0326eab8df4643129b61019242dccc7a0265f125e3908c8006873bb7822abc6f9361e9b37e817462babd931f428fd
 MISC metadata.xml 304 BLAKE2B 0c88902a0a8e500d8b92101b43b781ebe08b52ece820d04afa22a3c2ecb003bfe9f98ab7c87d01c5ae16204970274a5c54414c55c52852ed82bc71776fc1bd13 SHA512 20cdb30d4aced210a91fbef1420d09340d61743362076f3f636ea95417668495f1c35b60b4d791c827322f96ca76c8e58df2b627dda9c134f05f3b748f5f00cf
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.12.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.12.ebuild
new file mode 100644
index 0000000..999caf4
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.1.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.22
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index b37fc26..471edbf 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1,3 +1,5 @@
 DIST fast_xml-1.1.45.tar.gz 107006 BLAKE2B 0aafc8649432bcaa9700a73752f699b98c8a18b6dd9dae34dc576c1f981b3c3def54ba0dfe05efe415f7c7f776184dfc92cdea8419df8f256a4864786ecc8805 SHA512 a4c1b5ecbb80e0e2325ecede1ad426c09e35db35c16dfd6dfaef6ba7b6e9627879c6cc43a955d0bfe91abfced48717db07d28132b7c4dac8adca7af1e21c0734
+DIST fast_xml-1.1.46.tar.gz 107357 BLAKE2B 59f90787f128a28e6993256a9f199b248f0c0d5bb93a4019bd0ecfea9bd3efc3c171c1bff793b4e26e267362a2e8e0c02b1d87e8ccf90fee03e10159b5f3e358 SHA512 ffb1ebc76720719b1f326596316c6e1723d14240d64e0565216888699599ee1fd0378047f4f421bc595a5ad9efe065ac791fd9ea29f5b5a40c27934b5ebbbba9
 EBUILD fast_xml-1.1.45.ebuild 504 BLAKE2B e6b1f7b1ff6973553a02fe1c08a6e4bda69237a913bd927bd7f075e6488fe99cf7fd591a435708d63fbd1dd5e2578c7e2026c6d4f1a52e27f80343f3dd855193 SHA512 36597780f3ac1a8c54c037711b822cd6f07c0b39484b0cf0d35ec19ec63be24b5a36cf52064384b0f0a91c046a8dadc38210f52c1fbacf335e24578872f82371
+EBUILD fast_xml-1.1.46.ebuild 504 BLAKE2B 9d3aefe32307c9e8f22092dcc96f8e72a7b22ade3f3e1c6161d5f1755816313ba26f436984bbd3b9e20d27bf20d59e7cc1fdd40149d5e346ee3f8f6f415d48ca SHA512 2a4e75971cd71d319062fcd6aeb7836a85489ced6aeb5e45a2dc22d8b52259ae9dfc2630fa19053a65acc3d0e8c5728eeb9d0beafe4cc648116f51cf5465f3b2
 MISC metadata.xml 304 BLAKE2B 298443efb4d3fe34d9cb5170fec6df94a84ede88c0f7c89da17e2e68a09f5df64c184f509e6df0e56e9d7a3ad215c4546c19d0a98bc93f6df7322fd07de11ee0 SHA512 6f68933291ed9d7fb4a0d18b0b6b476194096c4b2a957c500a37c2999b97855167f0bcd73c5c1711217ed5f9a62043dbf8f2e244be83db4befba2937ab30185b
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.46.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.46.ebuild
new file mode 100644
index 0000000..95569e4
--- /dev/null
+++ b/dev-erlang/fast_xml/fast_xml-1.1.46.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Expat based Erlang XML parsing library"
+HOMEPAGE="https://github.com/processone/fast_xml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.22
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 02035d4..89b7fe8 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,3 +1,5 @@
 DIST fast_yaml-1.0.30.tar.gz 59159 BLAKE2B c5e009c8824fe88fbd4f074cb4fc815b479e5f438612da9dcd55dacdfcda13cefdbb575905e6180fae845863c567572c3f7ec107d4371cac9e9d36dbedbaee31 SHA512 ed644dc1e6308d973a5c5378a7ff55f1ff0dd7e8795e53b6d8e4d5b3a97e65369b9fdf58659f3dada9ba8998ec5a45607dc35e926e51b9cf42f44eb455e606ce
+DIST fast_yaml-1.0.31.tar.gz 59389 BLAKE2B f6d0cac318703471136435da40945ac7f0758d02561f28ed3428f73e900b3f20d30f66b430c48e56d2835bf2543f97f3179fb9600bae9f617389d0104c29bc2d SHA512 bc566fc353f296397bd5375bf468c6c3a880dcc4b4f68a1569b1dcc274b467eefa9ee3a151b19678c347d516da34a0ef7d8c3039e75a13e2b1d5fa8c548450f8
 EBUILD fast_yaml-1.0.30.ebuild 510 BLAKE2B 259af1cd190e143b72a04fbd5756801eb22cea47d86c15643e3ef617d163bc0afbcbdb5513d297dc34ab16aa3c156c49463fec2f9846b80efa1253f3179b66e6 SHA512 aa2dfa87780b8ea06497efbfd99a1eab0e9a96333d38a30e99ba40795de8c4d1a4444c815ba4fb166b3ab9bf92a222553b904f759caeb38dd2fcf9f6361513c0
+EBUILD fast_yaml-1.0.31.ebuild 510 BLAKE2B 4faf64ba27d44b607dfdeb825666a042b33971d41a808283172c2a0f08a1a30871f0b91f9c24ad56595f45046f42b764897bed629e316e0b9d0096fd52eb9916 SHA512 6f6b325921b54ef2d03edf9b6ddd209481945b272890a21e2e105a5c86adc07634e4081508d01787714964c0e16f3e68d3344ba8ef4aee91f23d872fa8ed1443
 MISC metadata.xml 305 BLAKE2B caff17a0f8f3e50ac76555104e3416d85fecc1402b452ffd9715c9f935a85dcb6043bdb1a89eb9c3ed892347f204478f55c9bb7695b0ce93dbb2dd4e2c16d576 SHA512 87fff64d249e97c9145e7eb3d665084d7f6aa762911e98a5b03240d904dd482cac822713d4bbc6d42be13ebe6e358bf8919cc4050d1b7996e9cf3a7c39f3062d
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.31.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.31.ebuild
new file mode 100644
index 0000000..eb8c5a3
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.31.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.22
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index 087f31e..82e9461 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -1,3 +1,5 @@
 DIST mqtree-1.0.12.tar.gz 228886 BLAKE2B 6912a29953f1fc801c08ba60b09e5adfd91c27dd3b1ff072e74f71377e46a4004bbea6b0e32a053b52e7cd717c1c6496bd24fbecb1de8b3c99a674f453188ef7 SHA512 21dc2b974a600e16c1ab4a7d9ea9377c37feaa4e7e8385cbb2cf61a7ecd3c46122b0d030914200c7f3086f0c60c9c8384b4614cafc58aaa07213ab17c08f74fd
+DIST mqtree-1.0.13.tar.gz 229077 BLAKE2B 6747f2b0ddb5a02002ed9667bd0c69b7f67d69f4a131bf79b6d3e8857cf4dd4a3feba79c5e78f50a8b6779e7746116f611797dfcf9b231b59bb600017992dc2b SHA512 eb429fbe348be62f3a6401caee41ad330cc480be8543a513cfb2928645fceb5b8ffcacdd14356230df5359dcdde696bb2f120ae47951db20251195923d392bf2
 EBUILD mqtree-1.0.12.ebuild 487 BLAKE2B bfea4f9dcb7d2f23f305141e92ae79bf0dbef4e5d1230f4f7855b8c648d8893c43679053109dea3c9ca7faf97389ae2389d2625bf04cce345d9f8b4091ce1201 SHA512 32c938ddbc8cfeeb97ed66e8e2f4d0f789d8648bd0a5ab9207df75a3705cde048c091c28b3f1cd0fd589f9ccdc251729bea68c7ec4d4b53779dff315ce7c1dd9
+EBUILD mqtree-1.0.13.ebuild 485 BLAKE2B a1b4bf6f96df3f9443a0dba42d9c3de3d016cb189dd1b5b551b10e89db14e4a6bfd1d90768e7352a68b0dcb6bc36aa04e36d241d3a4196172413703cbdd45613 SHA512 ceb8bf594f577772d0d98107e6a4ecca1d2f8ebfc176ca601bd460bd4df091b933e095c161dd5d73b4a9228a49b6e97cba043aefa4cd042f340342aa2c588710
 MISC metadata.xml 302 BLAKE2B f1e14f60c14e6ca60f01611695e2780a2322a84ca4eb765def4c9e820fa895db70586fe9b402eb3caeb17b53ca6a7cf509c6862ca23c28a6d03b8493a6da5ae5 SHA512 d08d18264a4294d72bc4a628b255cf8e00108e2d8fd452376a3fe76c80d6e0ecded13f1192b2b77ba3f91ec0922d0c7d5adddc3024f915237aa4ff148b03127e
diff --git a/dev-erlang/mqtree/mqtree-1.0.13.ebuild b/dev-erlang/mqtree/mqtree-1.0.13.ebuild
new file mode 100644
index 0000000..abee1f5
--- /dev/null
+++ b/dev-erlang/mqtree/mqtree-1.0.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Index tree for MQTT topic filters"
+HOMEPAGE="https://github.com/processone/mqtree"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/p1_utils-1.0.22"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index b92f9d3..bc1d1ce 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1,3 +1,5 @@
 DIST p1_acme-1.0.11.tar.gz 221108 BLAKE2B b53bd72f8ef39e11799124f2eceb005b2a2536b5407155a9c91eca664927b1739608525d9e2bd73a3076fc53418f0f276a5faddd0da9fca688a8c49509b46953 SHA512 3424e758b26601e3cbfe8863ac22aa51e3a86297d227a6226c41eedcd7f898dc3c43ddacb9832a8c005753f942c326d7ebabdbe114e09781dfc7c889f4e6af9d
+DIST p1_acme-1.0.12.tar.gz 221422 BLAKE2B c5bc86147e38845a134d49e8f0704a20521b4e753687331cb057a99d7782142212a213b7d22c4297e8bdc2bb2e79cb1cf39069eaf16743c0cff76c41a38b0044 SHA512 a1a291b5b1f07d6eb3ef67913505f784226208485b11d79d695cc0474fc1660662474f5bc558631e2899a16287caedaf7609fc17ca2d1dee0a700e674d50c764
 EBUILD p1_acme-1.0.11.ebuild 742 BLAKE2B 83d9f44af26a747d19e7bb87bbd8e99dd6832f78615575968075aaa54fc6f5f1e62bdd69b1d795b7e2def154176ac37bf8dccea098e047c40a3b00de98b46b0b SHA512 1805d90029f6955bc856ff51d5087701d8213e13897f974b50848f66a056a7761c7ebb6c1b8074a0eb7da0573dd60a57aa555058b12fb3d7d8137e6b1fc03603
+EBUILD p1_acme-1.0.12.ebuild 741 BLAKE2B e4c1259ec2be08335ea1f2a1f8349e1204b336210ecf5edaa7b23f02d37f1cf30c2611f0fa02922fac14046f40346bf910de0659c158e099d838c63541a294be SHA512 68afd9879e2293f82b9ad2686a21bf47ff331a6e0c37dc4f6eb685045ff1be676663e62a4308caf7a9f488b01f0e210dc955cefef5b7881d2f598e4f6171df28
 MISC metadata.xml 303 BLAKE2B 55f783852d04cc1214a55a4d8922ca45dc57b05114cb8a006b8d9a8393f162437b94426d8c79b144c7fd9b3c965eab914419bcdefbc10645214b2f72918eafa5 SHA512 60484f81b126b6b0f01615bac8c83be479c352e9c7a7a511d8de04c4a9dc3eaa50c9dcbb242b8cba8e4d498f429116127e66259a2e16f503b9f97e859a64bec6
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.12.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.12.ebuild
new file mode 100644
index 0000000..01b3dea
--- /dev/null
+++ b/dev-erlang/p1_acme/p1_acme-1.0.12.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/yconf-1.0.11
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/base64url-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	# otherwise it wants to fetch base64url from git
+	sed -ri 's/\+\+ \[\{base64url.*//' rebar.config.script
+}
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index d26145c..81bcbd4 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,3 +1,5 @@
 DIST p1_mysql-1.0.17.tar.gz 27100 BLAKE2B 2483164767ab953e5c13def50bd760c843f4d47366ebe840e1a10d17771bc0699a888d738f102b33b387cd0802f84006e3fb1df4a60643d2be6ae080a6aa36bb SHA512 87f5237a68636cf9a93d52d37f8ab6649afaddc5e9d8e750ebcb8929ff321d59d41ccc53ae93b03d7b34897c968fd7edca5d01ae3eaa8f19e68d037f2176fe6e
+DIST p1_mysql-1.0.18.tar.gz 27300 BLAKE2B 8dd1e090b1b7eb8b7e544603e5beb10d3440f131fc936808abffee0c79a86494de43fa12b63c14089c31fc9830cabd71c1a586fc0bbdb3c67852fd9ffe7e2117 SHA512 b7f7e2ab8a277ea15bc690543cbb9587e5e6c98c0dd3a32bebffd5f5964caf19df82e9e446cfa17432c475bf84b9cd0ad68366b5ec720059205c19f3a1668ef0
 EBUILD p1_mysql-1.0.17.ebuild 456 BLAKE2B c5ef56f86d7324d081781b70d2e4521a1a3ec4dc117b6214276ead092ef1b853f2c98e9543bf38d7b2162e421d9e4ca0c221c825a16d46e2f65f2bed8a5773eb SHA512 64d002bc9fe5f05642de44e020eaf2db3f2c586725aa88ccdb64512a989c8ee4d70246045baed5ce2116c8fbfc80369323d7badfc4818acf0a0575e0dbf4b1ea
+EBUILD p1_mysql-1.0.18.ebuild 454 BLAKE2B aacc0094604c8a2b4e193821b66cc9b7dfebf25727d4c375b6eecdae8ee828e8f89493904096773a3b77884d6f89a9fffdb9d5adf201bbbf132665838c799294 SHA512 a2ce4f63752fbcaa95351f22d93d96175bf297c990916265403493a7cd6a701c8cb60178ff3f95b84d7957dd586d93687ad8efed9d0e289140c0a018e5c1a103
 MISC metadata.xml 304 BLAKE2B 3d45b5c4b62a376ad320bba3d9469f35f5636233802428dea8bf5ac8b6134b8d06ef5de1ab9d977bd2089f6e9174a71d41dbaca71c54cb5990cda65dcc31a61a SHA512 0c3bad8ec7a25a29a6539774a18a8d8c57394cbe50bc9d4ac24f88897ee8a98717ae82d84245d5b593895645c9e543301573e321f47995310517aa764f95dfff
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.18.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.18.ebuild
new file mode 100644
index 0000000..b75c285
--- /dev/null
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.18.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index 90f9cb3..9d3cd17 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -1,3 +1,5 @@
 DIST p1_oauth2-0.6.8.tar.gz 214027 BLAKE2B 58c0bfb772928d77519079e0106941a6368a6aa4656353a4dd5d67e9d4132ac19eab3b30f8079420348dd05a30bd8e15cf8df5de5d57154f24b63590bd82380a SHA512 10ce1542b8aa0cc0f600addd0f5c6fa82e069fa20267a729536493136756403b45185f01338d29cec2b318cbf51726e145dd767ea147155f50498841b57cdf08
+DIST p1_oauth2-0.6.9.tar.gz 214329 BLAKE2B 8c8d0d9186d54099834a1b150699940e19dc2de7c194f96169fd5bb518fd515688071405b8f238ecfd91fffe1d42d22ddf70fe5850bd72cc80dade384fa94c46 SHA512 30f912e82c035bbaec6dd1b25908426f587a9fc8f401d47ac95d508b426d3d5ea3f77c798dc8c6d4e171dc309cc18748629615671a9fee0fc01f3328133427fe
 EBUILD p1_oauth2-0.6.8.ebuild 723 BLAKE2B 2cadab1ac041131df513021a873cb3a25aa5b4a4bcee5f96b050a16c518e77d788d525a03f3f83f7bee2fff33897d3361d31e906093c6cf4e8d5e8f8bd21474c SHA512 93bf43f1c9ddcee6094c2adddfc72832bd557d56737528f78c038867faa5f37e97dacce2a9762d3c68529aa7b45f0b88c666860e59da0d42df1486a3e7b6857f
+EBUILD p1_oauth2-0.6.9.ebuild 721 BLAKE2B fec92edc1d418c4ad36ad2804b6f5e74a0a08242e629cc128e4c146046674db6820e11995803bbf45625aed3d6faf82b4cd36952350a5373db26281864ab5e1e SHA512 5121d375e3e05e9808c152c57ca2780cbb23c5fee065265e08916d4d70fbf3584e4343f98fbcc5792bf39b71d50639def40eb6a28ee6508e446916ed43c99f74
 MISC metadata.xml 305 BLAKE2B 98e1f6ec2c085dae2c72693e64f9cb18ae8bb6bf0b8a5971b7d3e1a55cc3face9b7af974b9f1af40ee76902e625e330b219d78861601ed3f4b211296471f5421 SHA512 8f6d2d7fdaffa942e66e63e1cc315b59af452406993c7f208d09e00ecd5be8151b3cd72ec6f8c573a9c274662e9f75ad8dab616e284aa77257813ff82ec50823
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.9.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.9.ebuild
new file mode 100644
index 0000000..f69aabb
--- /dev/null
+++ b/dev-erlang/p1_oauth2/p1_oauth2-0.6.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang OAuth 2.0 implementation"
+HOMEPAGE="https://github.com/processone/p1_oauth2"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-lang/erlang-20"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-erlang/meck-0.8.7
+		>=dev-erlang/proper-1.3
+	)"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_remove_deps rebar.test.config
+}
+
+src_test() {
+	erebar -C rebar.test.config compile eunit
+}
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index db65e98..0e48da2 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,3 +1,5 @@
 DIST p1_pgsql-1.1.10.tar.gz 24073 BLAKE2B 541c12e72a7be558f7c9fcfb64c88ddcdfbc258ce33f2fd66b8bfdfaaed83f1a1194dfea6225abd1a601ef08d9a9e792c844f778bc1be4bbf94e8107c6e024a7 SHA512 d1385b71681f487822839041f01ca7241573fd3a4b3616e7f0508b2d604ce37273168e8ddf9e403edc6cb08d73c908c373727e26a970ee7ba67ea57de8524409
+DIST p1_pgsql-1.1.11.tar.gz 24415 BLAKE2B 1c85f6f5f23c5d88fead8c776f41e99b944b5de2f6862a4dedd8bcc4add6f62f09a75c5f36fa55141e325fcd2bb65b800f6853935e9614e01de923a37cf1a0b1 SHA512 7f59730fd46b9c86331957c9f8be8db8aac2374363308e587d35f5399fdcbf8deb605960266c176f2f036d15100c230918de98cfd9e713636ad50cdaa7795aaa
 EBUILD p1_pgsql-1.1.10.ebuild 467 BLAKE2B d7c0846d73ab89288c18209b74583e18eda1714632ab1a66e7fc89b506bcabcf30dcfe63ceb3aff7cf19a11dbf73685c6386e56b206b72af8d0b40301fa9a699 SHA512 0e69a223920b5ced398a25784e300733dcc768f891a8b5ede11de432a97ce0e205968ba92c8b23e0425e1412ba44f462899b2b7f6f924adc70bb7fcd4f5121f2
+EBUILD p1_pgsql-1.1.11.ebuild 467 BLAKE2B d7c0846d73ab89288c18209b74583e18eda1714632ab1a66e7fc89b506bcabcf30dcfe63ceb3aff7cf19a11dbf73685c6386e56b206b72af8d0b40301fa9a699 SHA512 0e69a223920b5ced398a25784e300733dcc768f891a8b5ede11de432a97ce0e205968ba92c8b23e0425e1412ba44f462899b2b7f6f924adc70bb7fcd4f5121f2
 MISC metadata.xml 304 BLAKE2B ef4e6ddc16ac353e121848f24676bbc1924a6afbaac3b8695d0be09b89cfee030b9bec9fd66484eb19595dbdc789d2b5fd746bdda9b5f4815c064cfcf146065b SHA512 b77962ea56d52b513fd7d3ea6c6726cafbb928f49f8ba0d9ccee10b20482a07385d250f80ad2780e3c5ec7d1854dc95b106575abf142e82d185c13d110b41431
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.11.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.11.ebuild
new file mode 100644
index 0000000..ca41d38
--- /dev/null
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang PostgreSQL driver"
+HOMEPAGE="https://github.com/processone/p1_pgsql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 0eeabb0..5e4d650 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1,3 +1,5 @@
 DIST p1_utils-1.0.21.tar.gz 63913 BLAKE2B ebcee62b37f182f447d58a5b3bf841de064adb98afbb26e05caa8841e7d93b1c182fab227c19dee2cd0a61d036fe475ea9ee7a877612abe0c45453333e0797c5 SHA512 afff34d3a0832efca0c7ca4278d7c677ed5ff3f0aaa04a46a291bc6a21c1cbf5645e282fda9ab468cfddcaa71821a136547ec9a2ba52d30f72f073dfa3b2fea7
+DIST p1_utils-1.0.22.tar.gz 64860 BLAKE2B 59b556f8d3662c60786b2723c163c8a34f6ffe8f0507141ea0a7ed7214fc00a6b74d840e115bd5fdc97b7382f510b05c1c29ef794299a6687990fffceb785eb2 SHA512 f9e0106ebb6bc7a63080a38ec59fb417fe9443dd53e801bed48ad26a112c0e6b82dd1bc1a5a7930170f41151b44054d33f53c8372f8bc3d53e789e135d63d674
 EBUILD p1_utils-1.0.21.ebuild 486 BLAKE2B 31e8abe8a60ca8a5ac4bea1f7d5a6168e2c16623fab42e6f1443dc99e01ecc85fc9af7f48250dffcefa22be806b4efddb539fe3742533f9619ff5bb50be3ccd9 SHA512 0efc1f5288d670fb77ab4f481a5bc1c4dbccd476b8912a18ac7045ae7cb1bebd0d75ee559cf1b7e26edf03d91757006fa0d720b204b2413b2180c7203bf36e13
+EBUILD p1_utils-1.0.22.ebuild 482 BLAKE2B 4acd7d776eff38bcf70fa45b99da4af69169ea2025d23c3cdef9d97c4e0ea0516484e4f3361260af0f0dbcbca0531f972b1718ab785a5c348052efc43670692f SHA512 50926666bad4ee2c74e6c83bc1899c6f01d8d26ea7034ffada25644f84bf567d8b394362505d45907ef3b7da516d05c9af358d2b7bbc80d8aaff92d33103e057
 MISC metadata.xml 474 BLAKE2B dd0f46e4c69d981a6341dc888b33f3bab4bc233df0208fbf09c16dc3bbacde133af147ed348f3f619836f3b3c52137b3b861c903d305a018ea61d535b3b5909c SHA512 9b19dd7b2c377527c69241c9af6d5599c9f8413c329297ea29fe38ea481a9a05e10c7f91656cc77e3b090dba6152d1d59f64f71e74b0530eced45af0ae7fd121
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.22.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.22.ebuild
new file mode 100644
index 0000000..0dc3ddc
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.22.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 6aaa1f2..fa77603 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,3 +1,5 @@
 DIST stringprep-1.0.24.tar.gz 99131 BLAKE2B 0fc8a29ae79fe8525d0ba6f33ab943f2db91843a65299016064eba74db2e4b9c3e10e58f2a7998a443105725e9c632106e2b1f97901355431d295251aabecf0b SHA512 072377081530a036bdd12b3bfee19a3eb5001aa8de45792107a34b86e78655a3ded0719a39de239ac269cc936d2a32f2510d6264b11a5a1be7c1924a9517125f
+DIST stringprep-1.0.25.tar.gz 99387 BLAKE2B e0654a2c0ec9e3fa85c2e2344bc33de9416f87ebd198409753f34e40cc91006b74d0f1650c60d990cafcec5e7d548f6e6fc58072a3057e6853fe7c1b49edf9d4 SHA512 b1c2e16bc036e1e8402cbf434a609372d94a5e9ef02b9844316a1d444e288194625a77fad220819db662ac859d99fab3a24d76c53cbbeff49c53e82e45a89ab8
 EBUILD stringprep-1.0.24.ebuild 529 BLAKE2B 193f08aaa381ebbed9a6345e18a90a6616bc8077992337b7bbd4f76137755f4afa4e3e53f2316064794174e1f94ccac01d39d470a01ce887ba2eb00510febbc8 SHA512 e3a7f5fc81bd808308eaa4cc1926908dae730611b7c1ad12e1d0a5cedfd540e9e8f3b0b6ad76e800f5e3bc47a0e8021c927a48bf5162283c8d16193ca60a5757
+EBUILD stringprep-1.0.25.ebuild 527 BLAKE2B 8559063ef5ba15a1940cdeca9924ca4d2c4541452bd69906c52f45c42cd9075e0ff2114e1d31a1e726e5b34aac8a535a2a42ba3a6708cc68ceedb77c0fd23ff5 SHA512 c3e2f9ef3085c9da8eb1c365a851720e29066df8aec472bf49890f1072d0a7ab30e264c6a28a8f65a4bd926099fef341adccc7a8dec8985d7fd0ca433773e8e0
 MISC metadata.xml 504 BLAKE2B 2127b99146efa992ca8a77c13ccf2966a92ea11b4e379c32752285431cde5f3a271f7bc47ad0f6bf6945f153f3a2cbd00c3bfd285b81978c8c1b3b66b256de96 SHA512 355a78e3829c0be4a1856053391d5e33a4cc23225fc44d6769acf1e2760e1b8220586a728dbd70639c4e3177f88d60d8333c5f16d1d227232fbcdf29211f2c47
diff --git a/dev-erlang/stringprep/stringprep-1.0.25.ebuild b/dev-erlang/stringprep/stringprep-1.0.25.ebuild
new file mode 100644
index 0000000..877ef04
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.25.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/p1_utils-1.0.22"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index 2d0208f..7ec99cf 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1,3 +1,5 @@
 DIST stun-1.0.42.tar.gz 39518 BLAKE2B e4122f21385bfb632c6c841313f507e947ecfca06d2c17963747d13b5bf96d696fcc79c2e2a7c3e295b5bdb2a3a0d23ce7634aa41c3f33b37a67ba0bdc2dab8f SHA512 c9b969f3f370fe6398aba2601c279414543b871e0d3806b36ad0e95890eaf3d50cfd854ebbc6f9a7982c2cfeba165cfc0fa5542ad4d4eabf8f5e3f751ac2ef56
+DIST stun-1.0.43.tar.gz 39788 BLAKE2B cd83b85ffa9b2e22374d43aa91b90fa93986bd1d719684f01462aa08e7945aca957522261227af004677d3a2421dfd308581ee184268ada794c01babfab1d853 SHA512 dbd786f4e2a11a1d941d5db92f9ea3ec726b0cdf100d3e8b7badca2e6ba086680707765412d154b2fe4958d3a695984c5be25a73725ef80643dbe57f981f9a02
 EBUILD stun-1.0.42.ebuild 506 BLAKE2B 459731d2a9f7ede05ed55b71b4c1da0d5b7c19d1a2751924ef21308819900829c94a7cd6653722b476d7287e60972e8caaa4f99530c2d9df6685ecc72a5e1303 SHA512 02ba5157407eb7394199d0f1cdba3558a8fe6670a9442343037b334b6bec4a2b52e45c0f12c1d42fbb7f9c12b712813f0ebd9e146a6b7ffc518fd525024e7819
+EBUILD stun-1.0.43.ebuild 507 BLAKE2B 2a949fc374b74952ea1b46001b8238b7c8bd26b91463f48b70ae5a7b1c8b0e3075370aab4f68d324fe4669cdb92d1d06bde3bd9a6608d0b6c8152f52a55f91aa SHA512 0629f167f83594280cdf770ebb6e385698e739a8f30dfeaf52b72c99d5048f16fc0da54ed1ba9151fd9cdbbaa0c484ee67ea0f9e38db90be6100e23c30167f7b
 MISC metadata.xml 300 BLAKE2B 0e29cad1b734c0349b9910a8f0ec2f6ef8aaa813c860409f1688efa5d253d76fd035bbe7c4c837271fec68585d6d5bbcf4493542a3dcb1dbc229b3829f1d65df SHA512 48c6b133bcfcb9c038a6f683888f269424a65785e73b7f81c366886fe3769e569b15004f1353bbce9570b47346bb0db305654954b34ae12a959ef26f25944319
diff --git a/dev-erlang/stun/stun-1.0.43.ebuild b/dev-erlang/stun/stun-1.0.43.ebuild
new file mode 100644
index 0000000..814b056
--- /dev/null
+++ b/dev-erlang/stun/stun-1.0.43.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/p1_utils-1.0.22"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 371cfcf..285f94d 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1,3 +1,5 @@
 DIST xmpp-1.5.2.tar.gz 510215 BLAKE2B df7d141ab2e684d83f4fe185e849dcd13d89e5e0979c7f07e07961db5961ca7213a5fe42cb5f8199a8d5bb0a703ca7ddb12fc987e2da37f5032531b94bd450dd SHA512 df5afec4c7a7f767ff2630fe3783b41bf19ab63482ab63e477c30602cd49268c343334d64753baabdfc6347572368941d35ae652373e5155b4165aa77ee7c5e8
+DIST xmpp-1.5.3.tar.gz 510756 BLAKE2B f4948739c75e9b05930647a75e4faac9530806c9d239fb1c0d5109152ba9526bca63883fe6896730679b0d8ab31cb89e820ffba045c3cdbd58448c4b5eb70f01 SHA512 44b79eb73143ce3559ec8fe112af5ff22a7ecbffa935c8e76c645f7845005e7459a6ac1b726312be4eff22199eafd27ff5aab06cec1b1d961c80374ce83b7898
 EBUILD xmpp-1.5.2.ebuild 712 BLAKE2B 02c2421c669d7ddce7c16fce4e4e8b609b0ec28ccd9cefda063aeabe4d6f7b628a27bb0b66cdef91864e2526572668aa3576f3fe546ab0714c0d1649a53c24ad SHA512 a9a10a8c54a85180833e016fa35a9d7d0fd9e58a55e28f91ecfc4768188151bb455346cdbb44941642fd2b3bcf2e328811cd88f9806e52168103ece2f38e2eef
+EBUILD xmpp-1.5.3.ebuild 713 BLAKE2B ad38f638642b684625e9c3b9b275ba1d6ab4c392e74a16b5dbac86d5bc3e562661ce3690646b274ab831f1b95879c54b30feda86608b22b9888d47ce83f3add9 SHA512 012b785e51d2bb24a454bbef39f6f9df2ea690956a19d6d07a700882d1bfee1883d955357bdbf8bc4e051311cc0f55a1e793e483cfdc59b98fd775e44d4c27d0
 MISC metadata.xml 300 BLAKE2B 95b46ed0dc39741f2e8c5a822637fa76a7952e00f93ffe1b2a28905b7f68bec492756bf008653f5370c08d31e9b47133db6a6f181015f1fd1d0138e33e84746a SHA512 41a4ee656e0f8c79b319ad575de817bfc877163b235dbdfcaf5bfc0555b875190a4c395b4c2ed7e9e366d0c430b273f382d6ed984ffea6d4dc29ac0378336c92
diff --git a/dev-erlang/xmpp/xmpp-1.5.3.ebuild b/dev-erlang/xmpp/xmpp-1.5.3.ebuild
new file mode 100644
index 0000000..9d2badc
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.5.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-erlang/ezlib-1.0.9
+	>=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/fast_xml-1.1.46
+	>=dev-erlang/p1_utils-1.0.22
+	>=dev-erlang/stringprep-1.0.25
+	>=dev-erlang/idna-6.0.0"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path fast_xml
+}
diff --git a/dev-erlang/yconf/Manifest b/dev-erlang/yconf/Manifest
index 30832e8..e1e12ec 100644
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@@ -1,3 +1,5 @@
 DIST yconf-1.0.10.tar.gz 222567 BLAKE2B 18fa535eb5a2edb3fb44b5b59993737cad4d403d30ea113a303ded2ac4803b09eacdfe174adb019eca71002faac72efca61bcd9947a7c94ec4832e0e21c2ca8e SHA512 8ffb9a2b768dc851c9449445061bf6d0ada76befd67cc13f523bd226b806c9e364e687f70b0af07c2ef9b759b2bd1e88e645af21ab7bd289eb982e3cc89e8677
+DIST yconf-1.0.11.tar.gz 222974 BLAKE2B 315939f461fd781dc2c9d410bc7b07e6e0ed522b7cde5af3f23b497336655df267fc0f50b79215493c7ef9fbad89ffcdf22937dcf1873d0b830653e4f51c4be7 SHA512 3a2edb668cbe4c50cada17e6f261cec4b04a464164edfb2f232ea79b18dc7f91f6c28d90e4001174b689b14947e39ba1bcd3feaed641fa248b2a0925f39a5b14
 EBUILD yconf-1.0.10.ebuild 495 BLAKE2B 7ed23e790c6d802c1206a7a1608538d9a6a4a2d19eb392b5993e8be2a7f3238216c4eeeac1e99e9fd940f18c815453b15b1466f93ad8fcda8ce265078a7c8a6b SHA512 d4c8ec5cd4fced419c99c661c4759e2289abd7145d6477c3638c523fac7bbbfb2f68ae1f37e0e6f47d32510c285862825fc87911cf42c7629234308cb79935f5
+EBUILD yconf-1.0.11.ebuild 493 BLAKE2B 381dfc00b39f33c64880aaedb9adcb4881496ea9e1095a9c995fd347d735f22aa54527b2f5d3dcad23778a35573e252618f4038c558b2a42b1ef999a2cf3e6b1 SHA512 21448a8b7f59f342d7ae906d64359bc2e6a95f9b8197ef68ca0ad4055dfa8550bf71729f0b9e96f4f25c73ebbd3dafa145743f27e7b23c343393224ced72a9f0
 MISC metadata.xml 301 BLAKE2B 0eaa7215cbc63e139f0edf503e5a9adc2d6d951c795f13b3b435537af6435e789c7eb48d9c5a2c7f13ec1aba0796cacacb7cb3255a8c754864a6b4e3dfb65ada SHA512 741c861101e6d438535ba24136ffffc603dba0e661134accd761fbe4269ab10c1f98e03ed35859421c382d76c53a09d5d2c42da9535d0cadca4fcba3c2f6d975
diff --git a/dev-erlang/yconf/yconf-1.0.11.ebuild b/dev-erlang/yconf/yconf-1.0.11.ebuild
new file mode 100644
index 0000000..b708198
--- /dev/null
+++ b/dev-erlang/yconf/yconf-1.0.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="YAML configuration processor"
+HOMEPAGE="https://github.com/processone/yconf"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-20
+	>=dev-erlang/fast_yaml-1.0.31"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
new file mode 100644
index 0000000..0184798
--- /dev/null
+++ b/dev-libs/iksemel/Manifest
@@ -0,0 +1,3 @@
+DIST iksemel-20210107.tar.gz 84807 BLAKE2B 832abc3ebf68562f55255d77ed6e190c7114b1651a2ab3370b85504032e7d127797fff132a02b912beb66b8fedd7ff588f6ac1604220ae49391a479fe5d9c19f SHA512 be06b8dd780f511ce793285fc302a3d631c5391e9a0063d5b012d272933e81c455ffc6e62b77bff102a498794ba7b9ebe09b79b30ff512d8ece8d9ef391fbf20
+EBUILD iksemel-20210107.ebuild 890 BLAKE2B d951c1a0db8ded9fda8aa5670f81f2fd029c0bc60baa350fa361032bf20b8b5c039d2c9b926d6e53298db2676cee4ead0e1fd4b77e5f5f65cc795968c4870c26 SHA512 fa775a78dc0e23ff5996c8bf17c75e72fe567462d26d6bd6db524428dd13a5065e76cefc2560e5fefdb9f931e9da44e2e594ce48325be4f0322911e022a0cb7e
+MISC metadata.xml 246 BLAKE2B 54941003640de1376e0d51f872a6dfb40886294007b44f3d8a91cb5de802ebcb8f23e4e85485e97c70e99cfd8e554cbac17ef30d881bcc1c30f9e171a81060d9 SHA512 ff34a0a9cf9c8f09d5626eb98d632ad204c8988670d110b5e59cadd21db123fbcc0c0fb5d56ee18fbc9a71df6e6eb103f67dd9169ce930b99663116f28fcf46c
diff --git a/dev-libs/iksemel/iksemel-20210107.ebuild b/dev-libs/iksemel/iksemel-20210107.ebuild
new file mode 100644
index 0000000..a2021dd
--- /dev/null
+++ b/dev-libs/iksemel/iksemel-20210107.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+COMMIT=7ab20d1b9735ac023e068f99d7d543039a50ef18
+
+DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications"
+HOMEPAGE="https://github.com/Zaryob/iksemel"
+SRC_URI="https://github.com/Zaryob/iksemel/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="gnutls ssl"
+
+RDEPEND="ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	"
+DEPEND="${RDEPEND}
+	dev-util/ninja"
+
+S=${WORKDIR}/${PN}-${COMMIT}
+
+##src_prepare() {
+##	default
+##	eautoreconf
+##}
+
+##src_configure() {
+##	econf \
+##		$(use_with ssl gnutls) \
+##		$(use_enable static-libs static)
+##}
+
+src_install() {
+	meson_src_install
+	rm "${D}/usr/include/common.h" "${D}/usr/include/finetune.h"
+}
diff --git a/dev-libs/iksemel/metadata.xml b/dev-libs/iksemel/metadata.xml
new file mode 100644
index 0000000..30dc8dc
--- /dev/null
+++ b/dev-libs/iksemel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">Zaryob/iksemel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 031bc59..97c3bc5 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,10 +1,14 @@
 AUX ejabberd-21.01-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01
 AUX ejabberd-21.01-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
+AUX ejabberd-21.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01
+AUX ejabberd-21.04-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0ce19b23ed29059d52a4e43d9f94354f6a1724966413cff7dcf0c13a4ede7dd2fff0da405c59bf8f39 SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352
 AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2
 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-21.01.tar.gz 1569752 BLAKE2B 4fb6dfe2d5371a7ec6c8c7e10284c1fc5f323d8b4618b4c3b76df402ef0acecb81bc18813e659a963e1401d8f5e0008d63827e464279b7456f9227dd76eeff45 SHA512 505571e6ad0ea60d5fa4db3dfd59d8e995fdb2129cb94f74e82e32c7a466ba8651e9d59e8ad5a4defc85ff35f4c1c3f4936e41e818af6a738a3960f0c4a26d1a
+DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
 EBUILD ejabberd-21.01.ebuild 9297 BLAKE2B b3014da98f39e97294e70b3c814d4d4a2f79c93595bcc4ecaedc4d62a4129160894b34be613b8a6ffc97ea9d4db5bea2212028b9b2c8da14a855da562e3dd3d7 SHA512 717dc5535071ef69c5db7e58cc171cc2ef9979e0a8ec160238fd589cb89060d2ca165bb8ba621461a06208c29ec7c164986f327383be48a48df9d4fad778b021
+EBUILD ejabberd-21.04.ebuild 9297 BLAKE2B 3277b9b9c1c39d4e9eb2162b12a1d0c190773f05340159b0794a890803af4371bca88acc7378046472ef583a8c2e05d03e534e329965eb7982e2a8bc25d6ba99 SHA512 04a1bc3ed3599d72f5fd657f5ab56b7bbc1478c2ebac18f5a8dab5c0b8dda00bd6e26f3b08ab4aae1dea810a173f4a2c4896020729dee51b1e9e61288dc4d6ab
 MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild
new file mode 100644
index 0000000..ecb2198
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd tmpfiles
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+	roster-gw sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-20.0[hipe?,odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.28
+	>=dev-erlang/eimp-1.0.20
+	>=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/fast_xml-1.1.46
+	>=dev-erlang/fast_yaml-1.0.31
+	>=dev-erlang/yconf-1.0.11
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.9
+	>=dev-erlang/p1_utils-1.0.22
+	>=dev-erlang/stringprep-1.0.25
+	>=dev-erlang/xmpp-1.5.3
+	>=dev-erlang/pkix-1.0.7
+	>=dev-erlang/mqtree-1.0.13
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/p1_acme-1.0.12
+	>=dev-erlang/base64url-1.0.1
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.10 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.42 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.11 )
+	stun? ( >=dev-erlang/stun-1.0.43 )
+	zlib? ( >=dev-erlang/ezlib-1.0.9 )"
+RDEPEND="${DEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-${PV}-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-${PV}-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+	sed -re 's/^#\s+(certfiles)/\1/' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if we are missing a default certificate.
+ejabberd_cert_missing() {
+	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
+		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
+			# default certificate is present in config and exists - not installing
+			return 1
+		else
+			# default certificate is present in config
+			# but doesn't exist - need to install one
+			return 0
+		fi
+	fi
+	# no default certificate in config - not installing
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(User|Group)=(.*)!\1=jabber!' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# alphanumeric captchas
+	sed -e "s|Key = str:substr(p1_rand:get_string(), 1, 6),|Key = p1_rand:get_alphanum_string(6),|" \
+		-i src/ejabberd_captcha.erl || die "Failed to make captchas alphanumeric"
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+	sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
+		-i configure.ac || die "Failed to write correct version to configure"
+	# eautoreconf # required in case of download from github
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		--disable-system-deps \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/lock/ejabberdctl
+	rm -rf "${ED%/}/var/log" || die
+	rm -rf "${ED%/}/var/spool" || die
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	insinto /usr/share/ejabberd
+	doins -r sql
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	fi
+	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
+		ewarn If you are updating from an older version like 17.x
+		ewarn you may need to add an access_rules section to your
+		ewarn ejabberd.yml config file.
+		ewarn Otherwise authentication will be broken and users
+		ewarn will not be able to log in.
+		echo
+	fi
+
+	if ejabberd_cert_missing; then
+		ejabberd_cert_install
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-21.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-21.04-0002-Dont-overwrite-service-file.patch
new file mode 100644
index 0000000..2bea750
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-21.04-0002-Dont-overwrite-service-file.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.in b/Makefile.in
+index a0b4553d..4675b88a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,8 +204,8 @@ install: all copy-files
+ 	chmod 755 ejabberd.init
+ 	#
+ 	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
+-		> ejabberd.service
++	[ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
++		ejabberd.service.template > ejabberd.service
+ 	chmod 644 ejabberd.service
+ 	#
+ 	# Spool directory
diff --git a/net-im/ejabberd/files/ejabberd-21.04-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-21.04-ejabberdctl.patch
new file mode 100644
index 0000000..0fb1f5c
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-21.04-ejabberdctl.patch
@@ -0,0 +1,38 @@
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with This account is currently not available again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's /root is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 571b90b..71336c0 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -82,6 +82,7 @@ fi
+ ERL_LIBS={{libdir}}
+ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
+ ERL_INETRC="$ETC_DIR"/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define ejabberd parameters
+ EJABBERD_OPTS="$EJABBERD_OPTS\
+@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
+ 
+ # run command either directly or via su $INSTALLUSER
+ exec_cmd()
+ {
+     case $EXEC_CMD in
+-        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
++        as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
+         as_current_user) "$@" ;;
+     esac
+ }