gentoo resync : 08.07.2021

22 files changed, 924 insertions, 21 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 598cbfe877f2..93f9cc23d585 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 6931fdacdca1..05e012b132de 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -6,6 +6,6 @@ DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0
 DIST elixir-1.12.1.tar.gz 2458060 BLAKE2B 512f016cb7f064f2b90a4d2dae4ffaf957422f049322b5fbed1eef155687b1111de89df838c254cf123b904e64f746fc19175372166526c739d8a1d66f9abb0c SHA512 ecea8a95d05e85431c324c7e15fdd08639a52fa6031fb8ec671825debecd892d2258b3914fdd8417728be1a18202d211eeb19869797ad0fd022c6ec91cd05880
 DIST elixir-1.12.2.tar.gz 2460047 BLAKE2B eebcb4b828bf445ece6bfceb40b228406a15b0d33fb6efcc2b34fa4a264d83c5d71aa9787c5b641e903fb97ba02da07f3edf76424136e3dab0248a65823f225f SHA512 4c19a6a0310606b3016b3699079dc5f667e348c86c92e7e998cbecbacd283f5f4ccdd3d83b757725ba637a39729e9d82673b596feee72e831d575630e2f3111a
 EBUILD elixir-1.11.4.ebuild 922 BLAKE2B 718117a8aee4294e70930d45d6b39d6522026c48165b9af54eae4b612458509e456586e8c6a256175ed4e66a6e36293d22d65d69b1fb40ec28efb6ee1b511fbf SHA512 e77cad093155fbcbab5247c18c4c45db407df167c296d9587c19826d303c0e38f431bb4c3ea61537dbfd0c211d4917ce08a38c6f6a2c7fb1c6040c0e279c9b8a
-EBUILD elixir-1.12.1.ebuild 886 BLAKE2B 946c6fb8fc5b2500ff4a58bda868b3ed5beacd1065e49ca410a0fb38c3411482843dce90a4eab87ae8ac96567cd167ffcafcbf960dd059d8411744e3fd125597 SHA512 8256f2f7d0d3e064b99059f5d9b2defb4275bbaf81529e44bd761b28e035e11dfcba21c8f446b9368198d9047980fc955c3c6faa9bd03a9c818ccd2e26dd0c49
+EBUILD elixir-1.12.1.ebuild 885 BLAKE2B 0cf4450d8fe1d52b905b67cc0d6f68d11397d0271740ac2bbfe83c7101859619e68c816c8f11de67fc9fc2352205feb3785f71d72bd532c006177439811e0ab2 SHA512 47788cd07700abb2e6bb3a405b9e0a34444d5242deec6394263819bf61e2d34d498e57b5f26d31af9a0883a89130f61846ad56373bbaefda155599f59acc6f38
 EBUILD elixir-1.12.2.ebuild 886 BLAKE2B 946c6fb8fc5b2500ff4a58bda868b3ed5beacd1065e49ca410a0fb38c3411482843dce90a4eab87ae8ac96567cd167ffcafcbf960dd059d8411744e3fd125597 SHA512 8256f2f7d0d3e064b99059f5d9b2defb4275bbaf81529e44bd761b28e035e11dfcba21c8f446b9368198d9047980fc955c3c6faa9bd03a9c818ccd2e26dd0c49
 MISC metadata.xml 820 BLAKE2B 7fd55cc9f7450d46060069909506fb74e93234ccd319b5f5b428580fd4f55c59c2ada78770ae744d784838574d87522d3e94f101eba06b5a64ebcb513db4eef3 SHA512 11300d8d6d6cbb73b55d4dfb44d04fc087867bab1fc3fcb0564473d911844d3be148170c03a9247c6a407d8de88442ca6017c00177d93be46b37166d3ba42593
diff --git a/dev-lang/elixir/elixir-1.12.1.ebuild b/dev-lang/elixir/elixir-1.12.1.ebuild
index e35418c14594..a62e3bc859e9 100644
--- a/dev-lang/elixir/elixir-1.12.1.ebuild
+++ b/dev-lang/elixir/elixir-1.12.1.ebuild
@@ -9,7 +9,7 @@ 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 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index b6613898bb70..39a66021861d 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,6 +6,7 @@ AUX epmd.init-r2 388 BLAKE2B cf8f1b3bfaf5c0bb1a7acebf41e1c1138b880e91a5c732cf3f8
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 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
 DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5
 DIST erlang-24.0.2.tar.gz 58878378 BLAKE2B c2ea65cac39b654d9037ea9fcb47eb6eea96dec2483378f414bc33475e850121c1adaa30ea880070624496be9779539f98c864b0dd6eb92d3c4badaa121353d1 SHA512 d85e3e6a4177ac8c696dd666183f624065a89d35aa7f031cd6a7b105e0d1f9007de8d413880df47daf8f695485d952a81a14a01313b52f66534c1e5bd050093b
 DIST erlang-24.0.tar.gz 58258571 BLAKE2B ee71c1f19a1d990977d3764bf4122593a216e4bbbef7e5a8a5c7e22142171ef869b4a5ac01aa1f4495eaf79808cbb677d4163a52917879e2a615f08e20480c7e SHA512 bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b
@@ -14,6 +15,6 @@ DIST erlang_doc_html_24.0.tar.gz 39731398 BLAKE2B 8a9fe3acb4cc13691e16c477cf89e8
 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
 DIST erlang_doc_man_24.0.tar.gz 1666152 BLAKE2B aaef8165322f39f7410840eafe562ec5038d9c89b4fa99b3b1d5748ba70fe755ba732de403dd916328e1fdcec895e2a347db4fb8c8837b5e41155439c9c54ef6 SHA512 7251f6eeb0534cc8538236a2c4be9d732bf0a05ba6832f9b3859116f9148e469d004331924c7187b07204798afb66067bfd321c8905000c355775927e5841918
 EBUILD erlang-23.3.4.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5
