17 files changed, 76 insertions, 201 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ef5fbf8a5356..2be2d225c496 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 8001521180cd..fe5baf81cf5d 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,13 +1,9 @@
-AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-AUX nim-1.6.14-clang16-musl-fix.patch 625 BLAKE2B 5081fe9f59d40b72a446c591d308d175adef745d0936613db649dea554610f6839993c181076aa4f9fa3b402c475fa2f360f8a612081428af630934088e0ecbc SHA512 838356e53a267d4a3f165973cea46c1b718b178079257ca3b129788dd4b8897a1cf870bd1ef171b91fea721f9de0835dec8fe38271581db61d32932736aa09da
-AUX nim-1.6.14-testament-skipfile.txt 1770 BLAKE2B 66f0bad52f0d3f374dfe040ff4ae92a71a9bba5bb3b827bc10f912845bfb970f90c00bf12d0253f1d60e45543f86960447e331d9b4d76483c7f77f1d4c756d93 SHA512 e975afe8d7e5ff050735f22ca04f078ce46a2277bd459eea7ec171ebe4308097439becd33301fd66bb35ef892d0f821e4e0394cb5143b97c66c7f1f614bb1b56
-AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 AUX nim-2.0.4-testament-skipfile.txt 2450 BLAKE2B 1f35f82e9cfa731267fd6de254d6e17e1b37833e8508af565d8b3e93e5edcabe93ea859528711ffbde13a2ad7ea85816f31f50c65713417ef9c2fcd2b056d787 SHA512 9608ed530c28a676ce01416a7dcb2dbcb8a7de3b7ff67ff15ba5eaf106b70f3658dd71dae7a1691d58b77c7ac1fe8023b4f8c4e1a4247169e79f656b0d356aef
+AUX nim-2.0.6-testament-skipfile.txt 2594 BLAKE2B 58af9e632d595e1dc8f6b4fadacf55f10697d75a1ff21a2a6be2feb14eb7e86c27d5fb10737614b2dad3eb7ee3b4a8d76d30ef1c7117e1b7738ca00960450c4c SHA512 940b9ad7eb1debee502568abf30f81970fc431785c3f9b00d8322eaa686f17e6b641e66baaecc7a6ec288076139d180f87978dec24a9ac949e14b5051829228f
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
-DIST nim-1.6.14.tar.xz 5266632 BLAKE2B f6eadf44365a099f45d1b734dea494e5d098b0427791c19a5e0b7ee6fa8069fee606005920cbcbfd7c88a36ace870949ff797d1e37fc1f84e14d5dd1aeb4bd1d SHA512 6923ea98627ea48b5c939438618caa8e6860f248086e43bc101b543aa78e7c475bc8e56b8acb90dc4a3771ca0d2e27fbdda6a0b477dbb906acda8a7b39c272d3
 DIST nim-2.0.4.tar.xz 7620508 BLAKE2B cf7c737d734c5a468ac9229fb021bcd252c5c4f20ab091ec0ce27eb36ba44be8b438536aa39aa8c583483a7ce15dfbb91b1deb1c19794b3d77506d23096a4460 SHA512 1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793
+DIST nim-2.0.6.tar.xz 7668088 BLAKE2B 1cc2b3be355b236b467fa6629747de55b60b6d2f3e9d8bc584fa4f30ba842d68a0db984aff234df1299b0a782af1d464382bb37fa62c0c7a952e667bf0d3c3be SHA512 9668b34decb55fd27f0edb8c6dcdd2d8dbed00f71e8ce5c177422aedbcc359f4b943b29a38875f4715c1903a32b8388e2a4662d5ceb301349b23eb2277dbde1e
 DIST nim-atlas-0.8.0.tar.gz 59097 BLAKE2B 231b238ac3b15cc2c2d9ad927f80ae72d8ae4c649277515f32df6cc04275ccd38db5307d627572af547501e6522c06c86dc279dc3e13b5385f14e24032f6fe69 SHA512 747c13e2c5bd45a1dc6c1426f8c7637f638ada9dd4c9aa3edf4ef8367060e73226dc4bcde6380fac25ed47ebf4097fd223c72fadc3cceba8c71dd0f0571e47eb
-DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
-EBUILD nim-1.6.14-r1.ebuild 4861 BLAKE2B f6480ce8179fec0ee1c00a6a76894a3953b948ac94aa8b2c9b371bbe2a15770ac7e3c1dbb77290bb7671b7837e5199966dc069cf7381a0f038792e4e6b1ffb50 SHA512 fdb03289139a7a9c1ae298b3472cde63d187186790c0a2cb402e38dd4147c99be3e2e3d8fcb0594771077c92382f93c009672ae690d1f10cff46d7f74ab6786e
 EBUILD nim-2.0.4.ebuild 4408 BLAKE2B 290abe3fe80d779a72c07f81d4e6d7d93b569c003bcd1f85b0e9309345373edf5acf0090be8c8d127635e6d4b653a36fc0724038fe1708bdc17576a4c69f4c03 SHA512 b8fc6f49eb8921afe3bb731f2323567720ea04daac05e4a352ba8cfec82f0bf6af4872c5e3c7d596a4dacc77da45f3bea3b5d3a150857920d84bf28c7c505a53
-MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
+EBUILD nim-2.0.6.ebuild 4406 BLAKE2B 00439d84d1f76331bac382f0fdd258e89ad6c66262071bad61bf201605f74da30e02a8f7f67a9db8af1464798b10098ad145c993b167e84adc927f0a91c17a95 SHA512 af8b9f0637c8dd3b8a280ce1d145f32e1524689e20120840894f419e5e261433c76770120fa0ea434ce70f99e8f594a1008b03e585087d5620ec98a045a8f185
+MISC metadata.xml 2093 BLAKE2B 250d27e71538be674ff7f32fe55089fca33f0d6ab55fdbe2b0f858f3d4373e729f273c16b2bf0bc3265be4289e7de1438096bf60e69bd0100e126fc5cc6173eb SHA512 74a188f13cc0653aa30d0c18126ed1cfb11d4325d71ffca6af03ad62b135796cd64d269e2ea85280cd1e486b527947b287eee4db648600451336e323882ff0e3
diff --git a/dev-lang/nim/files/nim-0.20.0-paths.patch b/dev-lang/nim/files/nim-0.20.0-paths.patch
deleted file mode 100644
index a314eae2299b..000000000000
--- a/dev-lang/nim/files/nim-0.20.0-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Default to <prefix>/usr/bin install.
-
-https://bugs.gentoo.org/635032
---- a/tools/niminst/install.nimf
-+++ b/tools/niminst/install.nimf
-@@ -28,13 +28,13 @@ if [ $# -eq 1 ] ; then
-       echo "sh deinstall.sh DIR"
-       exit 1
-       ;;
--    "/usr/bin")
--      bindir=/usr/bin
--      configdir=/etc/?proj
--      libdir=/usr/lib/?proj
--      docdir=/usr/share/?proj/doc
--      datadir=/usr/share/?proj/data
--      nimbleDir="/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-+    *)
-+      bindir=$1/usr/bin
-+      configdir=$1/etc/?proj
-+      libdir=$1/usr/lib/?proj
-+      docdir=$1/usr/share/?proj/doc
-+      datadir=$1/usr/share/?proj/data
-+      nimbleDir=$1"/opt/nimble/pkgs/?c.nimblePkgName-?c.version"
-       ;;
-     "/usr/local/bin")
-       bindir=/usr/local/bin
-@@ -68,6 +68,9 @@ if [ $# -eq 1 ] ; then
-       ;;
-   esac
- 
-+  mkdir -p $bindir
-+  mkdir -p $datadir
-+
-   mkdir -p $libdir
-   mkdir -p $docdir
-   mkdir -p $configdir
diff --git a/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch b/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
deleted file mode 100644
index 1bc4f8f25d55..000000000000
--- a/dev-lang/nim/files/nim-1.6.14-clang16-musl-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/894410
-Refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
---- a/lib/system/threadlocalstorage.nim
-+++ b/lib/system/threadlocalstorage.nim
-@@ -129,7 +129,7 @@ else:
-   when (defined(linux) or defined(nintendoswitch)) and defined(amd64):
-     type
-       SysThread* {.importc: "pthread_t",
--                  header: "<sys/types.h>" .} = distinct culong
-+                  header: "<sys/types.h>" .} = distinct pointer
-       Pthread_attr {.importc: "pthread_attr_t",
-                     header: "<sys/types.h>".} = object
-         abi: array[56 div sizeof(clong), clong]
diff --git a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
deleted file mode 100644
index 9a39a900e82a..000000000000
--- a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.sh
-+++ b/build.sh
-@@ -60,7 +60,7 @@
-   fi
-   CC="sem -j $parallel --id $$ ${CC}"
- fi
--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
-+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
- LINK_FLAGS="${LDFLAGS:-} "
- PS4=""
- # platform detection
diff --git a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
index 2e7e0b48f9fc..6a99c9d8037f 100644
--- a/dev-lang/nim/files/nim-1.6.14-testament-skipfile.txt
+++ b/dev-lang/nim/files/nim-2.0.6-testament-skipfile.txt
@@ -1,23 +1,47 @@
+# -*- conf -*-
+# broken, bug https://bugs.gentoo.org/930542
+tests/c/temit.nim
+tests/ccgbugs/t10964.nim
+tests/niminaction/Chapter3/ChatApp/src/client.nim
+tests/niminaction/Chapter3/various3.nim
+tests/niminaction/Chapter6/WikipediaStats/concurrency.nim
+tests/niminaction/Chapter6/WikipediaStats/concurrency_regex.nim
+tests/niminaction/Chapter6/WikipediaStats/parallel_counts.nim
+tests/niminaction/Chapter8/sdl/sdl_test.nim
+tests/parallel/tdeepcopy.nim
+tests/parallel/tdeepcopy2.nim
+tests/parallel/tflowvar.nim
+tests/parallel/tlet_spawn.nim
+tests/parallel/tpi.nim
+tests/parallel/tsysspawn.nim
+tests/parallel/twaitany.nim
+tests/stdlib/thttpclient_ssl.nim
+tests/stdlib/tthreadpool.nim
 # broken
 tests/assert/tassert_c.nim
 tests/async/tasync_traceback.nim
 tests/coroutines/twait.nim
+tests/dll/nimhcr_unit.nim
 tests/errmsgs/t14444.nim
+tests/errmsgs/t23536.nim
 tests/errmsgs/tcall_with_default_arg.nim
 tests/errmsgs/tproper_stacktrace.nim
 tests/errmsgs/tproper_stacktrace2.nim
 tests/errmsgs/tproper_stacktrace3.nim
 tests/exception/t13115.nim
+tests/exception/t22469.nim
 tests/js/tmangle.nim
 tests/js/twritestacktrace.nim
 tests/lent/tbasic_lent_check.nim
 tests/misc/trunner.nim
+tests/misc/tsizeof4.nim
 tests/misc/tstrace.nim
 tests/misc/twarningaserror.nim
 tests/parser/t20922.nim
 tests/pragmas/thintprocessing.nim
 tests/pragmas/tused.nim
 tests/pragmas/twarning_off.nim
+tests/range/tcompiletime_range_checks.nim
 tests/stdlib/tos.nim
 tests/stdlib/tstackframes.nim
 tests/stdlib/tstats.nim
diff --git a/dev-lang/nim/metadata.xml b/dev-lang/nim/metadata.xml
index 43513b90b646..b2fef7a3d52d 100644
--- a/dev-lang/nim/metadata.xml
+++ b/dev-lang/nim/metadata.xml
@@ -41,7 +41,6 @@
     <remote-id type="github">nim-lang/Nim</remote-id>
   </upstream>
   <use>
