gentoo auto-resync : 27:11:2024 - 02:00:00

16 files changed, 408 insertions, 67 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3efc71798231..9f53401dbee3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 64513abe84c0..f62624838fbe 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,13 +1,11 @@
 AUX eisl-3.60-Makefile.patch 883 BLAKE2B 42419e7db0c5b960e218e821cd53d11caaa1a48d74c3e3d810c387e7e74f4fb2699d1cc54fc59c4201664a35384288c1f43e9910cabca9747f2522f2dc3aa364 SHA512 de22e920debb00b2988b8cd9d63c50c7c43d680c5b668f32dd9841a50875f7a857f5c320a00311f4d4adbff857298bf1e25f19f6a0baa7f0cba81ac63aaacd0f
-DIST eisl-5.31.tar.gz 3134740 BLAKE2B 73fe01c7d996c68281300b2e971b096f26649e6226d1747ecb32e63cac67fa86a78b3dbbfeeefc64c600d5d827d38300b97455c60da528dcbec7d37b60ee396d SHA512 84403a645fb584f890794251ccd63778a539674132277c1acc7460ba7df55dc439761ba1ac5516b9df95ede56741411e48721e3a6424c4a31944b15b82557daa
-DIST eisl-5.33.tar.gz 3136290 BLAKE2B e6ecd62c1fce947ff971d15b70b78119e49f5cd13f7d695d364fb848e4ba29fee46a076a651a542c84278ba0eebd970dec4d88990a68c0add40c6e281a987a85 SHA512 3be0fb5184c609b0cce3681903e132fbaeaa3ef00a4770e56f027299d93e103617ab326e14c279f7e97955be4e0929d271a7bc80dd7c9841320ad060270ac16c
 DIST eisl-5.35.tar.gz 3136245 BLAKE2B 9de21f365ef4e7c7af513e0370bbd79b1412f927e3a2fbf628445cc4e6b324e3b552be1b7d7720dce6dae32a82abe9b13e9b9f4aa4bd892730ed9d63a0cf5ade SHA512 63eca37ee1565520fed967989d4900f22962768c024974434033add8d544a3c6dd4bf6fb677f2ef28472fbfc3d8296d2776c907d572e9383d6c7501f8aa42ee0
 DIST eisl-5.36.tar.gz 3136331 BLAKE2B 84f3b6917d2d4c2319e3322a9c80bfd4ebebcf9731c7625f1be8f619edc60c1c005db407b09c3f1158e5d7c739244e975513f75bb16913b9cc8162b0fafeb8fd SHA512 6f7d8629a74513ed0d6f3eab7aa9f6af1ec706ebe64c48543ead70fb4825d6e090b4cc1399353b07ed107b78c589f1398c7169ba9799be132de4da5552d95846
 DIST eisl-5.37.tar.gz 3136844 BLAKE2B 43a326e4367b9ba01ef57194ffb9c9f9a9cf322de3055d340263075d2fdd5d06bc0abb3ccacf41018227e1a13e71dd91cd77e42001a58ef8121f8910a03bcb13 SHA512 5f3c88d16f8febb88767d31de193e90da27357132cb46e11ae526ec7d048a8f392b688d2eb815bc297bab3c2ead5ba497bc0dba48a1b65754a6ef499259fddab
