gentoo auto-resync : 25:11:2022 - 13:12:41

12 files changed, 390 insertions, 8 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6a4df33b8435..a08f3c296c68 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 5176df3b2d0e..996b15a74bd0 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -4,11 +4,11 @@ AUX elixir-1.11.4-fix-elixir-test.patch 1170 BLAKE2B 05707d9d095f95d6d0fe3b21bd4
 AUX elixir-1.14.1-make44-parallel-build.patch 1026 BLAKE2B d5ba9c3721b34df0e8c707d285f0e06804ef11ea20327637846d8542b0ddd0093bffc36e09a6c4f4ef528a44996fb68f4d0f6b25f016b8317bc3d0c91b3443a2 SHA512 06fb8a0729f1507d9faaed69e87ff39930b1893dc77f6dbc75c6f15c5cf6cb153f4db5283da3028e6248960f23a76c9248ee5169a3e3cdc4d052db25393c05b5
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.12.3.tar.gz 2461828 BLAKE2B cdae9bd7f3463b89dd737ce943d57b7f9801bf382500a274332e1cb87902ecc37bd6e7a53af4dd5c1cd6e6d9d64171e226e676cd8023252c86fdf028d80dd383 SHA512 945e33ca9c3e50015531f87630c1bc1b9966acc64bbf7d01c8c4f8cfc104ee1e08113f572f0ad6a9f5e8ee37e33144e58b2ac33dc0a2b01e1355fc5f8b1b9329
-DIST elixir-1.13.3.tar.gz 2922197 BLAKE2B 47c98ffe24d11ea161e9b9fa55d3c8ee1c2234848707aeeaf715eb02a61b7d3e8784bf2599b4129a824edf004d1edda2f0a42252710d957cc0213202f86dc06d SHA512 88bf585e18bfefa54c1c771247ec489bc96d16cc0f88384e9c0c981ddb665cd7efccd49383b4de1fbbd823ecd0a5e65d76e3065c9ce3c45f2f4feccd01ace48e
 DIST elixir-1.13.4.tar.gz 2912984 BLAKE2B 3849e7be7d1ba54ac3f96690f158b60a3b7da720e85a6c2ef38b078da795c1debaff319133eae6d5e77a7159f452b2ee6a7ad9ebbf7339391e4ee9ae8838d848 SHA512 cd3a28cd227bf60f09500563b7ad4700b2688e0361f975268d5fa81b530aee80ed4f8640335bf08a8c544a2f5d79dbf96c97f281bd3bf4582466a73a9d2edbec
 DIST elixir-1.14.0.tar.gz 3067581 BLAKE2B 1e3b2a13dc0d54462f957c6d69dae11bb1878065a1b6508fe50eeb082a920558129df56f23496f86f566f5ea928308899512b2f2b4463d1fbb3a12953b474287 SHA512 74fa0364260710e7139474437846035aaa764fcc138bedd7c15dd729c72242f56a9d99232524d99701b811e2ddebed84c27586351f4b88cb0091f89fada43ad6
+DIST elixir-1.14.1.tar.gz 3081499 BLAKE2B 1efcf2a2b654634363ae6bc70f677f8a2ea7903452a84c1ad21eb3586a5ded0e4a761ae0de21500daf2f8585ee1d20a8dfa6a7e0bd95a931ce4a4a6e798a0d75 SHA512 8f4c531f36ba1f2f775b1b45075790bfbdcc1c2995cb127809ac9cbb4d6163bf784d9db402119afbcd5f5d75725870cc59968bf751910d29b43f075328265573
 EBUILD elixir-1.12.3.ebuild 989 BLAKE2B 47bdefa354909747406dd7079cf984989edb517510aebb0bfb5d22ee69da6f43db6ede2591a5a2c5bb66a47a457d0179adce01efd1eb619bfc39930442b6ffa1 SHA512 f983fbc863bfed909edb7e8868e7f538552205acc8f74136385aba3d48574932b50f15b3849e6de1c9a4b13ad49324054d5187c7eace6750687cafa31c31815e