-    <flag name="experimental">Apply experimental patches</flag>
     <flag name="test-js">Enable tests that require Node.js</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/nim/nim-1.6.14-r1.ebuild b/dev-lang/nim/nim-2.0.6.ebuild
index 07e043cf4ffb..524cd020c819 100644
--- a/dev-lang/nim/nim-1.6.14-r1.ebuild
+++ b/dev-lang/nim/nim-2.0.6.ebuild
@@ -3,24 +3,23 @@
 
 EAPI=8
 
-PATCH_PV="1.6.6_p1"
+ATLAS_V="0.8.0"
 
 inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
 
 DESCRIPTION="Compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
+HOMEPAGE="https://nim-lang.org/
+	https://github.com/nim-lang/Nim/"
 SRC_URI="
 	https://nim-lang.org/download/${P}.tar.xz
-	experimental? (
-		https://git.sr.ht/~cyber/${PN}-patches/archive/${PATCH_PV}.tar.gz
-			-> nim-patches-${PATCH_PV}.tar.gz
-	)
+	https://github.com/nim-lang/atlas/archive/refs/tags/${ATLAS_V}.tar.gz
+		-> nim-atlas-${ATLAS_V}.tar.gz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="doc experimental test-js test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test-js test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -43,13 +42,15 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
-)
+src_configure() {
+	xdg_environment_reset  # bug #667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	mkdir "${HOME}/.parallel" || die
+	touch "${HOME}/.parallel/will-cite" || die "parallel setup failed"
 
-# Borrowed from nim-utils.eclass (guru overlay).
-nim_gen_config() {
 	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
 		cc:"gcc"
 		gcc.exe:"$(tc-getCC)"
@@ -74,29 +75,8 @@ nim_gen_config() {
 		# some tests don't work with processing hints
 		--processing:"off"
 	EOF
-}
-
-src_prepare() {
-	default
-
-	# note: there are consumers in the ::guru overlay
-	use experimental && eapply "${WORKDIR}"/nim-patches-${PATCH_PV}
-
-	# refer: https://github.com/nim-lang/Nim/issues/20886#issuecomment-1511708198
-	# bug: https://bugs.gentoo.org/894410
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-1.6.14-clang16-musl-fix.patch
-}
 
-src_configure() {
-	xdg_environment_reset  # bug 667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	nim_gen_config
-
-	mkdir "${HOME}"/.parallel || die
-	touch "${HOME}"/.parallel/will-cite || die "parallel setup failed"
+	cp -r "${WORKDIR}/atlas-${ATLAS_V}" "${S}/dist/atlas" || die
 }
 
 src_compile() {
@@ -112,23 +92,10 @@ src_compile() {
 	eend 0
 
 	edo chmod +x ./bin/nim
-	edo ./bin/nim compile koch
-	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
-	edo ./koch tools
-
-	if use doc; then
-		local -a docargs=(
-			# set git tag
-			--git.commit:v${PV}
-			# skip runnableExamples as some of them need net
-			--docCmd:skip
-			# make logs less verbose
-			--hints:off
-			--warnings:off
-		)
-		edo ./koch doc "${docargs[@]}"
-		HTML_DOCS=( web/upload/${PV}/. )
-	fi
+	edo ./bin/nim compile -d:release koch
+	edo ./koch boot -d:nimUseLinenoise -d:release --skipParentCfg:off
+	edo ./koch tools -d:release
+	edo ./bin/nim compile -d:release ./tools/niminst/niminst.nim
 }
 
 src_test() {
@@ -140,13 +107,13 @@ src_test() {
 		--hint:UserRaw:on
 	)
 	local -a testament_args=(
-		--skipFrom:"${FILESDIR}/${PN}-1.6.14-testament-skipfile.txt"
+		--skipFrom:"${FILESDIR}/${PN}-2.0.6-testament-skipfile.txt"
 		--nim:"bin/nim"
 		--targets:"$(usex test-js 'c js' 'c')"
 	)
 
-	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
-		testament_args+=( --colors:off )
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] \
+		&& testament_args+=( --colors:off )
 
 	local -a categories
 	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
@@ -164,39 +131,42 @@ src_test() {
 
 		[[ -f "${checkpoint}" ]] && continue
 
-		case ${tcat} in
+		case "${tcat}" in
 			testdata )
 				:
 				;;
-			arc | ic | valgrind )
-				einfo "Skipped category '${tcat}'"
+			arc | gc | ic | js | msgs | stylecheck \
+				| testament | untestable | objects | valgrind )
+				einfo "Skipped nim test category: ${tcat}"
 				;;
 			* )
 				einfo "Running tests in category '${tcat}'"
 				nonfatal edo ./bin/testament "${testament_args[@]}" \