-EBUILD eisl-5.31.ebuild 1010 BLAKE2B caf0eaf92d6f0397eba23e8641b1bff1d5316d97d1886e75a2bcd504354fbef1ca19d053168ad592503156a7b6270da2dd39cb03f65f78dbb210f6c569476904 SHA512 f637a8521189709117940c1d4240280357394dfb9dceb591658afbc58ccc5190e649144df52ac100f24e0ca3c98913b53d67ca4fa5aa92814bab560791913b35
-EBUILD eisl-5.33.ebuild 1011 BLAKE2B 291b801fbede039429edf9317a5ac1a7beed406019edb25aa218be9f718deff1742a4e99adc349ebe04d5160126bae590de9dc831378aeddfaf7bcce5e554ca1 SHA512 71d7528dbfbc0b76b68bc574aa7ca11b463cae94a5682bc74458cd8b0530de222de50aa540e3e9e444bbef58b2c36d49bb94ad929a99dc9574148ac3abba6afd
+DIST eisl-5.38.tar.gz 3136867 BLAKE2B cfe62da4882a8f687c683345c3518a7245bdfc87b17dd6b956cc3b5db494631c6cb3a2ca24ecfe1454671e8d1e14c9052ae4c119b4855c585fbb93c99af0ddba SHA512 4bed412660700ddba7a8015b1488adcaf9ff89aed5ac5af0a51c65af76ec78fa4dab04b092c4ad7404ce3fb071dff7d219810c4422a983375e5634861de81698
 EBUILD eisl-5.35.ebuild 1010 BLAKE2B caf0eaf92d6f0397eba23e8641b1bff1d5316d97d1886e75a2bcd504354fbef1ca19d053168ad592503156a7b6270da2dd39cb03f65f78dbb210f6c569476904 SHA512 f637a8521189709117940c1d4240280357394dfb9dceb591658afbc58ccc5190e649144df52ac100f24e0ca3c98913b53d67ca4fa5aa92814bab560791913b35
 EBUILD eisl-5.36.ebuild 1011 BLAKE2B 291b801fbede039429edf9317a5ac1a7beed406019edb25aa218be9f718deff1742a4e99adc349ebe04d5160126bae590de9dc831378aeddfaf7bcce5e554ca1 SHA512 71d7528dbfbc0b76b68bc574aa7ca11b463cae94a5682bc74458cd8b0530de222de50aa540e3e9e444bbef58b2c36d49bb94ad929a99dc9574148ac3abba6afd
 EBUILD eisl-5.37.ebuild 1011 BLAKE2B 291b801fbede039429edf9317a5ac1a7beed406019edb25aa218be9f718deff1742a4e99adc349ebe04d5160126bae590de9dc831378aeddfaf7bcce5e554ca1 SHA512 71d7528dbfbc0b76b68bc574aa7ca11b463cae94a5682bc74458cd8b0530de222de50aa540e3e9e444bbef58b2c36d49bb94ad929a99dc9574148ac3abba6afd
+EBUILD eisl-5.38.ebuild 1011 BLAKE2B 291b801fbede039429edf9317a5ac1a7beed406019edb25aa218be9f718deff1742a4e99adc349ebe04d5160126bae590de9dc831378aeddfaf7bcce5e554ca1 SHA512 71d7528dbfbc0b76b68bc574aa7ca11b463cae94a5682bc74458cd8b0530de222de50aa540e3e9e444bbef58b2c36d49bb94ad929a99dc9574148ac3abba6afd
 EBUILD eisl-9999.ebuild 1005 BLAKE2B bf9361efcf3f564ea3dd41a9f9d404b95b774df7f88b6280fa1d41d67eebbe1063d6f49876068478d31d11dc0846247b7655d4022ca07cd26c4ee869856acd6b SHA512 dfb4fc078498d62a137dcac57a0cd7bf5c7efb85bf4b9cbec3406ebbe432906e1d621ddf282145a3037bdd1a84b603b665d14638adf4d2894441da7b9c7a3b8c
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-5.31.ebuild b/dev-lang/eisl/eisl-5.31.ebuild
deleted file mode 100644
index 1e6288f65690..000000000000
--- a/dev-lang/eisl/eisl-5.31.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
-HOMEPAGE="https://github.com/sasagawa888/eisl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
-else
-	SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-RESTRICT="test"  # Tests run cppcheck (and fail)
-
-DOCS=( README{,-ja}.md documents )
-
-RDEPEND="
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.60-Makefile.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" clean edlis eisl
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe edlis eisl
-
-	# Compilation of ISLisp files on installation fails.
-	# Do not compile them and mimic "make install".
-	insinto "/usr/share/${PN}"
-	doins -r library
-	doins fast.h ffi.h
-
-	einstalldocs
-}
diff --git a/dev-lang/eisl/eisl-5.33.ebuild b/dev-lang/eisl/eisl-5.38.ebuild
index 0ef48728bee1..0ef48728bee1 100644
--- a/dev-lang/eisl/eisl-5.33.ebuild
+++ b/dev-lang/eisl/eisl-5.38.ebuild
diff --git a/dev-lang/elpi/Manifest b/dev-lang/elpi/Manifest
index 3ace9743d5ea..f7579920b7eb 100644
--- a/dev-lang/elpi/Manifest
+++ b/dev-lang/elpi/Manifest
@@ -1,3 +1,5 @@
 DIST elpi-1.18.2.tar.gz 2630264 BLAKE2B 9921cfb71755f46f29ec8934c5f3e3ea7d57807854c2402660ffebaeb6ce8f64416ceda4e2eaefa91d5b46cf7d9e8caeaadd75b0eddc5c35b234a228dfdf9bcb SHA512 096865d2b777d36ab8c0a63613f268491cb5b4e3a1c8a2adc11b63a3d39d04be5ddc198f0379090da8e3e0b6e7997bad6453d4b48f9f2e5d7d7d4f852af45a41