-EBUILD elixir-1.13.3.ebuild 939 BLAKE2B 08c0c0eb1772a027274c0a34ecef122b6f50b6b57199bedab6f2ed7cd4dc6f38361eae2a55aa8e0a2fef271feee16c9e9d9ed0a1dcad75aae34791b85ea82df2 SHA512 2a22d8e4dc1051b53c1f3b7a1114d4927ddf2593a60952de7354f9170185e3b86358562e65b8fdf0752d4e28d0989c26be5536d58ab6e2b9744eef42c96d1020
 EBUILD elixir-1.13.4.ebuild 946 BLAKE2B 47664c2aca87236a87ed8d2e78a97ac456db0e72f112db8d6faf8b4cdb0d2d00ddb37bea180896d2d2b6d6ad0934dd702396f55ff70b29d9cccfc35cd61a9777 SHA512 99c68a7d1222d869cffc25935576b0b7bf5b215e062350d178757b6797e8943ad7b026f9c78b111978cf635eff8e241e3f3055292afbd00baa09f216769a8b59
 EBUILD elixir-1.14.0.ebuild 949 BLAKE2B 20c831bcc92632ea7bb7e5b8c6fdf9a64fdf697c195b94638eea1e265526ac304d5be578a59ab9b399b4120b20c5d4a47531929eddcc3766a86b33aff6715393 SHA512 d2dc34eddc7881c13b09c1041cc144b11ad57f304c7c793da311cf8ecf95f07c9ce09d86342973e7f1dfa65221be3e731d6172c3973769e1a4e61f0aeab7bce8
+EBUILD elixir-1.14.1.ebuild 949 BLAKE2B 20c831bcc92632ea7bb7e5b8c6fdf9a64fdf697c195b94638eea1e265526ac304d5be578a59ab9b399b4120b20c5d4a47531929eddcc3766a86b33aff6715393 SHA512 d2dc34eddc7881c13b09c1041cc144b11ad57f304c7c793da311cf8ecf95f07c9ce09d86342973e7f1dfa65221be3e731d6172c3973769e1a4e61f0aeab7bce8
 MISC metadata.xml 724 BLAKE2B ae59dba7153a9cdbeb0ed45acf54cf733f07ebc1b43896f88ff09686ecbdd56553e92f7733e5f556d01e622cadb85a24da879799b0f742d7e257425db1f300b4 SHA512 43cc4435aa89e2ba8edaf8f4cead814c514fac07a7c0500f3f7dfe35d2da6f75f835df0d21d862be6dcbffbd9c6e5ea32b21296048ec903c1491ccfd4854316b
diff --git a/dev-lang/elixir/elixir-1.13.3.ebuild b/dev-lang/elixir/elixir-1.14.1.ebuild
index 02bca9b5f8a0..cb7b7f6e750b 100644
--- a/dev-lang/elixir/elixir-1.13.3.ebuild
+++ b/dev-lang/elixir/elixir-1.14.1.ebuild
@@ -9,13 +9,13 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 ErlPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	>=dev-lang/erlang-22:0=[ssl]
+	>=dev-lang/erlang-23:0=[ssl]
 "
 # 'mix' tool collides with sci-biology/phylip, bug #537514
 RDEPEND="${DEPEND}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 444a916be5c7..eeb30bfcf906 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -7,6 +7,7 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5
 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