-EBUILD erlang-24.0.2.ebuild 4669 BLAKE2B 5ff7921d899a7916f4d8e1c9341570147b30ffdfa1727f1b5b8a8893b3d61b7b939d60e367186120cedb0036d56869c570be7fbffeaff34ae116563266ce311a SHA512 51faf82b1799cd3a03780e2ab820a1e725a0070b7aa4d11759173ed1ee417d69115176dbb3992498750f5fd5ef55a0c56e8597dad63c06beae7a26503dbf0d90
+EBUILD erlang-24.0.2.ebuild 4688 BLAKE2B 2262a81932e8400239b2c2210cd43770bf7901779e131338e41ff00304fe0b339eb73f06c54f7b1a79d39c99720db368d5aebe90b569f4a371267a5596cc7081 SHA512 070588d0e362007c51ac875b896d773b6f74ab10317df6b5a0b55dc4dfce004a34b2a0ac98a5f36ce1407dc5e0b489b9780669e9d6684ebdcf7d34290dcf5640
 EBUILD erlang-24.0.ebuild 4518 BLAKE2B 16fd9ddf0f829df46a5edd2349cd309ad931ef7b95c8e3cd4c02b5d3af38e72233ddd55cda5dcecf9b095ffb8d98d66d2082bd4b5a00f2a3a3d975b4c3af2d21 SHA512 e2b266b4bd283d8782303e6e213eb479e7fa1d4a7d69c3ffd0895d1fda7dcf5eda99445ef314a4497fb146dd40a7a1b25aaa7371b7b412bba148ff4c54bce16a
 MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
diff --git a/dev-lang/erlang/erlang-24.0.2.ebuild b/dev-lang/erlang/erlang-24.0.2.ebuild
index 40a0d0afa216..ae5aa0920a4b 100644
--- a/dev-lang/erlang/erlang-24.0.2.ebuild
+++ b/dev-lang/erlang/erlang-24.0.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
@@ -46,6 +46,7 @@ S="${WORKDIR}/otp-OTP-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
 )
 
 SITEFILE=50"${PN}"-gentoo.el