+DIST elpi-1.19.6.tar.gz 2645680 BLAKE2B 6dfeeff7d5a5a00a4f663acf2c696a30035ea997d775542b9fd49b08b417877217f7eb4ca6dd1a89b1b959b5c4be982cd9488b7ee0774d3de6749148de04f037 SHA512 3371b50d8bcce0d9bc49fcb5f4a27f6317644b748495f2d58a8e7bacf0ff4dd1e506a4f6c0cfefb04e6ff82ad71fd73e4c55185246225c708ab368190457b05c
 EBUILD elpi-1.18.2.ebuild 887 BLAKE2B c8850062eaa0ca1c7ab45399c79cbb5582cae1613ed01a7c51197fd91de9c4684c99d7bac9ebab1c8a2966fb9ced410cb2b1b71bc9e617845cd832cb2453393e SHA512 43793f3ce1bf6d41b19ce389241346d360d720ef98faafaa7178f648fd45e248193a3f17303cbc65a90078f60f38b69c545cbac50997eb85d7d03595d95bed2a
+EBUILD elpi-1.19.6.ebuild 887 BLAKE2B c8850062eaa0ca1c7ab45399c79cbb5582cae1613ed01a7c51197fd91de9c4684c99d7bac9ebab1c8a2966fb9ced410cb2b1b71bc9e617845cd832cb2453393e SHA512 43793f3ce1bf6d41b19ce389241346d360d720ef98faafaa7178f648fd45e248193a3f17303cbc65a90078f60f38b69c545cbac50997eb85d7d03595d95bed2a
 MISC metadata.xml 1145 BLAKE2B 5dc8cfaed7392d45c7c30034952ea7796569ab084912ff15ff6be6e9977376845b539d3b129c1c5572d5dfba2a34caf6e458f4ff52b9bea37330287f2105549a SHA512 f7f7911e2cbd2a25cf02e4aa4710953bf31db35721e2100838f681ea064476c972e2a8b1426afe5b653fa64571791e0c956d63c4cd65d002390f0587611f4b74
diff --git a/dev-lang/elpi/elpi-1.19.6.ebuild b/dev-lang/elpi/elpi-1.19.6.ebuild
new file mode 100644
index 000000000000..7721a9d3b009
--- /dev/null
+++ b/dev-lang/elpi/elpi-1.19.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Embeddable Lambda Prolog Interpreter in OCaml"
+HOMEPAGE="https://github.com/LPCIC/elpi/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/LPCIC/${PN}.git"
+else
+	SRC_URI="https://github.com/LPCIC/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08.0:=
+	>=dev-ml/menhir-20211230:=
+	dev-ml/atd:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppxlib:=
+	dev-ml/re:=
+	dev-ml/stdlib-shims:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-ml/ANSITerminal
+		dev-ml/cmdliner
+	)
+"
+
+DOCS=( AUTHORS.md CHANGES.md ELPI.md INCOMPATIBILITIES.md README.md )
+
+src_install() {
+	dune_src_install
+	einstalldocs
+}
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index 1c193df64b7a..2f01e786547d 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1,6 +1,8 @@
 AUX nprolog-3.22-ncursesw.patch 270 BLAKE2B 4e412a1b42bea3e797ddb0f17a5d22bd0f22f5e9fd037bc199704c1abd664413df1adaafc35ed5f430b4da36279199b30b57d34cf459064efa3bc94a1f61a6ca SHA512 41c510be3afad45ba77d1882f864b62349c2d81fc4ac166d736506d14f1e9061ce4d1f9ec3a6adb15fbd4b377573b915f27efba0825701dc396848ce5e2d16e3
 DIST nprolog-3.36.tar.gz 598498 BLAKE2B 1cf2f1459698f2c7df01b4a2202e292b5c0918c363ebc761007f7996f405f7334e757678dbe510ea5c3a52dce8a5fa2b84cd898b04b3bfa4ab33d325ecd17401 SHA512 33ce46cec1c1d167b70ba0f59655f58d42e388d63f5515cec88086db1035d54700865ddfbe213f393d65180928c3951c11056471ef5499761182ea6536a0ddb2
 DIST nprolog-3.41.tar.gz 599368 BLAKE2B d335f87834ca9a6cb167416ebd8024e7122fc17c5b065997e1b88c003ab7f8d772d715d363c712d75fb81d5634993f1dd106593f90f3d375696b8c6826668e98 SHA512 d0927259a3a7b157c9d346cf99c4fb354c4ff4f71c92970c63439c016137437cd2ebcfef7b4bffe50befb3abc5f463abb68eb5b859fa52220e36aac57957321d