+AUX erlang-25.1.2-c99.patch 2686 BLAKE2B ba1ae0682a4c66efef36ed82b1fb3ab14fdabc0dcfe6e8b9605d20f14c690f476cb8e439693b9e63fa047ff9227caa27bc66481c00f86d6d4104568c5380f496 SHA512 7a5214ae8592000caa7e528e0b967d35e3a7816bef7249238a69e83aa2b475b45633d439a709ffab6053c8f3cf31e6def896e2671f4801d0a55ac49f75135ba6
 DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
 DIST erlang-25.0.4.tar.gz 59812650 BLAKE2B cebba32e859ec4ff0868de506771449a6d5d053d50d8f4a2cf84f9bc90da1e14ae320420b3c33f6febd5977fd1ccff98b55d3ee1a0c4b90e674e912883cb0f29 SHA512 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363
 DIST erlang-25.1.1.tar.gz 59974226 BLAKE2B f28662860533c8946429607b8123c241d3646c2c0ab2165346512c2a1b331dbaf46d978bce17b8b792a0487ad96411c2245d273381e304437724335a353093dd SHA512 7e34eca772d29132dc907181ee9829ea58a47e622a9a65c0d4f66e79cb2e8f22a9f9e2edefad67ee6c151ee09027ed3927be65228780cdbe606a0abe59209243
@@ -18,7 +19,7 @@ DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67
 DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
 DIST erlang_doc_man_25.1.tar.gz 1714586 BLAKE2B b37b03f60d662d02018515de5ca16b3891a32c5ebc1bd1cc72ac17aadd409c3c5084898f1605d4a8aa579ebce4b5a8f75a39fa90e5fc4d233b2f7e9b8121768d SHA512 4194779c8975234ad8f693bbe43c9eefd2d954ed7fec493493c4a6a9028b58fd55ce6479a113d863bd91ff4732b88c4b8cae3e3a16846add5c7af6616317f595
 EBUILD erlang-24.3.4.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
-EBUILD erlang-25.0.4.ebuild 4965 BLAKE2B 5a582c538bccaa9a70b1f379b67a7cd07ddf61c4014fa9a19c6ede4234cf0e4cfd9045693e2d39c2cd5e409f95646575177da8cd59a906d3f6969bd5a42e6d5e SHA512 213f5f374b01277b65ebe650f12ed1fae09eb7064f1729da228c0e47a92127000338b655651bcfca4d5e05bd9d8b9298096ea39456c83dc44e2fa63998f8ed74
-EBUILD erlang-25.1.1.ebuild 4927 BLAKE2B b019c3be9d31d41d227036b88cc1682121d6621fc089e7d3e37ab0ee4a7c9484c5f12b9aaa92e73cc7b2266f294f23572a32c86f76c3dcc4faf7a961bcd96e74 SHA512 33ef16ce6d4a920b403ab6d39946c26fbb0208a26fb2114646cb0074a002ebe9d91f27eadba93d0654e9fd66831ea2d5ee6a0ecde957570176689b774963f2d3
-EBUILD erlang-25.1.2.ebuild 5046 BLAKE2B 99752d01911a866d6cb851acfd2e3cf7e1d159c752a42bb3c10b0608cb474eeb7e874d35b534c17945ae5a44b0ab4aa1ee55d0e3110ef4af67f28cb0460654ec SHA512 f2b8eb3399703bbf519de5015011b2c86f3c8bdfb655d83b08835a38d505028701c2f1bea8894d6bbfbc451b7829d7629bddf6842956d1dcbda6ea7c69b0c672
-MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
+EBUILD erlang-25.0.4-r1.ebuild 5017 BLAKE2B 0c78785a21f4e4e59a2718443f923b5a28bfa624bb4b1d041c7e02619e6f5f9fece80a211a5d3624de17c914732d60860bc87a4284631226b5342a266a465ab9 SHA512 926fa60cad6aa995bd316f60be1e3303793531cd3cd16328142be94ce1c2cd65ba30020febeec9d67a5f249355db122f31e6bc0a687c0a8a61193762b24a8bb1
+EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1ce9c9626e500162a2716bbd742ad415e67b58441e95bf990e4eee572fccb833159d9e211cf830a7847b97aa0762cd SHA512 6ccadee9a1644526f67bdb2365ef9c2c17a3ff43260883276545a879e4fa291e21a21149db05e629eae2bcc9a003a109fa73d1c45727d522da577bc042ee5164
+EBUILD erlang-25.1.2-r1.ebuild 5098 BLAKE2B ba49e002eb52e4a899a2e6ceb49c8a7095f825e15a3e1a139cd5ac28c634c09653c5e829920ead5ffbde1b9b316519346a37a8cdaf75788989105f169a932ea1 SHA512 9a24e13b7a23fe6673f05940effe96cbffe4cbc3bc03a94facc3b99ba0e48bb597855fe092d2dc0bcfa520e41fc18098d6db62fbbd84f126d42bd38b3c25186e
+MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.0.4.ebuild b/dev-lang/erlang/erlang-25.0.4-r1.ebuild
index cfab5952952b..59e41501cabd 100644
--- a/dev-lang/erlang/erlang-25.0.4.ebuild
+++ b/dev-lang/erlang/erlang-25.0.4-r1.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+	"${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887
 )
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/erlang-25.1.1.ebuild b/dev-lang/erlang/erlang-25.1.1-r1.ebuild
index de9c4088ead3..3b06f87886f2 100644
--- a/dev-lang/erlang/erlang-25.1.1.ebuild
+++ b/dev-lang/erlang/erlang-25.1.1-r1.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+	"${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887
 )
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/erlang-25.1.2.ebuild b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
index ed72f4f42e78..eba295d5cdbc 100644
--- a/dev-lang/erlang/erlang-25.1.2.ebuild
+++ b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+	"${FILESDIR}"/${PN}-25.1.2-c99.patch # Bug #882887
 )
 
 SITEFILE=50"${PN}"-gentoo.el