-						 category "${tcat}" "${nimflags[@]}" || test_return=1
+						 category "${tcat}" "${nimflags[@]}" \
+					|| test_return=1
 				;;
 		esac
 
 		touch "${checkpoint}" || die
 	done
 
-	[[ "${test_return}" -eq 1 ]] &&
-		die "tests failed, please inspect the failed test categories above"
+	[[ "${test_return}" -eq 1 ]] \
+		&& die "tests failed, please inspect the failed test categories above"
 }
 
 src_install() {
 	local -x PATH="${S}/bin:${PATH}"
 
-	edo ./koch install "${ED}"
-	einstalldocs
+	edo ./koch install "${ED}/usr/lib"
+	dosym -r /usr/lib/nim/bin/nim /usr/bin/nim
 
 	# "./koch install" installs only "nim" binary but not the rest.
+	exeinto /usr/bin
 	local exe
-	for exe in bin/* ; do
-		[[ "${exe}" == bin/nim ]] && continue
-		dobin "${exe}"
-	done
+	while read -r exe ; do
+		einfo "Installing nim support tool: ${exe}"
+		doexe "${exe}"
+	done < <(find ./bin -type f -not -iname nim)
 
 	newbashcomp tools/nim.bash-completion nim
 	newbashcomp dist/nimble/nimble.bash-completion nimble
@@ -207,5 +177,7 @@ src_install() {
 
 	# Install the @nim-rebuild set for Portage.
 	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/nim-sets.conf nim.conf
+	newins "${FILESDIR}/nim-sets.conf" nim.conf
+
+	einstalldocs
 }
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index b7fe711a8fad..4d61e1f46293 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -28,10 +28,10 @@ DIST ruby-3.3.2.tar.xz 16349500 BLAKE2B 2a474df10363555e8f0b9ad73bb854ad34f3d148
 DIST ruby-3.3.3.tar.xz 16361160 BLAKE2B e1dbb8f0d5de4b2d7efe3f68c1ea7f28e4fac19dcd9d6d5e301e5c565474958a916ea5f21ef2ce0d741d4d9c45a546dd3d00b3ca3d1eccfaf61f20eba3c871a7 SHA512 27dcae604e6613e1eaa20c6a75ee88b970bb0dd584d9bc0c021ad8da4340858e3c2e874ac841fcca0b0444a0c0146c4650d2d22bac3c9e12853533c37255f8f1
 EBUILD ruby-3.1.4-r3.ebuild 8352 BLAKE2B f3a592bd500c5319ca351544666a87446ad794158e3271076b8bcbec1e827ab8d9f7e70e1a0c4548e203d3a758a29e0d790285ff48d99b69816c6107d0d03bdf SHA512 e191ef30979b3fb967379345474609382629e555040b388c92fe54e45b3afd097b1e7c9f4bbbf611b740d799cd1c26973a6aec60dcc35c54c9182f3911a47485
 EBUILD ruby-3.1.4-r5.ebuild 8504 BLAKE2B 2ee7c9aef7c65d9601cd31918addaa7a42bf806d08237f75e894db1e564e6fc282892c2c517badf366cd0584debcb51d0c754353af656d26bdc94389d5ea7e01 SHA512 1fb62ce8b8fc7288a954abe23af104ce7bc9124c157f4dcf68fd499d7f103bc8b396fdb5089431b4cf7c76c9c7adabe11f3a4f9b172c1d12c14165ec2de8d306
-EBUILD ruby-3.1.5.ebuild 8595 BLAKE2B 3956931b74ea380a9e5b9b8215b03d1a4337e6cdddac8386d112742bb6657599a6395995ea91b30d7b785e42b00abb553062371034e18010773a6def687b2569 SHA512 c66eb7a8a0ef8fba548605430b99d796cf83dad26810c53e2cdd557c09387c386c4ecb5e7e436e54fc91bd9969b8ed37fc9135b133cee634b74960035daf1f4f
+EBUILD ruby-3.1.5.ebuild 8594 BLAKE2B ff11b93e3af50798d6080c62044650412b82d40d23e3875f907001babe2e5a5202dbeeb8fbc7d520fe720eaea2e4505dcc2133c7600d41362e2cee910d6e0dbb SHA512 339a1788ad60046dfb52bd5dd7aff0a07513e36d90c6004e5a0b084e038951bab3db1a4a965e43796a2e66069c12751bd6e237bf37022a542d3ab0543413c3e9
 EBUILD ruby-3.1.6.ebuild 8801 BLAKE2B c1d6c9f691869e2c87018af75de136ea232d0538dac701ffa320308c5f22c658b9ef4ece7a14d60b6914cb3190c5bc62fcf851bf8f5691951134f56f0ab2baed SHA512 9026d13286ba7917138995f2b6198c67cfab4efd0065e7db441fb3bf39c4aea2441299806352ef0942c17af611ccb43f202bec5724177aa7172f49d0c558a3dd
 EBUILD ruby-3.2.3.ebuild 9534 BLAKE2B 8383353bf02c2abba8dcf67cbdffcc197d085fce1c961c56d0d493ccc840f0970efb105b916a28d590c6f6caff42e654651361f685bce545c969082981cbd25f SHA512 78f8270db8c06b960a84b03b20b31f3aacc455905637e8cf3e040724d1c39b43aac19e296205902cf6c958e5c64ed0843e6854ae9997e612598aea6b3965c6d0
-EBUILD ruby-3.2.4.ebuild 9539 BLAKE2B 220d080210da68223c34bb36cf27f4ba67abce2aeb0124d9630e87db495f0083cec8149caf6103a62ad4bc5d5ce79aa2f484057dc5a450d9c222ac238caefa0c SHA512 e4ac1ff43795e34937d245bc7eab76cd02f2760d0e36d5032929e58fbdfa98dd260c39a02740ed5fd6e70c10fcca9289114110f1e3da00182e6be5adcb8b9baf
+EBUILD ruby-3.2.4.ebuild 9538 BLAKE2B 2b42ff228264ed57f4980463c3d79b533c4922cdd86ecb2b64cd11cd37e0b02a70c364f9105094d08fbdd944eb76f0345a7b797d4bbc278bfca01074b1721fe8 SHA512 4be33bbad246bf398660481977b7349bd5ae1f145d30610e337a319da8b1cd256c4294a1c2a52f472e9f7bea4bfee1f8eccb99d8a554e7c2a23ce78477c56a4c
 EBUILD ruby-3.3.0-r2.ebuild 9312 BLAKE2B 547e2853e5a53f762d8ac6abb7c721ea3221d645d3717354d8c92059dd3417f71611e104b2c1c0fadbd14b86174312483e83768ebbd70fa787b423ce59deba9c SHA512 7e250ef083f3f5f5bcd12db3080eedbd99dc6d7033da8846306d0f4a4ce6763baaabbf25171d2b69830f69a52bbdbd3a11b31f3849af860e6b6d8001502ea97e
 EBUILD ruby-3.3.1.ebuild 9269 BLAKE2B 3f9971414512fb66be404c5a7ed5553e8b581b5f19874d7ab733d5d6aad3cca489163764d3bc2aa81a6f5d2981026290e4a197cf4b3712218741b4aede3268ee SHA512 44419e0bac61f0e9215e4c131ede309b08ef3d021c476899c0adadf35d54d661e86beb75a5e80a95dc7915131b748823e9ea5b53af3f8bce6fb7ac11c178690c
 EBUILD ruby-3.3.2.ebuild 9269 BLAKE2B 3f9971414512fb66be404c5a7ed5553e8b581b5f19874d7ab733d5d6aad3cca489163764d3bc2aa81a6f5d2981026290e4a197cf4b3712218741b4aede3268ee SHA512 44419e0bac61f0e9215e4c131ede309b08ef3d021c476899c0adadf35d54d661e86beb75a5e80a95dc7915131b748823e9ea5b53af3f8bce6fb7ac11c178690c
diff --git a/dev-lang/ruby/ruby-3.1.5.ebuild b/dev-lang/ruby/ruby-3.1.5.ebuild
index 8f3d74c898fc..993cce45993f 100644
--- a/dev-lang/ruby/ruby-3.1.5.ebuild
+++ b/dev-lang/ruby/ruby-3.1.5.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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="
diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4.ebuild
index 1c19b91c8e3d..da71434a4e0c 100644
--- a/dev-lang/ruby/ruby-3.2.4.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+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="
diff --git a/dev-lang/srf/Manifest b/dev-lang/srf/Manifest
deleted file mode 100644
index aedba0cbaa13..000000000000
--- a/dev-lang/srf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX srf-1.0-fno-common.patch 215 BLAKE2B 259a699027b336c2fc7ec85132c6dda7a5791ab85aee25ed831402b1fdb82ec6f986bb39db455fa4bd20b9967c4efe073bcc40ff331a413801557c0c2671d15e SHA512 5060a4d68de1dffc2513799f72e157e2456045d63546f3fc0b79aab2f594d5eb0ef5f504269842a183737a430ef135d9cabdd44dc12ef6c80648e6c9a5ec7ab7
-DIST srf-1.0.tar.gz 222493 BLAKE2B 09fb3e767e04ac735245e973d225616b0e527aa2ded49c9350c592284e2ecd840b439af61d27e67dfa3c932a320de787c371354503ed40a8af2a686dcf87b127 SHA512 420f691a937fa30220cd436faaf75299991452fd5f026dcc7aaa767e276eb245cb8eb88d875911826b66abad62fa10326b694301b4372b91e4ac20bf32c78388
-EBUILD srf-1.0-r2.ebuild 650 BLAKE2B 23262fdabdeea4f75f75e3954ef35650166f6f09e79e873cac6aff4e00c60456caac1c3639c8a7c6aa82ea5b07a87c206d5b8e89f264ec44168692ecfbd1dc27 SHA512 a3d3f86ac8b9d68458353703347d25a10ce53081558e9b774731f1d8b3abb51f59c4b52bdbf039e12289e05442bb907b45a9ade26129e27def0f0594fabef591
-MISC metadata.xml 419 BLAKE2B c12472f4f9bb11a324753458349f00df1c22710e87166bd4a4f82819a176af59f2f82e2aa0424d2cdfed1381091173abdc154eb4d1e2b100f7d7dc409d9c4731 SHA512 d1195fe9738893965a0a517e5669ad92b349081dc0b0442e1a1dda3b22fa8e88f9cd20a0852141066484d7c027e5e5bc90bd6491713e75ecd86a6d183d92195a
diff --git a/dev-lang/srf/files/srf-1.0-fno-common.patch b/dev-lang/srf/files/srf-1.0-fno-common.patch
deleted file mode 100644
index abbd5c741910..000000000000
--- a/dev-lang/srf/files/srf-1.0-fno-common.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/builtins.h
-+++ b/builtins.h
-@@ -20,4 +20,4 @@
- */
- #ident "$Id: builtins.h,v 1.4 2004/11/02 04:39:39 bediger Exp $"
- void setup_builtins(void);
--int primitive_call_counter;
-+extern int primitive_call_counter;
diff --git a/dev-lang/srf/metadata.xml b/dev-lang/srf/metadata.xml
deleted file mode 100644
index 3c2d1b10e034..000000000000
--- a/dev-lang/srf/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-srf (Simple Recursive Functions) interprets a very simple programming language
-similar to Stephen Kleene's recursive functions. You can use srf to help
-understand recursive functions, or Peano arithmetic.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-lang/srf/srf-1.0-r2.ebuild b/dev-lang/srf/srf-1.0-r2.ebuild
deleted file mode 100644
index 216eb11e8f3a..000000000000
--- a/dev-lang/srf/srf-1.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-clean
-
-DESCRIPTION="The Simple Recursive Functions programming language"
-HOMEPAGE="http://www.stratigery.com/srf.html"
-SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-
-DEPEND="
-	app-alternatives/lex
-	app-alternatives/yacc"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	default
-	# Remove CVS directory Bug#371821
-	ecvs_clean
-}
-
-src_install() {
-	dobin srf rfunc/rfunc
-	doman srf.1
-	dodoc README srf.html
-
-	dodoc -r examples
-}
diff --git a/dev-lang/starlark-rust/Manifest b/dev-lang/starlark-rust/Manifest
index acc3100ec7c4..99ada9fe1f2d 100644
--- a/dev-lang/starlark-rust/Manifest
+++ b/dev-lang/starlark-rust/Manifest
@@ -164,5 +164,5 @@ DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca2
 DIST windows_x86_64_msvc-0.30.0.crate 668972 BLAKE2B 46ca7506391d28b3317e730fcd8d994e01191b59a7a08eedc86cfa0a735435fbe0b9d09cef37f318a1dd250103e2f76915456183d2cb25406a209c8086751257 SHA512 25737d7088457e2c3e93ec17af814db6522dd2a9c72a78199bb4035d5ddded3aa364cc96f9a8c2beb1e5f96d2199de0288ca8e61e79ef870a2ff8fea38ea1875
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
-EBUILD starlark-rust-0.8.0.ebuild 4119 BLAKE2B ea4c146114a73b887652268f86bd7e92a8d794d857498eda05add7148a14da395f236f330a27406ebfe3e810fa9e3df619183e9e0b6feff9f0b6e48700b15488 SHA512 22709e25fc72e94a6e7e8ad543ebf03e8489eac4f6e7b5da8519638dfd1c775434c513abdc026218d454ac07d43c43f624aac7cb0cdbc7303417b6239565b2a0
+EBUILD starlark-rust-0.8.0.ebuild 4131 BLAKE2B d1f16a289516bc15b4bdc031316c543bcc95d949c5b171ba0847b84dff44dde5b8ce6ec92d812413783c1c8e8a56bfcfa4c6a635a8cfa2cb17217fb83fb685d4 SHA512 d3fa19f226b6884563303104936fff48070f8d9ad9d6d092531015db65e174bb79bd3cf01a029e8040b8958f3f3761a710bf91c8430354955552c24154d86403
 MISC metadata.xml 602 BLAKE2B c571e726d5c22268c53d869249acb58b618fa5c889647d65ea243c1fdf85119f38780a38017928238fdca2f9baa9fdd7dbd164074a179c61f8399ea907ab1882 SHA512 340fbc87211d09ea739b2ace4e923c850a35f7b04fbdc8e56452e211f0976b75ec2ff02fdb24a72863db56adb3e8f18c2d1297cf255a42d1a8ccfdf5eac93be3
diff --git a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild
index c113e7a06b47..78c7d2f5a9d9 100644
--- a/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild
+++ b/dev-lang/starlark-rust/starlark-rust-0.8.0.ebuild
@@ -195,11 +195,11 @@ src_prepare() {
 
 src_test() {
 	source "${FILESDIR}/test/features.bash" || die
-	test-features_main "${PWD}/target/release/starlark" || die
+	test-features_main "${PWD}/$(cargo_target_dir)/starlark" || die
 }
 
 src_install() {
-	dobin target/release/starlark
+	dobin "$(cargo_target_dir)/starlark"
 	ln "${ED}/usr/bin/starlark"{,-rust} || die
 	dodoc -r {docs,{CHANGELOG,README}.md}
 }