+DIST nprolog-3.45.tar.gz 679833 BLAKE2B 2955479ac67ae7636278b2d161e14d5718f68690920c91c088216e92437dd7e53d7cb79d81f7f05b3135f083e5f785e2e340b6b1f8d841eee0988f3c41ad22d0 SHA512 df709224a249ce967eadf60561f9368a8025c39ebeccaa32424bf2591ec481669d7dd4867ab082d1f6eb1c80149d6ad64d37c91611df7de4a6d3904117257842
 EBUILD nprolog-3.36.ebuild 888 BLAKE2B c0614eed790898637c575682580b6879192cb584bc11044d9af3270e919ce0d41c052326c2d1e9b9746051fb3cdee90552510029c9a2e8d64d14dedc607eb547 SHA512 5aa1cbeefdde67461fc2f08e5afb2d2b51bda61e18859ee1b65e11367fa06ce018e9001c94806f8518a5264a929407ed3b26d5e442115080771712fecdfc1a99
 EBUILD nprolog-3.41.ebuild 889 BLAKE2B 8b9ac031e349ee93be59b36a8654e718ac65954258ec03138b0e6e8c9b6ece5ef9378e7a6e641e716b2be75de337ef8d1e765d06ee2f5e685c5015cacd445523 SHA512 c3fe6314b02f2a6d9f6bc8ded5973f65e46061563a99a53a7aa8b7b7c134d95246ca6a70ac0cb51e6f8e56c23bb67d11809f05130795eb3f4659b219017d70fc
+EBUILD nprolog-3.45.ebuild 889 BLAKE2B 8b9ac031e349ee93be59b36a8654e718ac65954258ec03138b0e6e8c9b6ece5ef9378e7a6e641e716b2be75de337ef8d1e765d06ee2f5e685c5015cacd445523 SHA512 c3fe6314b02f2a6d9f6bc8ded5973f65e46061563a99a53a7aa8b7b7c134d95246ca6a70ac0cb51e6f8e56c23bb67d11809f05130795eb3f4659b219017d70fc
 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/nprolog-3.45.ebuild b/dev-lang/nprolog/nprolog-3.45.ebuild
new file mode 100644
index 000000000000..39a1d076726e
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-3.45.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+	SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-3.22-ncursesw.patch" )
+
+DOCS=( README{,-ja}.md document )
+
+src_prepare() {
+	if [[ -f edlog ]] ; then
+		rm edlog || die
+	fi
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe npl
+
+	insinto "/usr/share/${PN}"
+	doins -r example library
+
+	einstalldocs
+}
diff --git a/dev-lang/oorexx/Manifest b/dev-lang/oorexx/Manifest
index f66910cb5542..094e6cb6bf78 100644
--- a/dev-lang/oorexx/Manifest
+++ b/dev-lang/oorexx/Manifest
@@ -1,4 +1,4 @@
 AUX oorexx-5.0.0-man.patch 1080 BLAKE2B 17e105f80a5efd4fa28312c1cc81050b57c39357b7fc83ff0b8703970976e4530f03e942f09cfe79fa4dae35a7616be45058355133aa46ebc359f8578800cedf SHA512 530397a95170e08aca60db967af54c4ec22ae322f98ae7c0fb38737067f58cd8409700a00025fa85da05d54b76fc5090c0c0c02ed5502d2a84ae5468d4cefe2a
 DIST oorexx-5.0.0-12583.tar.gz 6398458 BLAKE2B 3df1eb024eae75f9c29bd46a7c9e0c8fffecf54545e5926f872b6757f0cba56530c4b457e94ec44debbd98e514e1043ba751384dc0f1dabb4812aa52da4381e0 SHA512 141af22e0a99731d50492940d5db55cc59099e5a7fa8acba918d1ae82bcd6e2983fb0ca71bbbf044cc4fc89e740c8a0ac81237eea5812d7a570f825bba5d08b9
-EBUILD oorexx-5.0.0.ebuild 778 BLAKE2B fe5da47856e2cfe6db741ac82cbe6038e316cbdd50eb81ae2a0ba795de42f0599f30c8263563e94421fff1ab4bc71895be089179b925abe033541ef35c5a7466 SHA512 3a371af93b7afec479dc1f3a944f54c5492a05c5d5af8b42ed461e5e6a0157b1776e55e5162819eaada082e2f2dc99dd87ba797342985a98287ffcb5cc192e0f
+EBUILD oorexx-5.0.0.ebuild 920 BLAKE2B f5c7c078a982c78c8a9679fdf0f901ddc6229d344991d0f2d1c0e84a6a4616506aa975448d30bc4d8d152e7448ede1ffce7646146085d6adc3c9af147754ec8b SHA512 9122226421d2092ae529d353bde614baaed53dd39856e20260c7218641e3caced68dba92a71ffffec63cc06c88d4186199a87a02d89470b8830c29a5620290d6
 MISC metadata.xml 791 BLAKE2B 5e8ab7a5472b3864c1f1c66559518072fa4364276afbdb1939b8a81a3fcb8279bfb07c3f929edfc49faf1768d14171a870825e23ffee6e1f8fbf151879c95f8d SHA512 1e7a42ad84daee790eb4bb400365645432c895940fb4a380d575123782b77251d8be4efc108239f5587865434bef3b3f4cb90761e0e7f4425d5387f4f7e31cdc