diff --git a/dev-lang/erlang/files/erlang-25.1.2-c99.patch b/dev-lang/erlang/files/erlang-25.1.2-c99.patch
new file mode 100644
index 000000000000..bc8ffdaace6c
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-25.1.2-c99.patch
@@ -0,0 +1,101 @@
+Bug: https://bugs.gentoo.org/882887
+From: https://github.com/erlang/otp/pull/6504
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 24 Nov 2022 11:57:49 +0100
+Subject: [PATCH 1/2] configure.ac: C99 fix for
+ ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC
+
+#include <unistd.h> for the sbrk function if the header is available.
+--- a/erts/configure
++++ b/erts/configure
+@@ -20752,6 +20752,9 @@ else $as_nop
+ #ifdef HAVE_MALLOC_H
+ #  include <malloc.h>
+ #endif
++#ifdef HAVE_UNISTD_H
++#  include <unistd.h>
++#endif
+ #if defined(HAVE_END_SYMBOL)
+ extern char end;
+ #elif defined(HAVE__END_SYMBOL)
+--- a/erts/configure.ac
++++ b/erts/configure.ac
+@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use],
+ #ifdef HAVE_MALLOC_H
+ #  include <malloc.h>
+ #endif
++#ifdef HAVE_UNISTD_H
++#  include <unistd.h>
++#endif
+ #if defined(HAVE_END_SYMBOL)
+ extern char end;
+ #elif defined(HAVE__END_SYMBOL)
+
+From 7b720d2bb9e742110ff90ec2495747b2c477e2c7 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 24 Nov 2022 11:59:22 +0100
+Subject: [PATCH 2/2] configure.ac: C99 fixes for poll_works check
+
+Include <fcntl.h> if it is available for the open prototype.
+Return from main instead of calling exit, so that no function
+declaration is needed.
+--- a/erts/configure
++++ b/erts/configure
+@@ -24663,10 +24663,13 @@ else $as_nop
+ /* end confdefs.h.  */
+ 
+ #include <poll.h>
+-main()
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
++#endif
++int main()
+ {
+ #ifdef _POLL_EMUL_H_
+-  exit(1); /* Implemented using select() -- fail */
++  return 1; /* Implemented using select() -- fail */
+ #else
+   struct pollfd fds[1];
+   int fd;
+@@ -24675,9 +24678,9 @@ main()
+   fds[0].events = POLLIN;
+   fds[0].revents = 0;
+   if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) {
+-    exit(1);  /* Does not work for devices -- fail */
++    return 1;  /* Does not work for devices -- fail */
+   }
+-  exit(0);
++  return 0;
+ #endif
+ }
+ 
+--- a/erts/configure.ac
++++ b/erts/configure.ac
+@@ -3036,10 +3036,13 @@ poll_works=no
+ 
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <poll.h>
+-main()
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
++#endif
++int main()
+ {
+ #ifdef _POLL_EMUL_H_
+-  exit(1); /* Implemented using select() -- fail */
++  return 1; /* Implemented using select() -- fail */
+ #else
+   struct pollfd fds[1];
+   int fd;
+@@ -3048,9 +3051,9 @@ main()
+   fds[0].events = POLLIN;
+   fds[0].revents = 0;
+   if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) {
+-    exit(1);  /* Does not work for devices -- fail */
++    return 1;  /* Does not work for devices -- fail */
+   }
+-  exit(0);
++  return 0;
+ #endif
+ }
+ ]])],[poll_works=yes],[poll_works=no],[
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 5d7e897a2877..b94b53e5efc3 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -18,4 +18,7 @@
 		released to help encourage the spread of Erlang outside
 		Ericsson.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">erlang/otp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 279dc028a753..8746b6c1d4c3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -13,16 +13,19 @@ AUX 3.0/900-musl-coroutine.patch 842 BLAKE2B 21b58911e2c020ed956a837f006b20f30a1
 AUX 3.0/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
 AUX 3.1/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
 AUX 3.1/010-default-gem-location.patch 715 BLAKE2B 1a3b0a3479210f6bafe89bfea4580ebcf44bb5c42b72a244dee9fa53371c095d6c8ff39feb58296518779b5841647ed89732bed33c542ad24d5b93ba97097cd6 SHA512 e0d0ebfc6de8dfb81cee309f0d1b7a9ccf64617ea16ad6d8d3ea715b29fb7b3bb6d962072503eee7125ffc1e5ba53035453e887935e681de3d35df279d7c0dc8
+AUX 3.1/011-default-gem-location.patch 689 BLAKE2B 754bb18d8d028e763cc4e91e5a0a543beee807d0dd9d68e3bef52beafd2a28896372e20e5b9ee9fd6556323f7369f30a0c65d676e5de869bb81f978b6f7e655b SHA512 71e9ec7e0e6353cc4b973ed6dbe3c12c7784173705dc17a2e772f653aa592f2252749955f7957aa7526071eceb927711ef9055430ed3671025e35f57898ca754
 AUX 3.1/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
 DIST ruby-2.7.6.tar.xz 12084408 BLAKE2B 4b40e66aeeca3884983fffcf31c4713eb4fcdd62232e795dc5a0c03236c3c05200068902c0cb987455297bec2bcfc2a9a24f2841d18a480c7d09b86318daab3f SHA512 e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f
 DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
 DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee SHA512 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
 DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
+DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
 EBUILD ruby-2.7.6.ebuild 7913 BLAKE2B 8330eaa1563f2880730eee59532de22372aad9bc8c7ea94ee489869100875890316306ee5edc268acc105be2a54b2fdb0a456364290e69bd5b046acfbb189012 SHA512 224412dcc37ec8368907190e14ac3dfe16f5636b442d92f029b55a1cfdffa036828c279e8da9af61ccbd3c218e138068e35e3cc2d2614424c15395281a2cad9a
 EBUILD ruby-2.7.7.ebuild 7927 BLAKE2B 50adcd38077c99ff8c912fce61942d3aa959c3d158bd14acfa0adaa40072e1e5e594fff9ad2f878ea66922bd76b56d161cf316b47c94c8aa03840a5edb60c45a SHA512 37797405276eee024dafeec170d46e9608fd13203d18f3e51615f3b66903112d44a5cfd4338d7a5a7cf04c567f8227c35b179bdcd9fb40a8fc215c6a444f4b9d
 EBUILD ruby-3.0.4.ebuild 7768 BLAKE2B b20ea1f1c0cbc583a41587f7c32e83def9a50045cc6bf6607a0ef6f90b6712d0bc242abb5ad15a152b3b6b037d3038c38006e34b4b6d777959ec84250ccae6fa SHA512 9ae32072ad97f3fe39a98bcd6ec249a6d1be97e8104b8482dd3d56c53b945c154cac4b67012938fb9b87352e984c510cd48c9e0ed602577c90881b3fb845ec2f
 EBUILD ruby-3.0.5.ebuild 7774 BLAKE2B 7ccf3d999e50ee855c60969763c057dbe9354b090fe9928dddd322b6189f526b2e94504f9fd6b0f352f3dca039fd74fec3770f1777ce7f7ae9ec0e41e798907d SHA512 b10709b08711b5f3292813f60d0fca56fbf1d66e1893312e77812759ee056ec8fe5883d94d57b103947d518e0ec392e02bddb8370cf6508366f8293715a2ef62
 EBUILD ruby-3.1.2-r1.ebuild 7386 BLAKE2B a9d1ddefbfb87658518a66a49cbd69b3f17907c65997468489356510733f51a8e02b560303e0581dcfdecd6ccf0c2b4ac57c21b4b69505d151bc15c9f1d508ee SHA512 ada276970c6f78ccb8085f8c2b898bc38170b62efb32f3fa024b8852f60bd3f723c4d3c9c0b6cd1b6877486f91372a6880c38ee01aea2cf3bafdc0abe85d6553
 EBUILD ruby-3.1.2.ebuild 7716 BLAKE2B bbdc7631efe895a8eb09c8bd6d0e04fab70a98e372e8fb0118f5af69a7202df4235481312bfd335034642f18cea15af20cef230bed5ec0fb133801263828006f SHA512 bf97f0af405bfa386fb35b596663d2b75641d175902eaf2d93230561c4e2da1d6fc02c8bc9b9c12c963dbed2125de836eb9bb51b3107b69c28e792a4c6de610c
+EBUILD ruby-3.1.3.ebuild 7518 BLAKE2B b2ed93e5681dad89f143af813c75e515d96c0c698f21a6a19a7ed959d5eb165352f6d87dc7a76395f9bbd43f8d17995c4f3511a37b8afa397a7b67f051a66d6e SHA512 b45cd6530aebf890663d1481fb0354363de0e7ca8a04b575d14e643b40b68eaf4d47d9c372165860ec49382d3ea9b6b078567c92b29042d75c69679e35615c0d
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/files/3.1/011-default-gem-location.patch b/dev-lang/ruby/files/3.1/011-default-gem-location.patch
new file mode 100644
index 000000000000..fe5d33d69c01
--- /dev/null
+++ b/dev-lang/ruby/files/3.1/011-default-gem-location.patch
@@ -0,0 +1,20 @@
+--- a/tool/rbinstall.rb.~1~	2020-12-25 04:33:01.000000000 +0100
++++ b/tool/rbinstall.rb	2020-12-25 10:05:34.629096405 +0100
+@@ -897,7 +897,7 @@
+ end
+ 
+ def install_default_gem(dir, srcdir, bindir)
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "default gems from #{dir}", gem_dir
+   makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+@@ -1010,7 +1010,7 @@
+ end
+ 
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+-  gem_dir = Gem.default_dir
++  gem_dir = ENV['GEM_DESTDIR']
+   install_dir = with_destdir(gem_dir)
+   prepare "bundled gems", gem_dir
+   RbInstall.no_write do
diff --git a/dev-lang/ruby/ruby-3.1.3.ebuild b/dev-lang/ruby/ruby-3.1.3.ebuild
new file mode 100644
index 000000000000..a918b04cd949
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.1.3.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
+	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
+	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
+	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
+	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
+	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
+	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby31]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
+	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/3.1/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
+	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+	sed -i -e '/def test_test/askip "Depends on system setup"' test/ruby/test_file_exhaustive.rb || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}