@@ -58,8 +59,6 @@ src_prepare() {
 	# bug #797886: erlang's VM does unsafe casts for ints
 	# to pointers and back. This breaks on gcc-11 -flto.
 	append-flags -fno-strict-aliasing
-
-	./otp_build autoconf || die
 }
 
 src_configure() {
diff --git a/dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch b/dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch
new file mode 100644
index 000000000000..5068be153eaa
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-24.0.2-serial-configure.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790563
+--- a/configure
++++ b/configure
+@@ -355,7 +355,7 @@ for app_dir in $app_dirs; do
+ 	echo ""
+     elif test $app_dir != erts; then
+ 	echo $cmd_str >./configure.result.command
+-	eval $cmd_str 1>./configure.result.stdout 2>./configure.result.stderr || echo "fatal" > "./configure.result.failed" &
++	eval $cmd_str 1>./configure.result.stdout 2>./configure.result.stderr || echo "fatal" > "./configure.result.failed"
+     else
+ 	# ERTS configure gets to use stdout/stderr; the others are printed when done...
+ 	echo "=== Running configure in $ERL_TOP/erts ==="
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 5022fea64335..3f8ba6d5246d 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -1,7 +1,9 @@
 AUX 50gforth-gentoo.el 200 BLAKE2B 1e3faf9b1c8cee5644e49941c0ab46d1f9a53911c50bee6f79f155678c432ce2c0ee27355496d75c489ca61fe2fac74441142eaccd563a4b5e0e426889aa8b30 SHA512 4bb26614777a8147d3bc869ee5db4ebbb594aaf7456c315e077a982dbb9f972cd15ddb977515036ca07594995b623cba35daade1abfcd3a2cdddac7ffbdf4027
 AUX gforth-0.7.0-make-elc.patch 437 BLAKE2B 614b8b5a718be0f3cf3802b75ac38e845b3583dab6d8554c9ba08b1768f3818ed760e1b69389fd3cc99418ac30c5579c29491a43778e5cfcfd5f41eeb39e3e20 SHA512 d4d2c0eefe6ecc0fdc8c58147262324292c905e3cafb360a5d7c4e6eac92798ec416fffae21834f9d29c1e9117a500891285e6a0ff5405346d4a5e63c10f1bce
+AUX gforth-0.7.3-CFLAGS-LDFLAGS.patch 1097 BLAKE2B aa66797e6ebd04966f67275a8b0d962027378182f00648d4c198b48590d2e4ecd3870069a0ebc1d96332f875963f343b47f2d8782b2fed364773776dfb88fdf9 SHA512 2fb8d0c5ff4805ae5203ebe20ce6396ace3bc64ad1c6e79565642cdf7378b5d114622e8bdc2428c8815e45aa88864dc43ede6b61d09162fc5063f93ec684a326
 AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2d74d607cefa8fd6a29e987a3df90aaf4e09f4ea7cc3475b93c8ea1f308049a117eb8ea258cc50e962ce5e501b513b3419 SHA512 32ad96b1de651088b375fa9b8decdd8f03f7c492ad6a11e7cbdc574557b2fe7458180ae71919e1f76c6175d443d50582c94876489af0c961a167b40b3d1a4b7d
 AUX gforth-0.7.3-rdynamic.patch 578 BLAKE2B 10e978a2f4edef4d66e839d2f9d047526e54235ed8c6a1a0b754a38149c2a2db2481bee898dfbc209cf8559b6f2cc408b13d594b7007b7710f3c619549321197 SHA512 2bb1491b82b87bcd387822da501078daad171950cf870f8644d909a848a4843e3fa99d8782d16524353edbffb71f704ff7bf5fa7bf326501f7dde2c294b2c8ee
 DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
 EBUILD gforth-0.7.3-r1.ebuild 1313 BLAKE2B 783f8030fb856719b5cac67216f21a6c3517e7b7c20772ec5fb6486033f6eb3eb6a3f313ed29ef38dde2f6dfc8bdc1da1239dddaeb98d057153947a676904654 SHA512 c970bfa352e8ca1ea1b46c0c5ff8bc3397577668616668b348f6d09ad99050210e26d9e06f1fc5aec8d56d79012cf8aab73fd28e73fb875fe6e366dd480f41ac
+EBUILD gforth-0.7.3-r2.ebuild 1639 BLAKE2B 9a9b3b2d0e1ba2a16426b5ae090f1d8ea19fd07bd02c09b3b0073cbb47de3d35c4ebc0138d88554a2895c086f0b229c8bb4cf70a00201ac5696e878a811272fb SHA512 5c03928607c6a0f5459590f667f966c6a8a9414841c7e5b54ce471139a53049e5f57d0b9e65749d929a36f54fe105778107cf854d5e8b395f12c15bbadc0b4c9
 MISC metadata.xml 326 BLAKE2B 6da20ce2a24c972471a238851ab8507c86dbadeb31012151be42584e9d57bebdce2756f559de384330dc046643f488d5c1113a14ee062c3876af781ec06bd0de SHA512 ddc827fdf3ad56400315226a9a396689925918c60a9bfec1c3f927a3408b16da0c2df51e987fd8943e5575446f98fe7a83547fa168fc6863f7bbff0bc5272dae
diff --git a/dev-lang/gforth/files/gforth-0.7.3-CFLAGS-LDFLAGS.patch b/dev-lang/gforth/files/gforth-0.7.3-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..55041f435646
--- /dev/null
+++ b/dev-lang/gforth/files/gforth-0.7.3-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/723072
+--- a/libcc.fs
++++ b/libcc.fs
+@@ -562,7 +562,10 @@ DEFER compile-wrapper-function ( -- )
+ 	0 c-source-file-id !
+ 	[ libtool-command s"  --silent --tag=CC --mode=compile " s+
+ 	  libtool-cc append s"  -I " append
+-	  s" includedir" getenv append ] sliteral
++	  s" includedir" getenv append
++	  s" CFLAGS" getenv append
++	  s" LDFLAGS" getenv append
++	] sliteral
+ 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
+ 	lib-filename 2@ append s" .lo" append ( c-addr u )
+ 	\    2dup type cr
+@@ -571,7 +571,10 @@ DEFER compile-wrapper-function ( -- )
+ 	\    2dup type cr
+ 	2dup system drop free throw $? abort" libtool compile failed"
+ 	[ libtool-command s"  --silent --tag=CC --mode=link " s+
+-	  libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
++	  libtool-cc append
++	  s" CFLAGS" getenv append
++	  s" LDFLAGS" getenv append
++	  libtool-flags append s"  -module -rpath " s+ ] sliteral
+ 	lib-filename 2@ dirname replace-rpath s+ s"  " append
+ 	lib-filename 2@ append s" .lo -o " append
+ 	lib-filename 2@ append s" .la" append ( c-addr u )
diff --git a/dev-lang/gforth/gforth-0.7.3-r2.ebuild b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..dfd7e9a7b684
--- /dev/null
+++ b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common
+
+DESCRIPTION="GNU Forth is a fast and portable implementation of the ANSI Forth language"
+HOMEPAGE="https://www.gnu.org/software/gforth"
+SRC_URI="mirror://gnu/gforth/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="+check emacs"
+
+DEPEND="dev-libs/ffcall
+	emacs? ( >=app-editors/emacs-23.1:* )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-make-elc.patch
+	"${FILESDIR}"/${PN}-0.7.3-rdynamic.patch
+	"${FILESDIR}"/${PN}-0.7.3-rdynamic-auto.patch
+	"${FILESDIR}"/${PN}-0.7.3-CFLAGS-LDFLAGS.patch
+)
+
+src_prepare() {
+	default
+
+	# gforth uses both $LIBTOOL and $GNU_LIBTOOL.
+	# Let's settle on the former: bug #799371
+	if [[ -n $LIBTOOL ]]; then
+		export GNU_LIBTOOL=$LIBTOOL
+		# ./configure does not generate it, but slibtool assumes
+		# it's around
+		ln -s ${EPREFIX}/usr/bin/libtool libtool || die
+	fi
+
+	# We patches both configure and configure.ac.
+	# Avoid reruining aclocal.
+	touch aclocal.m4 configure || die
+}
+
+src_configure() {
+	econf \
+		$(use emacs || echo "--without-lispdir") \
+		$(use_with check)
+}
+
+src_compile() {
+	# Parallel make breaks here
+	emake -j1
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS BUGS ChangeLog NEWS* README* ToDo doc/glossaries.doc doc/*.ps
+
+	if use emacs; then
+		elisp-install ${PN} gforth.el gforth.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index 160abd8f2f74..a8f47565cd9d 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -3,4 +3,4 @@ AUX mmix-20131017-format-security.patch 2256 BLAKE2B 2481c33c024d84af03b289ec9f2
 AUX mmix-20160804-gcc-10.patch 822 BLAKE2B 182ff974d458e06ac5c90aa44f0255f20a97c7702a49f3b36ba541c6414f63f8d2c1d3f56e6abe624e06be198b963d018ba3403baac0773b114946d96fa9272c SHA512 65fb04add6fa1441f9cc699af09cc84b67701113db1406d7ec582ac2023221f02dd1972393c3114fa0801a9f686b24d8e5daededa469e155da33aaafee72a22c
 DIST mmix-20160804.tgz 308410 BLAKE2B 8bbde51921fe23f016e35bd51346e6445d530815e5e87bff44cf17e081c6b8e55dd6bd24f1ce1621851d2eac309fa44d71aa33d93d3ddfce5213c6643181d38c SHA512 35c518227a4ee40d0aa3be02eda2ab8b2a27696fa789f5007a978419d07b3deebb7f391895e63e3556aeb38dc1ded3bddf2b860125ebf8f7848375e90dc7af75
 EBUILD mmix-20160804-r1.ebuild 980 BLAKE2B 1aa11e3529d9d7d17bf367d8cd60601373d3b079e0daded4a7fb61daae0b608b38801db235832c8a6565d3af72962ad80e94589a0d3d9d12eb10069eebdaddfe SHA512 6a1603509b1865ead60840a42cb14abd08d56c03dc799befd9343b6899f21a8fc018dedb6d2a2e5a562151814996b00576201e45c50569ca3d49268dbfa9faf8
-MISC metadata.xml 359 BLAKE2B 8e1746961e93d5df12f25907921a6186e3ae082de593f976cc4a253a0fbe9f33e78b6538b4a33e958f73bab2d20179eca1b54301240d83d16471c4acee95426c SHA512 70c8cf6e10f42baf6d223ef0f622465a8f196b2935276c793d5961e6304478c0f03231ade7c3e776e9bffb70bf53c550aa23c8a65ddfac1562c71314d85fb622
+MISC metadata.xml 247 BLAKE2B 9d65f58a46596a4c23d009a2d776c25c5a9dd76ac91ec6f6f548f5f786e43f0be694628bc528dc24d2fcb5efcf7cf95643aea633f12eda3d482d2d03a952d388 SHA512 44f366af35524b7fc87b2eb6c7241918d2afc9b30f1a28289d803ed0125e9099588a2bd99a75e34e3c70fde30765050e62ef5b47975e2a1860dd7a560709459d
diff --git a/dev-lang/mmix/metadata.xml b/dev-lang/mmix/metadata.xml
index e7b0978f1b8a..5f92e9ec0673 100644
--- a/dev-lang/mmix/metadata.xml
+++ b/dev-lang/mmix/metadata.xml
@@ -5,8 +5,4 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index da2434c38b26..cec8d3018c29 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -10,8 +10,8 @@ DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e
 DIST php-7.4.21.tar.xz 10346628 BLAKE2B f758d6bef60f5e0c99bd097533d1663640362c2b752a3bd54389acc3bd7d173c1ba5d4b1c119b6ad50f5029aabe2349bb4646a33212dc3cf34fd294f24def401 SHA512 778ddbfe614fdc6a00bc82c61f4c636bdbe815ce3398415a29bd24a2fd4ca2113b3b804303585d8830242e04b0c202bbc7c725a46c9bad79b070a0e896e5e681
 DIST php-8.0.8.tar.xz 10674548 BLAKE2B d2446ae5b80e692106b89418864e4253e000741addb7526599ec8db96713f91a5ab3bccd5bbd2f536b16cc58afafdf22b19996d424dfdce3218a8083ee2bdf37 SHA512 1f8b94083b64705e24365af57169f8ff08115f31a7471238d9ed7a24b692e46c789f3fc00ff2bef2205243b9cd9c4736831e995a004afc7fc4127f3b74932428
 EBUILD php-7.3.28.ebuild 22673 BLAKE2B 6c64c471608b337f4ebd5d07a9cec58a38afdf3ca5b64d094e4e1a37040dc4f95331c1fb7bf8f3a8c5d3cf2b0f6b215b4b342fecb162c69bc29214cb250553bb SHA512 49b0d559c6999719ca732d9a40c9154806092083b7da2e5a11ab33718b638cb774de3a6af81949c408e99ba18a3720c4145022221921f3a7bd84572ac28c98c0
-EBUILD php-7.3.29.ebuild 22690 BLAKE2B dd350e0df77cc2a4f006b0e4a9e5bd0d5ac9442a27307ff15df78ccd5b9d3bfdeee307dd7bf6bb665cbe63237678270f370c436b62862e9c7da4483b5d488bfe SHA512 59cf4ee0b998240145945190370e41d20c731c37bb7909f75da8b3deff08a6036c7ce24366b0c2ddc6b325ee4564429bb1339b852ef973f1b2c566b19149757f
+EBUILD php-7.3.29.ebuild 22687 BLAKE2B 2d1a20ad1a79c4c3991497a3086d961e0ec7380f57f512109e42daae8121098505a1d7c48c146ba3e3f470727773c2dc6d654c497574b68d61361fb81d51482e SHA512 087458a60187d93550a78de17878eeb7e712ea9876fd7451e162187993414dbb023225ca0ed1c6a226efae14133e55d23587171ac4cf3560db31a187fbf60a49
 EBUILD php-7.4.19.ebuild 21382 BLAKE2B 27074fae8c5d1b0727acb1ca1672b0300edb30483ec7fcc4b0102982e8ea6a31f4c5f55013243c2de3e3192864ca466cbe1ac589689204ba976eb85cfae7db87 SHA512 afccdc44f0ddd1c5417c8be6655a947508b82c8cabe57a24174fd03eeb951b730136379c2a0f978b10993fa4b0a7ef6eeb95b398298ed4433db86b4e2d2ba872
-EBUILD php-7.4.21.ebuild 21399 BLAKE2B 3968ac7e3f66925ef96ea4a62e64207046005c529cd7231a1108b3dfd0a4be3ec9d8796d4725ee951c3308cde5b4a9fb0408656ea0339c10a3678872bb590f36 SHA512 04bc80d359e3d348e762d8ff81aa5073aab9085a1b4b5293972fe43b0c30f5cda897ea9c912d8cb1fb444989709fedcf3f427914f35bef1a844c18f1ae385f33
+EBUILD php-7.4.21.ebuild 21396 BLAKE2B 7571d15c3386cf7d85e93f7c9c89c7584935a215d5bd877bdd1ece3379603b1a43bfe31b6e059e2079c2e9858bbc0b9ba3f666750f8f7d4c01c9f8ef97e6fe8a SHA512 1960c773245406fc427857f5aa05eabbd6bcdd1d7365c35ddcd7212ec96274eea1ea2cbba70e43959cb0b43990edefb0a086bc7c3d8aa2449dfcc5b1c90c75c7
 EBUILD php-8.0.8.ebuild 21338 BLAKE2B 35fb85300c3908659048da43377e00d599344b5bdf9024de08301cf5e3fc3200035a9d7a9db5a4dedb4f814a6bcc11b64db7ed1c2e3b8f412446326dad4330da SHA512 e8adab55766f6127de9aa6becdeab4988a634eb0149ad81d124a3721cda26d3f35489cfddb1e3dd3f4a210b0d7f4b86f6ea19e539eb80984ee2baf0afe79ebcd
 MISC metadata.xml 3268 BLAKE2B 4abc96d858186ab5bc6f0797fb3f1cf7f5aaa0b07a4652dcc16aa65e197bd73803f6bac717084c0c9a194e7da5b6632523105205011a0d39221aabc16ade8e2e SHA512 1413edb5293cb93ad8f94376f11b9952ca6369b667ae23baed56d9cbaa68cb9cfa5a80da7dd7184ba84f08d5a4054068da1c10daca81d1730e7b6edebba8b29f
diff --git a/dev-lang/php/php-7.3.29.ebuild b/dev-lang/php/php-7.3.29.ebuild
index ca53010503c1..62dc6b1ade84 100644
--- a/dev-lang/php/php-7.3.29.ebuild
+++ b/dev-lang/php/php-7.3.29.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.21.ebuild b/dev-lang/php/php-7.4.21.ebuild
index d747f5c16da0..7ff49f4fc8b0 100644
--- a/dev-lang/php/php-7.4.21.ebuild
+++ b/dev-lang/php/php-7.4.21.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 319f42bbfc28..4432be09a826 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -21,25 +21,31 @@ DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed5
 DIST ruby-2.5.9.tar.xz 11314448 BLAKE2B ed3c698f076066b0ca771d69ffeb92bf10de6fe051a36d373445ce071af850cb707344becf610657b473d14c7d4dcfb6a814b9d69ed6999e69c6dc3bfb3eaee4 SHA512 239f73eb4049ae2654b648ab927b1f74643d38a5f29572e4bd4e6aa3c53c1df29e0a995fd90d4ab9d4b2ff073fd809b12df820ccb1ddf395684bba6be1855b7a
 DIST ruby-2.6.6.tar.xz 11567284 BLAKE2B 45e910dd9b128c46bff3003834c4fdcbbc2e2e4d3e44f298ff4356a285de2c375d6b6021a3aa28d89336b32a1655fa4a7c086d07f4a0f6bcd578a11dd4a894da SHA512 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62
 DIST ruby-2.6.7.tar.xz 11591404 BLAKE2B 4578f29111fe7845265290dfa9d0146e85f3feb646160d96c1ea04aadb6f0fe8992bf3c7708624132106fdd674978ac21ca24eb2ba13d85572a9467f90417615 SHA512 ba6fc0a36af2a08cf1b008851e805f59ea1047724fc7b61d4bc674533b8f123cb12fa0969e9a3f57290477c0d75f974ca7e304836e4905bd96a737211df9bd21
+DIST ruby-2.6.8.tar.xz 11599488 BLAKE2B e5b2949233d8540f72d4d8b9c246f9bd0d1342426d2a1c19cb240b7c86f37299e9dc1dfc98ef2a86d1d91055865b4542d690de5567c71189bf2973a4989fa0fd SHA512 d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d
 DIST ruby-2.7.2.tar.xz 12037052 BLAKE2B a4ad22295b3fed4e8064fc6e77adb8642d1fa7ae1f4ef912d7bde19c735cb25b1a3e3aefba53dad944046d844d608bcefba61c314cf1e52747f50d7d91f4c436 SHA512 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
 DIST ruby-2.7.3.tar.xz 12073568 BLAKE2B ee6a7fc8ea611c3204efb32634743bc6b2df46cf3ae7310fc6895a22d0404256911e8d7141ee0a0f1c4cf7cf3b2fdccef12d9fb23eb7916c6fec48c411034dc3 SHA512 b755d418b3bab2f9f6a8893afd13869269f17065643dde78b9e85ae3538a6d0617893db6e9c3908e00a40c7577a5c912a7c822d8f245cdcfb857be76dfb66c1e
+DIST ruby-2.7.4.tar.xz 12067588 BLAKE2B 2680a7ccd1daf3d156d9519d9132853e68f5f1aad592abce3e73fdd03314a6c28e7d94590153aead86af8952ff51f804ee029f8100b0137919cc27373cb8b9cd SHA512 2cbb70ecfdd69120e789023ddb2b25cab0d03bc33fdc367a8f74ca8a3ee785c18c8ded9de3ecee627c7e275ffb85147e6abf921b6a61e31851b37c7fedf45bf9
 DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3dd5366a17da709a55797c798d099424a5628c78c842b825fb336c6a769ac9c371ef276f42bf3550fd0761ebe SHA512 2a23c2894e62e24bb20cec6b2a016b66d7df05083668726b6f70af8338211cfec417aa3624290d1f5ccd130f65ee7b52b5db7d428abc4a9460459c9a5dd1a450
 DIST ruby-3.0.1.tar.xz 14486780 BLAKE2B 60872c457f5bcb58e1bb1792ca13ae21c7cc30d22ae9bd072b3f6d6b83f41e535d905d19fd1aaf7a377801a5b610930bd1727219ab3c1461ee3d1ec7d041c2b6 SHA512 97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7
+DIST ruby-3.0.2.tar.xz 14746080 BLAKE2B 47c5591261fb63b1ec3ca719ea6b0c348937456c3711351c1f5317d1e6a748de197e90c8bd4ff822f7b2d4580ad7ed0b54b9eb7aaa5166ea1a15ab2deae96439 SHA512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
 EBUILD ruby-2.5.8-r2.ebuild 6154 BLAKE2B 1db3898b01e7af02e42c7c638046ec52f5cecb3acab8f638135b86db73a41f400766fb5cd2b7c99b5ac626d058739eb6f337c21b5e8f6bcfc5bc40a6189b8c2e SHA512 d284b48493f5915304ba42a4a91664bc247ba4c187d1ce7c54d6e163c6b8d65af7ec6d7b6086c949ee9545df0f0070353e59e4608900e1736a8d2ce65f943453
 EBUILD ruby-2.5.8-r3.ebuild 7037 BLAKE2B 7064f9de4c898589c0ad2cd3a753ad5559bf421d473181e535e227f7bf603ef99a30f229db34b5d77fb859253e7d71ff73f56f2fc600bf67ebf7d3a49432ed8b SHA512 02e150a9b65c81f377e8d6ee8f2082aa0617f4f0550393068ade5af977902b8cfd09678f92a06f30512c3d299092056f980e539203ced2a8788c6834f4a3f8dd
-EBUILD ruby-2.5.9-r1.ebuild 7031 BLAKE2B 6edf406ab96eb8c72c147fca77e960d3e27f6126236c3fb7d4560f4d8fa0551937636417e6311e145e493a3413c7ec2516cb7b37abcb54eaba0e22b6e8150cae SHA512 9926ecf362dfd3651d71b5c3be4fb9c86d9bbb3df880c96567d1fea84496562c7daaf13d67ad267b2e2fbf7ffd0d8c20e3d8b45bf712820a1aa8a3fa02812123
+EBUILD ruby-2.5.9-r1.ebuild 7030 BLAKE2B 3ccf395a5f5bf5a4c84c45ad5ac1e86201c471776207f0f03e05508bf0c8cb75c700c3ea9570f86b9af2c0c0936503d0d56127083b54533969b1a226574bda07 SHA512 4ebf5e39da37cc48e318ba70237336a1abf98ce209168e334d2dfce0b03e171f427dd1d285ec1d4da72cace005914f0111e1407f2a5c794e4305b8456eefe269
 EBUILD ruby-2.6.6-r4.ebuild 7447 BLAKE2B a9fea6aa6b0ec34c24fbafbbb822d439c31a322363feea029d3b158dbfe1b538f48e63883ff12003f292f2becbf8a7ea3f7fe38b55bb9d5b5cff5a39c16ff96d SHA512 bea1f6a4d148de144c581472e65df46e536dbbed1ae6864fb66a1f868d0b3379ce58e13f9784c13f068e9ea26cef83ee2a10a5e16ef430100d32597460a3e018
 EBUILD ruby-2.6.6-r5.ebuild 7543 BLAKE2B ca25d241c4c374fbc52d779f6184fa1adc299898358dcbd0d6134c077656adfe230eca285bbe6160d7a83ed9710f9a760d768e0d991b2371f69f9ae8922117c1 SHA512 4193aaefa02896a9b75163de6ef0ba3b796e34026635f35310457fed04e2f19b2aa8d5789760f4faca8657801954408b5dca03a796f4f7d62d5a6409f66f442a
 EBUILD ruby-2.6.7-r1.ebuild 7543 BLAKE2B ca25d241c4c374fbc52d779f6184fa1adc299898358dcbd0d6134c077656adfe230eca285bbe6160d7a83ed9710f9a760d768e0d991b2371f69f9ae8922117c1 SHA512 4193aaefa02896a9b75163de6ef0ba3b796e34026635f35310457fed04e2f19b2aa8d5789760f4faca8657801954408b5dca03a796f4f7d62d5a6409f66f442a
-EBUILD ruby-2.6.7-r2.ebuild 7476 BLAKE2B 1507cad389920f051fae9ba2944ec2d3db56d7fc243a552a9c91440cab6c8cee634c444fa97a6bb52424859b1098d85591dc5d3d284bce6e599c252fb66918c4 SHA512 8172bad081d2a448dc6ecf1db5b55cb3ce4fbdb6d04a997da41a43f82fe5f6a2de6a4b193fde6cba517ec0c6e64774e8eaead27e1c7e7ba2be6fa9815b531693
+EBUILD ruby-2.6.7-r2.ebuild 7475 BLAKE2B 1e1604c4df33b5a2d2d43364fc03989c0f0d8af2e61a7054bf7dc61061ba04c9e332edc32813f180280b73c50b1a20bdbfb6521c8e14b3ecd62fc8ce66fda578 SHA512 5de16a696427c92f207aa41816e3d6dea520e0df1cd63fc89fa173a8a503e327a9f8225733be493507306fa2b532795466798de7237c953da961d86372c2f470
+EBUILD ruby-2.6.8.ebuild 7482 BLAKE2B f657957a099dd543565f79dfbb99457a57bc204dbb1eba9afc94282b19b1504160fe388ba60b65665b8c022b2ede064f533d6e2b7157b142dc83e41f06812e55 SHA512 7197a70d6c09cf6ae9b56c5b128376bdc4e4fe5c39523eec3c80a8673e0cfea0dff83be704dbaac0fe058634f3c8f44dd146c968f781d922de070750c74efc07
 EBUILD ruby-2.7.2-r2.ebuild 7618 BLAKE2B 9f25ba7aabf169bf8dde5c684f234f449ebc6578ed74375d0af9c9f77a889ffbfe4f6814783d3bc23b609de47284dae51a71dd6ea27d307a757e1872dee5855c SHA512 6acdd0f0ab17a947b82f82b9ada872bd1dc7059369e227c766887d57a2a1d89611f33c904f2d9c8104e2de11457900cbe7d7330f50457ffe217c88c7187b76bf
 EBUILD ruby-2.7.2-r3.ebuild 7739 BLAKE2B 20eddedbf10c3eef2f6a284bdabc25d8e14935b03983c2bc74d2bda7a49ff24fd48914e99ba7f3c09d448d676390b0cf14da133c0d529796dfe2c5e09de29ac5 SHA512 08494d03019f3e3993c0a087e7a59a3393089d7cdda1b433fff6a23cae1c9c63108fc801cdb7ebeb1228a603d0f05b5fe5ed5e46f2410094beb597ff2ef522c9
 EBUILD ruby-2.7.3-r3.ebuild 7739 BLAKE2B 20eddedbf10c3eef2f6a284bdabc25d8e14935b03983c2bc74d2bda7a49ff24fd48914e99ba7f3c09d448d676390b0cf14da133c0d529796dfe2c5e09de29ac5 SHA512 08494d03019f3e3993c0a087e7a59a3393089d7cdda1b433fff6a23cae1c9c63108fc801cdb7ebeb1228a603d0f05b5fe5ed5e46f2410094beb597ff2ef522c9
 EBUILD ruby-2.7.3-r4.ebuild 7899 BLAKE2B ac1a8fc45698e01b4937cb5c17ca6645fc296b4d9862ee799f947ae8a822f1680b0fbe717cbb81f7882b0da4fdd8b2fa5062fb7c2e66de9f68b0e43c899cab0d SHA512 d5e8c9bd617b505d65498eb3982feb497c94d2bdc6fe018a23d8fcfcaa37382f9599a26abefeacd00b3a6c83e307fe2dfbf1613e5597d7c4f260057337276522
 EBUILD ruby-2.7.3-r5.ebuild 7838 BLAKE2B fef125f53bf853fe6c79ff3146cf75c8b5ab721702db3fcafeabdb04974ce01f303ed031facc76f07eff4f7652701d7cf52fd5fc90346f8c2158b74cf116fb54 SHA512 c57435381872fbd0ecc1b54fc59543dbbef11f46fb48a806a3ca4f6eb6637397935098c2fc488f3ec5d39e8c181b1e0fd1a4c7540938eecd016e911be3ee23ba
+EBUILD ruby-2.7.4.ebuild 7713 BLAKE2B 631b4c580203bc8fca0ae71652c3e072b30d349c29e782f1c6bd32ef04f4bed5de607192eeff95bea72ecbeeeefd7f7f3a45ae3a0ae7b6a22cbe15fb672a5ac2 SHA512 c902d31cf3597516da6fbfaffd3895b5f077ae1a9554ff2443ecdd4a0175ba3b6022d1655e0c314c4877b30f33fb2454618ae15dd70b1279925aa3d9d22c833d
 EBUILD ruby-3.0.0-r3.ebuild 7616 BLAKE2B 9e6cfce5df9759ec2c0aa4b3ae9215fbfa029b4794a80d0f6fa583ee9b00aff198a37b86ca48ed979ecab887c69384201ee520d5748c41d97c584bd7f4cf80fc SHA512 a2edd315fc7dd51914f6d008fddf2a12f41dab4a421b669b337df8f9cc2effdb4e0f9db421c02942312e4f800b7da7857ab789d0ab4a82e2a611f1e0d83a7c13
 EBUILD ruby-3.0.0-r4.ebuild 7622 BLAKE2B 756304d0eb17f3827a66b3f4e4e6c156fca153e0fbfe6c2f70c94b252040c46eee50730596b4f09b2a393dd10dc0c6496b536311bff55625d2540310ffe67073 SHA512 1752ceb498be0c95815fc710b23eea8cf5a6db74e0268cfc551d034a0b5f67ca6b82c13d316b524f2fc171d420891f7940350505c1a468b7f142f933a6e9764f
 EBUILD ruby-3.0.0-r5.ebuild 7743 BLAKE2B 1eea0364f16c3a680e0dd93d7057c4a221b4a6bf2310356a3c8cec37515e5629b555dfeb225f0bfafdbd8d651aa8fdc336c2a071e2513023a44a18305dc26703 SHA512 5bd033a9d6c50910b682ad3bc8ddd997d02db45457ea2ce27b5f8071d9d5a332caef82d7dbac7637009a0fec6c83a2cc71d1ef5f7148f1c5e299163b5eaa9167
 EBUILD ruby-3.0.1-r1.ebuild 7738 BLAKE2B ff432fcb07d1d8ed6d788a3772dae1868d245b55bbf4a15f31c8c504a762a79313d0e4c688a5ab123564c72d14687eac208088812975f24b4c5beeb6046ce3f9 SHA512 dc701f91003ac062e83e3043432011cf78bb95abcc76d72f0ffcc18d15573c2de729772feb9bf70b1960e912f22f400786c7ff20cf94954185d0f807645b00cb
 EBUILD ruby-3.0.1-r2.ebuild 7677 BLAKE2B 4d38f4c3fd1d04406da48b6e7738a616c793c9cec7487412985d7ca4a7a21cb94bffc80c1b1e9ac6063a5810199acb87b4f2d2f44027f10097338cb9ae54bc56 SHA512 3b2acecd34ceba0759a07d2dc7f7bf60f9787754e06b56e757ef48a97d055e5430b08c0de883f9c5b7db26e498a5168a6f54088d30e6dbe4e233ac6e0cabf47b
+EBUILD ruby-3.0.2.ebuild 7677 BLAKE2B 4d38f4c3fd1d04406da48b6e7738a616c793c9cec7487412985d7ca4a7a21cb94bffc80c1b1e9ac6063a5810199acb87b4f2d2f44027f10097338cb9ae54bc56 SHA512 3b2acecd34ceba0759a07d2dc7f7bf60f9787754e06b56e757ef48a97d055e5430b08c0de883f9c5b7db26e498a5168a6f54088d30e6dbe4e233ac6e0cabf47b
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/ruby-2.5.9-r1.ebuild b/dev-lang/ruby/ruby-2.5.9-r1.ebuild
index 01ef0e988346..7b5728b5c054 100644
--- a/dev-lang/ruby/ruby-2.5.9-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.5.9-r1.ebuild
@@ -17,7 +17,7 @@ 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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~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 +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.6.7-r2.ebuild b/dev-lang/ruby/ruby-2.6.7-r2.ebuild
index 39d5dbce860f..9c6d2e69f21f 100644
--- a/dev-lang/ruby/ruby-2.6.7-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.6.7-r2.ebuild
@@ -17,7 +17,7 @@ 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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~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 rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.6.8.ebuild b/dev-lang/ruby/ruby-2.6.8.ebuild
new file mode 100644
index 000000000000..7a0b8149b3e6
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.6.8.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+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 ~mips ~ppc ~ppc64 ~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 rubytests 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-20181225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
+	>=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
+	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
+	>=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
+	>=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
+	>=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby26]
+	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	# 005 does not compile bigdecimal and is questionable because it
+	# compiles ruby in a non-standard way, may be dropped
+	eapply "${FILESDIR}"/2.6/{002,010}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || 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= 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 -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+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 doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+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
+}
diff --git a/dev-lang/ruby/ruby-2.7.4.ebuild b/dev-lang/ruby/ruby-2.7.4.ebuild
new file mode 100644
index 000000000000..caf894658b87
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.7.4.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+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 ~mips ~ppc ~ppc64 ~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 rubytests 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-20191222
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
+	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
+	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
+	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
+	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby27]
+	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
+	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.7/{003,010}*.patch
+
+	# Reset time on patched gem_prelude.rb to avoid the need for a base
+	# ruby during bootstrapping, bug 787137
+	touch -t 202001010000 gem_prelude.rb || die
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr 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
+
+	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= 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 -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+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
+	rm -rf lib/did_you_mean* || 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 doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+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
+}
diff --git a/dev-lang/ruby/ruby-3.0.2.ebuild b/dev-lang/ruby/ruby-3.0.2.ebuild
new file mode 100644
index 000000000000..1641c8e62f28
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.0.2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+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 ~mips ~ppc ~ppc64 ~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 rubytests 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.14.2[ruby_targets_ruby30]
+	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
+	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
+	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
+	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
+	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
+	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby30]
+	>=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
+	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
+	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
+	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+
+	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
+
+	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= 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 -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+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
+	rm -rf lib/did_you_mean* || 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*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+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
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index baf8c0c0b59c..bad26bc6fcb4 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -10,5 +10,5 @@ EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d
 EBUILD vala-0.48.12.ebuild 1312 BLAKE2B 5acc6c67a78ff5aff422e44980db6072ea7f1311f46b107eba95ff2963b78518c2a60136c06fcf6da996cdb9bb222c7c9bda56c84c85166d7a69ca885b4683ff SHA512 78e461a215adbdfc7d7ae7ccccc9f97e1b408a133b0e33005841a74169c57adfc624e12ec0fdab9434ea6720649c3356e90cf9af79e698c2998fa93daac1290e
 EBUILD vala-0.50.7.ebuild 1312 BLAKE2B 36746ae0645349498963828caec58e5e82cd9585b8381c268c6affbb884d223dcdeb2f629678de71d288b8b152820fcdf981d622659cafd249ece2d91b0dd656 SHA512 f013ca54bd4f72ba4e632fa5cd7817545bc778cd261c5167e9e566aca0cfa4b34ca7f02a7af2115701f2fae6830b7dab7ddcfbf312907210d064b96fdeeb9964
 EBUILD vala-0.52.3.ebuild 1325 BLAKE2B 3f22f959527acc36013a9c07978b90b087b2075bc8b8208cfc190eac508d8192c6a2d5fa17bcebd259a6e18faf25e8e804b82e8463c05f9dca66484f555b4e45 SHA512 635fd952a9f4ab98718e22e5cf4806da041bda0ab2b09bc3cc18351de85a1350e912590aded7ba827d7d9460d5091c86900fa4216aea57fefd596357fa0212be
-EBUILD vala-0.52.4.ebuild 1332 BLAKE2B 07ebd950465ef0d16801dadd56096d7fa90c218c4e6dd08a6fd9fa487207701c02511c418d210967be351c12c757c342f268cba6f14ca97bd66087cef7ca6ab7 SHA512 e48dd90cd3daa8c2c6eabb13a1f00fcb636efa72c2d7cc581044692a2e78fc39b8cadc47b9ba46fead9f5f258204f25c16358ca81b3f4fa33d210fa6da28e2b4
+EBUILD vala-0.52.4.ebuild 1331 BLAKE2B 40149d529eb3a446e1488dd9f2c7e01df5d1e93ef8dbb1b9c235675ffdb7a237ab3d261f8f0eb8b9dbc29dbf4897461d955fbc5ea4350e6a64ef25fe58e6be45 SHA512 eb80bf3936134e6d9e67d2d369df4d1c8c148f83832f48bb1e1c88014b49f2b8f3c3f018a5a7ff70568e1087a670926bf0a3ecf76d7f7468a242d27768f95269
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.52.4.ebuild b/dev-lang/vala/vala-0.52.4.ebuild
index fa44e86dd988..2b8b2481cff6 100644
--- a/dev-lang/vala/vala-0.52.4.ebuild
+++ b/dev-lang/vala/vala-0.52.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.52"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"