diff --git a/dev-lang/oorexx/oorexx-5.0.0.ebuild b/dev-lang/oorexx/oorexx-5.0.0.ebuild
index 73538a1b9325..217c32aea9d5 100644
--- a/dev-lang/oorexx/oorexx-5.0.0.ebuild
+++ b/dev-lang/oorexx/oorexx-5.0.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-APP_REVISION=12583
+APP_REVISION="12583"
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Open source implementation of Object Rexx"
 HOMEPAGE="https://www.oorexx.org/about.html
@@ -35,3 +35,12 @@ src_unpack() {
 	mkdir -p "${WORKDIR}" || die
 	mv "${T}/${P}" "${S}" || die
 }
+
+src_configure() {
+	# bug 924171
+	if use elibc_musl ; then
+		append-cppflags -D_LARGEFILE64_SOURCE
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a4900a2fadec..4b8748888d2f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -26,7 +26,7 @@ DIST python-gentoo-patches-3.10.15_p2.tar.xz 25284 BLAKE2B 24ecd523dba88915db130
 DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
 DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
 DIST python-gentoo-patches-3.12.6_p4-r1.tar.xz 9072 BLAKE2B 831f6c4284035832e0536ad3211d10c078e6c356e1fa593dd45984b29253deaf703bcb71e1b488508992dd37d5a140591c9193f1620bb966e39b048e4d5c6746 SHA512 9c61e0396c98fb45f3dccad9165e3f2b7bbeabd4a6fe88cc6e05a9d3012e39068571e63527dc831efaf24cb0e8fee75f60454481b2d1a0a44bedba69a7ed5c95
-DIST python-gentoo-patches-3.12.7_p1-r2.tar.xz 11280 BLAKE2B 444a45de2e603530a7aadc4781dc534c49c06c815f22bc0028726abe8066cf66e278000187058dde268d0f6d22370753af25ba3ae88ade91bbefd5c56287cc8c SHA512 a3a5cf8cc2e2554c68852947f1ce7e78052951007b713530b8bb03eb3beca9a4e8d03397c3e46bb149d0d4ed43c547fab99ea0f9e1b7357741ceacec1ef049aa
+DIST python-gentoo-patches-3.12.7_p1-r3.tar.xz 11416 BLAKE2B e12c2e626986fcedc03ee9826419f831d3e2e4eace58b53184b3f0faa53c09e57e22bfe894e2eda305c7f931f7a497c0bc4db0a249079599a4a76d63cdd0a8a5 SHA512 d3f56e8971d7da4d39726934ab4396382610b6620983657a84e29cf98b10c489408b8465a89db6d4a5664a89b3c58544fba946e011dc059a43e9c86cbb13a6eb
 DIST python-gentoo-patches-3.13.0.tar.xz 8316 BLAKE2B 8fb8ba8f41f310140ad7066b614952023112d5043e5d82058364125611785144c1843e87eecb7669bcbab51c40d0694069526219f7419a7009517ce0821b74ba SHA512 0eb31ebfa3411020aa70b3b66fd7eec98b4b7a686b0e8f1f7ed76a8186a7c1ee85ccd9565a86a1d7ec13b975855eeb7303036af05e2dfdce3d64e4ad99299df4
 DIST python-gentoo-patches-3.14.0a1-r2.tar.xz 6008 BLAKE2B bb833fb522e008eb79355fd13952c4fc3efc4684e9a2f26680d57b2bb137d25b461ce34ac7cbf0a7c64a558fa2cd63ad393f23cb90f620395efefd1c01bf01f5 SHA512 60568f83765f8045c789391b1f44ab6ac633a00ca84a6c93afb6067294093dd87a262feb6ea1d0879ed90bcdfa7d02054da5974cb9218686fbe629bdf11d0792
 DIST python-gentoo-patches-3.14.0a2.tar.xz 6032 BLAKE2B 60f5b702feca8c967b0baff906d31b8d2e9788fed0a717292d73d7c2497972d785257ba58248815af10608ef4f5491f11e42715e84885c1548e7744cba4d2bee SHA512 306fd779e139994a3bd64d4ac638f5473b8998739363b5fc2ea2e89caef5b02192226a53c8ea9a03438657733db81c87d31ee4ecb3b3c2f86a9643a3f64b498c
@@ -40,7 +40,7 @@ EBUILD python-3.10.15_p2.ebuild 15523 BLAKE2B a1508c8905c930ce888e70a076feee030a
 EBUILD python-3.11.10_p1.ebuild 16744 BLAKE2B 67c6f7bb0379c0c787f626baf541f34b043020ddffd6e5c2105f8a14bfd7bcf1347ae8ea33f75f62fa7f1b2c3924fe4e62911fdd2f8dd042bdac9cd3db3c38e9 SHA512 0b42f9a994b0ffef790f45a19a5aa85d875a070a3c5eb862c1a045db42b06b9c37a6ef1fe87503a4727153ca9d06d497da789e68f126e43b1e89b3231075d24d
 EBUILD python-3.12.6_p2.ebuild 15689 BLAKE2B efdee37be4d2d2f6dbe4c697d5b468b50f254d7d77d9b7cab10591fb17a20d4e18cd96dce12a3e9477728c125fdd2693a86aebec556e139041980b402bad8b40 SHA512 f9d7eb72d5426519bc83873aca8125de6177fce7d4ed79233670f9c8a312ee3f9264ee96e0cfb41c702e20391cdc44d42d4d90037e34b861a93fd15371744820
 EBUILD python-3.12.6_p4.ebuild 15626 BLAKE2B 6c6ee6f42200236bbb9bb517fe42b8023cbea4a9e56b87ff256c9b3446f76b12a59ef908677c6b27c7b8ca96ed29ea335f92b50533568f2e3b7209ffe132a5ca SHA512 f4cb2fe15a211d2bc66314ff389a9b48d43833844a91abb67f9c95e0cdc8d50d63093c6db32a70133803775373e32aa4bafc5de54753001640235c814a92aceb
-EBUILD python-3.12.7_p1.ebuild 15669 BLAKE2B 0138c5357912f531173ff9f587f2b5d9f76612449997e356990fc60f359d615d50bced4d3f95181b3ebdaa8fe5e1bb935f471f372501136e2fd75f3ec977c87e SHA512 b178b9a39c85519e7530c14cdcd747c92966d993c3282de86cd0a01197aa82b50872520ab32ed0adfe49d6b7c65ef6bed3d8fdb77648b28f84998887bce6b6f9
+EBUILD python-3.12.7_p1.ebuild 15667 BLAKE2B 845e609c929435d1e5085cd762904ec7d8b0df026bfb5a75656d0dc79d10171c6af7cb1166c408fdbb6c6cdddb8be5a00f5811f633d842e6bfa29c48646281cc SHA512 673b79119d767ab495b160ece8468b55199f8fa6f2b65b0747a354cc5f20f93a1032a238c8276ce91c54f5f9eab8475d2fbbf320adcbe51fe6d348f1e53928b3
 EBUILD python-3.13.0-r100.ebuild 17138 BLAKE2B 64e0860da5a8866493fe0d6d94d9ff705ce5c314173b2f75855ddabdab5832879544dba5bf46abf1055df59c440da8eeeb3abf66225b706d0b5bb3acc609e72d SHA512 501e9541adca7ae4a3d01686a48defcdcddb5a5774007dca42233e6bfc1207ac9f55429ec61641ee4d77c45c944ee82f49c40781250bbfe5a2893e0dcc1966fa
 EBUILD python-3.13.0.ebuild 17408 BLAKE2B 18edd2c2c00071918a40889f5280494cd6c3e0d5ad239926f1fe568455746058ec243d824abc230b0b380f0ce79dca97fbaffe77f89bf870eee405744a3c73ef SHA512 fac5685cc3af66ce9dd3a2b2e104696820beeb6ecf03761f415c48cb45e45bc637695cfe5255c0811f51ad74df2c47f4e40c5f3b41bdb8050871b2afb3741b71
 EBUILD python-3.14.0_alpha1-r100.ebuild 17173 BLAKE2B bd956cebdad0ebfedbdc6b0af2ee073054433cbb386dd6d7eb3f271f6b32b049e888cffeec3cf562e70d39108d0349ec9f4955100c24a4629a7665e3eb9ede74 SHA512 859aa6f10ab4ac12003ab901eef6ff7fd1b096b114b43ec5a380e8ef0206d6a3e04881118fd054b26ead308ceb910fd73914e338749dbbb83bb58ec2cd364e2f
diff --git a/dev-lang/python/python-3.12.7_p1.ebuild b/dev-lang/python/python-3.12.7_p1.ebuild
index f20a37e7d74f..34a0b49d3a3d 100644
--- a/dev-lang/python/python-3.12.7_p1.ebuild
+++ b/dev-lang/python/python-3.12.7_p1.ebuild
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r2"
+PATCHSET="python-gentoo-patches-${MY_PV}-r3"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 842f1b1a7032..6abbcdaaaa14 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -30,6 +30,7 @@ DIST ruby-3.3.6.tar.xz 16398228 BLAKE2B 7e2fb58ca1f5ee7ab9c2fd7b24fdbf9eef980532
 EBUILD ruby-3.1.4-r3.ebuild 8517 BLAKE2B 8a89694e604a5c61c51154246598a4f57465c6f4443ae0c103e8ee6825a6f7ad2709a6bfd3e12fc141321a5fbc7fd549ffeca7d75d4db79d564483494285f9b3 SHA512 0a422dfee5abcce9fd9c27009370c92c9ca58eeb129a2e2384eb6747f83a6e7418e0de58d562c175fea52ab7519bc2105ae64925e845fda169482b3be26cf211
 EBUILD ruby-3.1.5.ebuild 8842 BLAKE2B 322f5da3ded0e48fbb70d222d0df8a64c6c91e1445e710ddddfbb24afcbd2f4ba6ce563da93c89477efd4f940d82a182ec5e9617132c446155fda021a71ac70c SHA512 1e182e9b425f2c92fb915c89e10e745c2c06ee010dd5f4477a21a42909ac4672e8fb2600323e5c781f564f4d7377ecd997d83860a0b59294d3bc6c184291bcc1
 EBUILD ruby-3.1.6-r1.ebuild 8913 BLAKE2B e3efb05d75ac99b2f4b7b15a987e799ea949bf372eb9893d285868e3e616807479faeaf236fa7c874bbc93d2dda002ef061d97ff46ff7652158dfb3f90ee82dd SHA512 ab9f147269222231d65c92469573a1261a4ebe68a994b38c4eced06e5cb204d991a345986c31440198a96adef24e05ca905839bd218e66053c93e94bbe36fe95
+EBUILD ruby-3.1.6-r2.ebuild 9094 BLAKE2B 3f7a1b15f5f9336b6cbe8ce6ad9278152c67cf8804d5e4ca2436effed4833387555154c79992fa2e08882bbc234a436c882644a4f0f67f5e84c40999751ee054 SHA512 b6cb97f9f527e5f5bee85a0dd5aa632542dfed8e6fd9c2546d8f01b51ed203c0b4a80c054b9b42270607e1529e9aec7bf24d08117b1674ac34ed471023750426
 EBUILD ruby-3.2.4-r2.ebuild 9788 BLAKE2B 073e9cbcef0904b9a0b02036da3b9df8f98b9033d759116939e47625f14ee8ef27da0c9f4122a596eaded97114a168750a5a2c7ae72b27612852e9fe31879ea2 SHA512 0c5bb6a2072b22c654c1274752dce31541c81fddd7bdc5674e0e05271c69891540310d2d2ddfcb8fc64fbba6b712e9d5f932fc8e1cf4793555e4f41cc6e5ee61
 EBUILD ruby-3.2.4-r3.ebuild 9938 BLAKE2B 415b6ecd80cc7a1714bafba54bed731a454bbdb03ceeb1fff73f52989282e1a56eb826cdc069019889cc4056ceebc20d40951279d1feb20b00088ee9f4dc21b3 SHA512 7402f3660abdf40c2b2329421ec959ba3da50f9a495a7de524e2d8412d20a866dfe82694cf46d19be41e74e60c52ebe754b355ccf79b1fd618f4195038a593cf
 EBUILD ruby-3.2.5-r1.ebuild 9469 BLAKE2B a68bd83f4abdf50b739bda749e0d3038d03a08a580524ed348d7ca573c109960f69c784d27ee34434d2503d8d6bd889e8dbeb72ed91d7d59a0a93f914cd8138f SHA512 dcc6bb8ff516a69fb6958b91a0241bd3c2323e224931996e9a3ab88b0d28163c7a553b23ebd9c8db872daf8dc944824b626b74495ac9441ba2ab6d5b3e64d29b
diff --git a/dev-lang/ruby/ruby-3.1.6-r2.ebuild b/dev-lang/ruby/ruby-3.1.6-r2.ebuild
new file mode 100644
index 000000000000..634baf881828
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.1.6-r2.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing
+
+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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind 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-debug/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-20231008
+"
+
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+
+BUNDLED_GEMS="
+	>=dev-ruby/irb-1.4.1[ruby_targets_ruby31(-)]
+	>=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-r2[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(-)]
+	>=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)]
+	xemacs? ( app-xemacs/ruby-modes )
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/012*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/902*.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 webrick tests because setting LD_LIBRARY_PATH does not work for them.
+	rm -rf tool/test/webrick || 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
+
+	# MJIT is broken and removed in later ruby versions.
+	rm -f test/ruby/test_jit.rb || die
+
+	# This test calls out to the system ruby which is not being tested
+	# and may not be the same version.
+	sed -e '/test_without_tty/aomit "Calls system ruby"' \
+		-i test/readline/test_readline.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
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# Ruby's build system does interesting things with MAKEOPTS and doesn't
+	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
+	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+	export MAKEOPTS="${makeopts_tmp}"
+
+	# Avoid a hardcoded path to mkdir to avoid issues with mixed
+	# usr-merge and normal binary packages, bug #932386.
+	export ac_cv_path_mkdir=mkdir
+
+	# -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
+
+	# Ruby 3.1 does not compile against the gnu23 standard, bug
+	# #943767. Given that Ruby 3.1 is EOL in March 2025 just opt to use
+	# the older standard.
+	append-flags -std=gnu17
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+	fi
+
+	# 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
+	# except on Darwin, where we really need LIBPATHENV to set the right
+	# DYLD_ stuff during the invocation of miniruby for it to work
+	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--without-baseruby \
+		--with-compress-debug-sections=no \
+		--enable-mkmf-verbose \
+		--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) \
+		$(use_with valgrind) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	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)
+
+	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+
+	# 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(30|31|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 641d91dc47ae..ea5fdf6c69dc 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,5 +1,5 @@
 AUX spark-2021-gentoo.patch 860 BLAKE2B 6eb65c19b604a8d9370bf4da87899c1b8471c52763c17b97322856ddb701e46f6d5c5de03df204c287c728413e5ab8de2f320c75d9c3acb049abad62360037da SHA512 ac636251eb45868430e46d0f5566ab655dc5a223bd44fa4b76bd75c679779cc037bf6ef376f9f4ec22a90b1347bf302d382e1d540b448acb6308c1b3e33036ec
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST spark-2021-2021-20210519-19A1A-src.tar.gz 11361491 BLAKE2B 67f8d27ae68ef4929aafaf96c470394e093883619c5c778e804f1ff62c297d5a3f628e04e987fb06741cb824710599928a7ec3b94fa6d7af029cff35be0898c3 SHA512 b595516892f6054d3c856c30c4296be9cd61adca3ea2cffe3c9060fbab249d36ce1b8fff6f80e1e8173ef6e232dd9c2da8a581ae9964845120c03d09896b635c
-EBUILD spark-2021.ebuild 2277 BLAKE2B 6ccc441fd55b4ad2cc526fb58bea232342ba5a0f263d8ef585a4118b97755210aa0275de0b4d2dadec46a0e3c83a025c8544e68de27144a353ff3bf8faf99db0 SHA512 6fae44b78cbfbcf30c194df6ef38c9ae04de4d569fcceb3c08644b6c4a073cbfb95bf2b489e7e599ab58acbf8d8e7e475d074eb5681eeb34647ed8884e8732ae
+EBUILD spark-2021.ebuild 2277 BLAKE2B b61dff1b857ab940f6700f94c882e5a7a35096205dad1e0fcd97527e365cee08a84b40cd18d9360ac5fe4487785a6e65bc6d0703e769f05a7d4001630e4fc2bb SHA512 f4885364fa1a4ec3fccb27aaa1426426c386f5ca464987bf6193ae4a67b51ba0ec6696acf4a666a3a362b0c9b71c544d8f4c8c252320601fa18492bc9f40d54d
 MISC metadata.xml 671 BLAKE2B b4bbfa26668fcec46cc224b60c1c62ac09f5e11314a32ea1288614b12029f989aa234305f0dbbb66f63b15a809d3f17261ef1155c0b72ea87bc29e3ccdf2c56f SHA512 e804dcad5593c98c9e4d5624be0e6dfa78545a48e46510b5d76c21da59dbe2c632495d96244dbaca91105a3b09efcafc759f1866311a365744887733c1a60670
diff --git a/dev-lang/spark/spark-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
index 9b763b07b66a..4c19fe5a5d30 100644
--- a/dev-lang/spark/spark-2021.ebuild
+++ b/dev-lang/spark/spark-2021.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ HOMEPAGE="http://libre.adacore.com"
 SRC_URI="${ADA_MIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
 	${ADA_MIRROR}/${GNATID}?filename=${GNATDIR}.tar.gz -> ${GNATDIR}.tar.gz"
 
+S="${WORKDIR}"/${MYP}
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -32,8 +34,6 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 
-S="${WORKDIR}"/${MYP}
-
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {