gentoo auto-resync : 03:01:2025 - 06:31:16

14 files changed, 65 insertions, 419 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index bbd776579d99..2a3a5313bba4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ammonite-repl-bin/Manifest b/dev-lang/ammonite-repl-bin/Manifest
index 514851c93bf2..212f461c7217 100644
--- a/dev-lang/ammonite-repl-bin/Manifest
+++ b/dev-lang/ammonite-repl-bin/Manifest
@@ -6,6 +6,10 @@ DIST ammonite-repl-bin-2.5.9-2.13 56786192 BLAKE2B e63264b1735132cdb22626d35a0a8
 DIST ammonite-repl-bin-2.5.9-3.0 61696887 BLAKE2B fc7afabf3fc6129ea8da03cfb03da7cee10889ed4ceffe08e965b6f27649af6daf1db5e6bfb12871ac2fd5fe5b74cc27e1e467c25f3b5a4a7b9662943c4ef7fa SHA512 b33aebc31b5b54739389212533780b99145aaf74905532c1de55ee8e79dc1e12e217968f6f0a5f39fb6ffeb87f70792dcef98c0f75f3fe81a96f2c4adbc9f066
 DIST ammonite-repl-bin-2.5.9-3.1 62779382 BLAKE2B 0136efb63727ba47ddac62671a510b0742a1b3f888ced421518b052fd95dabc15cf20626e0b4692a936df468cc6c96b16a486ea847973ed9ab5d7c8dce52481c SHA512 3e422d9402a4a8a71c77b4c8bdcc980f19274938a122a57ce712709961fd3d6c7417b3e85fff414863c84f412c183b7a5bd92882348161d55be8c48a98ea2e3b
 DIST ammonite-repl-bin-2.5.9-3.2 63805907 BLAKE2B cc9329f0f7e91675838b2735a38dda16e934ec3c7c3be827af4ae56d7f67e632e6a26866cffa6f4bf4e08b955fe608dbfed540f8ea34901cdab6acef41ee2e8e SHA512 f57fa352fc4d074e5f482c1b4e0593154943e81e722d0b5f9c4a9059c07bf2774d5c03bca192e5d66cd6c078c7978d323059606d41268f9f56903550fce9e2f8
+DIST ammonite-repl-bin-3.0.0-2.13 52789295 BLAKE2B f743c6214daefeb6b65f06e5dfd23c69a3dc91b5fe0af954e290866bef764c7bed7822f757017dc09a38239683d27ec9f6a35882ce20766a11e80a565134e528 SHA512 8f67073db56f88895902ff86fb902af06d017a4c0d75ad3435d97b66480baf8961b1b041b76ed19b8e5f87aac4604a2de7aa97b44f3261fd92e3c5928458a8f4
+DIST ammonite-repl-bin-3.0.0-3.3 58494899 BLAKE2B bab9c523dc9fe5621ee67a50685fb4d1b6995f2b7a8a5bd5e25cff6fe55e8763d48f62144b24d73213c41ce6c2967144488dbbed33cdf62a8922ee6c191794b8 SHA512 2bb8e3baa20f545babb6b570c203329d7df5dcdae030d1fbc439721376a45643c9bdd5323dbc67ee98592ed1fb88bb0853eae9f558919ca10374e57e2ca62bc4
+DIST ammonite-repl-bin-3.0.0-3.5 59873934 BLAKE2B 80e802090b6185f19fd9073b54379a7fdbe633101594a59ab766b08ced98c5db0d9f8b34d685ed4d9e32cc62b8f4dc272208fd95b5fcd2f0b31666de6ae0de0d SHA512 4ffe5a16922a17228164a8ddd68ad06c2f0d20bd0cb69fa40799bca61c57fbf5d0f484cc2a2b27929666590617bffb5654ae6b7f42d07ebee89d840b645b80ee
 EBUILD ammonite-repl-bin-2.5.11.ebuild 1184 BLAKE2B 46def29c850aa604c2d459dee32e7bd3ed7bb38bee8e3345fe184dcf44f41ea2c4e660119e1fe5fed43ef239292ec976f44266244fa7592b19845868b8b58a7d SHA512 9de63ce3f6ede7b217d80632f651d2c0a58aa01d84aaa73bc7f558449957e95e0a55d0ef23f28aec03b0299589e2ecf940e2edd04dd637760b87a0a4cd76ea9f
 EBUILD ammonite-repl-bin-2.5.9.ebuild 1177 BLAKE2B b290ddddc962753fc72893ec458b270b2d286a92e6c5e7787b32bc0e1bf6ad75b12336c980abe13f686fdd8aff26d5b89c2a4c32ac7c6a746871ad49347dfb34 SHA512 c366beaeff9e51e69e2fa720d9a44426eb5099547437fc75448ca08f6eec4de388d402e5d85dccb4f72f0233d77db68035425dc27b606fea230a07f47ffbccec
-MISC metadata.xml 798 BLAKE2B ffb8e809662233799e0197adee436280dc4a5949723db00af1fd985db36dc0b8b610e0667bebec13429495d38b41288348dbd644fa6641ae9498dc7ee206fae2 SHA512 170b1c51dae0240f25415873112f5a890e40db58897ae3b4e4e3ef49fe0236bf32188e04b72463a18195635c112257fbb62c49206e2af05eb643a67bc646f588
+EBUILD ammonite-repl-bin-3.0.0.ebuild 1135 BLAKE2B 13b04b76173e66a1853308bdbf84cc0fe1856346d6ad6bfd1a1cb057d0a3ce4e560946407d4dc1bca317e2a1aab35d0b6c26cbc2cb53f5e8a2a23b047bd56ad8 SHA512 eec34bc17ac24720eb840e101a07e173f6543947466bea93863ef9d976c8f058d9709c00027e639b7a0a71a8780bd4cb5fef499cadf2a5471c812efee55bbab5
+MISC metadata.xml 996 BLAKE2B 73e744123c74fcd6a9878b4f49cb4000265d6718e92e7644967b1195d5a7b7b520f016dfbad8e420e5a6620c23041b3618d7ae1a8ed48a6170f27ce23f191176 SHA512 0cae75b802af4fbbaf22850186308eb47e07fd456ef8056722315a033aadbd381cf42bbfcd672eafc7b37061bdb70254a08ab16b26d17a0fc13c429a16aea9de
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-3.0.0.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-3.0.0.ebuild
new file mode 100644
index 000000000000..46dbf882faac
--- /dev/null
+++ b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-3.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Scala language-based scripting and REPL"
+HOMEPAGE="https://ammonite.io/"
+
+MY_COMMIT="2-6342755f"
+
+SRC_URI="
+	scala2-13? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/2.13-${PV}-${MY_COMMIT} -> ${P}-2.13 )
+	scala3-3? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.3-${PV}-${MY_COMMIT} -> ${P}-3.3 )
+	scala3-5? ( https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/3.5-${PV}-${MY_COMMIT} -> ${P}-3.5 )
+"
+
+S="${WORKDIR}"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+IUSE="scala2-13 scala3-3 +scala3-5"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local last_amm
+	local scala_versions=(2.13 3.{3,5})
+	local scala_version
+	for scala_version in ${scala_versions[@]}; do
+		local use_flag=scala${scala_version/./-}
+
+		if ! use ${use_flag}; then
+			continue
+		fi
+
+		local amm_bin
+		amm_bin="amm-${scala_version}"
+
+		newbin "${DISTDIR}/${P}-${scala_version}" ${amm_bin}
+		last_amm=${amm_bin}
+	done
+
+	dosym $last_amm /usr/bin/amm
+}
diff --git a/dev-lang/ammonite-repl-bin/metadata.xml b/dev-lang/ammonite-repl-bin/metadata.xml
index e745765d8d2b..3d59e4620882 100644
--- a/dev-lang/ammonite-repl-bin/metadata.xml
+++ b/dev-lang/ammonite-repl-bin/metadata.xml
@@ -9,6 +9,7 @@
 	<upstream>
 		<remote-id type="github">com-lihaoyi/Ammonite</remote-id>
 		<bugs-to>https://github.com/com-lihaoyi/Ammonite/issues</bugs-to>
+		<changelog>https://github.com/com-lihaoyi/Ammonite/releases</changelog>
 		<maintainer status='active'>
 			<name>Li Haoyi</name>
 			<email>haoyi.sg@gmail.com</email>
@@ -19,5 +20,7 @@
 		<flag name="scala3-0">Install Ammonite for Scala 3.0</flag>
 		<flag name="scala3-1">Install Ammonite for Scala 3.1</flag>
 		<flag name="scala3-2">Install Ammonite for Scala 3.2</flag>
+		<flag name="scala3-3">Install Ammonite for Scala 3.3</flag>
+		<flag name="scala3-5">Install Ammonite for Scala 3.5</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 18d2e69517ac..844a1f820b52 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,14 +1,4 @@
-AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab971fc6063652e3185b320e4cb05ccedb6c26c7d64b2f2998a901608ee251762b723f62bd9c239a51ab6a6d6f2b39d SHA512 823d9ba2041f97c39d8ea5f49cb02f68d8c98da95d0a479cc65a638365e2adafd1c5645fa6846720af18198834958f37b0cc0d92f38023ccdaf40ec8dc848f64
-DIST lazarus-2.0.12.tar.gz 69560778 BLAKE2B ff6c9414483b0d50dbbb30c8fbf626c81d9c71ef0329aa1d58b37aa4288a500e1ab55d06bad27f637e3f09b9d062af1896720b9cb7367b092fc872cf613f8a3d SHA512 dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e
-DIST lazarus-2.2.0-0.tar.gz 76777421 BLAKE2B 29a7ed3285e3fbb6f72fe932d72d71edfd6903a8a5eb24f9534a12a4d1ccf5e40c61ce3cc1cbd8eef6dd7700f6e29fb640e35510b23a1ca1b02f7df0a4a738cc SHA512 4ebd8b4b7c6dfea491a30b1253e604646109d208c237e59be2fd9f6be3fb1e29443dd4e482076d77100678d0e4085b998398fca0532aa6122b59db7157af0ce4
-DIST lazarus-2.2.4-0.tar.gz 77272959 BLAKE2B 2d7b2872a7399eb1a3a7d9fb20fed209900603ae433db75ac2c4244edf5e5981314ed3d8e39143ff30764e7ccbf1286edace9c38505df1cd28b44250bdd07224 SHA512 1a2fbc8451f1954df1d0071c586662ebc3cd0e9a7db5d910e0af86a3095252a5796d4c7abcf3861ad723af26974ac416c5bf919cd77ad5f406295ad7cdf47eb1
-DIST lazarus-2.2.4-makefile.patch.bz2 3650 BLAKE2B 4a86e0dee7759183e3311cfa9f250995dbf2bb39d1de4c0fbc0191767b5f16029285ab92c76466d261708a88ed600929e777798560161e9942a64e44f956ff89 SHA512 560ffd3d43b75a804dfdb756323cecc7f2039215ab176ca0149cfee11dfe31d7943ad4aa212e9194c2bd2acbd0835e635501ef157888daf3715be7f760b3d51b
-DIST lazarus-3.0-0.tar.gz 87513233 BLAKE2B 26e8492194541453230832591445b97827e65b61531078cb4bd1c9f549bcd0aa531fef036f701de885e96f9e56476b0dd1c9465e2388ea43080ba418acbd097e SHA512 85cb3548fab017f2fd97f5fb141d59a0d0ec1412a161f98fea726ad5d6ed32ee2eb6ef6573e058d4df7dfcc067256e842acf994b73c9a50ebfb064657db33881
 DIST lazarus-3.0-makefile.patch.xz 3968 BLAKE2B f61d535cab6b1b04be5805fe2a321bd644b3f47092d9d76ca624e33fbfce6bd89dba7bf00adebbbe5635b898567a8b62bfd0e44142f1dc3d8640b5276014888a SHA512 c91bee56a41f31ff8b5cfb4a7149cf0856e8c7b47fe502ba9828854ba4589ab19ddfecba182e5fc89cf8b7d71bda01d67a534ecab3f09437a0d7064c2b0f1fe8
 DIST lazarus-3.4-0.tar.gz 87535234 BLAKE2B f7da0b4edacf1e93b53bcdc4093e8c6ef3487985a5054db4368a56237ac8e39dbb088dea5e0146923554cf498ef969f86f6480235cc725f7c8d0f4e3fc9345de SHA512 ab4096345d72028e89da4a284479bbe5d4ed89a6bd0463f62b7d04a23c0491dc3f7934c75b4a4a916f81db8c0b252bf382e5ab41a16ef42efc1c08efcce68aef
-EBUILD lazarus-2.0.12.ebuild 2667 BLAKE2B d6e1a545dd5a90f61b2f447205bdfb325f7a10e26f79891dd8fb229f76933f437277aba252253b123313ebc3189440d8b82bd1e794873e127c0f543ad514e1b8 SHA512 479430f9b6f5b15cb1fac203fe9d133706d2a01bc9020b23f35d1a5935dbf1bf116e2e9095b7e4175cad964f91def11cbfbb5f3daa21c0b3c47c834d4195643f
-EBUILD lazarus-2.2.0.ebuild 2413 BLAKE2B f09dee3695b75dd6c59ff54b3358c7674a445d0476cce66ca0efb30331a66eaaa5596184913a798d9ceb6b95df1f428f206c6d886dd3fd0900df3de43a2494ba SHA512 5e2090fad65e9ad74679010c704643ec290a63f022711b5b454f6c564ae38758d501aaa3045e4a794e9fdb6a5afa1b694bcbc932ca3d0174fcaa22b628924a2f
-EBUILD lazarus-2.2.4-r1.ebuild 3251 BLAKE2B 2722a0945c7eb9c3044f04c1dd687f22f581d20cc2cdf0843845276668b00117915cf4771cbb9234bf6045ba32001d2a1eaa27c78c2bfa033168b25817335a8e SHA512 a6cead8542a23c937ec2d35af6f738a482644adf51fa6a77c1bc985ce8abe389f5677e5153ee12c57b547bda7cc4164b11d493854e5fde7eb4c9f420b275e5e3
-EBUILD lazarus-3.0-r2.ebuild 3453 BLAKE2B 4ec6e7888e36514976d9e9685b71b7166da35bc8ed8d92c891b8a7f93c0b6e5a69535bf598cb2cf25f42012a9ba4809e15837a834a5469fe5ed77f949f23886a SHA512 cb050d428f7801b589a65e9028bf4dc65a9ccc9c741db63a67650e79683fd8df83a227b7033978f339f673c11d8e9aafc79e9ac2547a673e0167a001d2346d0a
-EBUILD lazarus-3.4-r1.ebuild 3426 BLAKE2B 6dddf98a95cbcdeb77dbae51b15f4154875bf1a30f3fbea15aba53e91c89de7371a89e255cfd9f3d6215e65cfea94914eeaa0e3dbd754f840b2ba1c2957fe3d4 SHA512 010a21fdb0dd5ad55c4dcaeaf024fe231dc2ea8f6049f0eb24843f2440965dd8c6248332d94f39fabfdfa2af87787e9d2d18d8f6e721c6d1ff6bfc52bb7879b8
-MISC metadata.xml 626 BLAKE2B 029a0168a5d5d90f1b80b5a2b8a91c8c40b64aaceebd9212473c91f014ec703983ae75c45022ca59057af7f41b573eb78d4d4f1a0d3197f8b8dd1f205d101307 SHA512 307cb3d81fe2e6fddcb901b4929e164288ad7f111a8da94d2d9f137297cd66c820c1f2801dea530e8ad9b30d503659ffacef06d4cd8806475503f73579e278e8
+EBUILD lazarus-3.4-r1.ebuild 3333 BLAKE2B 746b34491c39175e2e3d841b9c86f6589a038699c1892357f8af633a8693ebdecb7a5c48b78a49a6ae9d2c69770924e10e47302bbd7560cfebb00cb61c49d163 SHA512 08498f0219afa3f69df4364c2846621a2ee49b71fb72346f4c35ee39f91b516f754ce8b712b99b71a24fdcde7cab9e689fe6e111c09a386f362fb2fbfaf94023
+MISC metadata.xml 543 BLAKE2B d2b66611c14a072eeb89e4a0b5881d68caf1fec8f294ded0a0a45f659038367c361765d3cc6b49abd663cd0cd6e78d598a3bc0bdfa101266c94ed3f306ce1a75 SHA512 45835a83e296ed9cd3f4a41da3ab278d6f15333cca51ef9e0a832cd04f90bc83dc1c2c5f1f7da7613389cd84214b9276c2c09bb3d4209cda10afe819c0920113
diff --git a/dev-lang/lazarus/files/lazarus-0.9.26-fpcsrc.patch b/dev-lang/lazarus/files/lazarus-0.9.26-fpcsrc.patch
deleted file mode 100644
index 8f9aee3fa42a..000000000000
--- a/dev-lang/lazarus/files/lazarus-0.9.26-fpcsrc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lazarus/ide/include/unix/lazbaseconf.inc
-+++ lazarus/ide/include/unix/lazbaseconf.inc
-@@ -24,8 +24,9 @@
- }
- 
- const
--  DefaultFPCSrcDirs: array[1..15] of string = (
-+  DefaultFPCSrcDirs: array[1..16] of string = (
-     // search first for sources with right version
-+    '/usr/lib/fpc/$(FPCVer)/source',
-     '/usr/share/fpcsrc/$(FPCVer)',
-     // then search for global paths
-     '/usr/share/fpcsrc',
diff --git a/dev-lang/lazarus/lazarus-2.0.12.ebuild b/dev-lang/lazarus/lazarus-2.0.12.ebuild
deleted file mode 100644
index 63ba361cacc4..000000000000
--- a/dev-lang/lazarus/lazarus-2.0.12.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_2.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.0"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-	sed -i \
-		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
-		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
-		ide/include/unix/lazbaseconf.inc \
-		|| die
-}
-
-src_compile() {
-	# TODO: Change to LCL_PLATFORM=qt5?
-	# bug #732758
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-2.2.0.ebuild b/dev-lang/lazarus/lazarus-2.2.0.ebuild
deleted file mode 100644
index 878b17d9434b..000000000000
--- a/dev-lang/lazarus/lazarus-2.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_2.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.2"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}-0.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	# TODO: Change to LCL_PLATFORM=qt5?
-	# bug #732758
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-2.2.4-r1.ebuild b/dev-lang/lazarus/lazarus-2.2.4-r1.ebuild
deleted file mode 100644
index 8682fdee8fee..000000000000
--- a/dev-lang/lazarus/lazarus-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_2.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.2"
-
-DESCRIPTION="feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz https://dev.gentoo.org/~amynka/snap/${P}-makefile.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0/2.2" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk2 +gui extras"
-REQUIRED_USE="gtk2? ( gui ) extras? ( gui )"
-
-# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
-QA_FLAGS_IGNORED="
-/usr/share/lazarus/startlazarus \
-/usr/share/lazarus/lazarus \
-/usr/share/lazarus/tools/lazres \
-/usr/share/lazarus/tools/lrstolfm \
-/usr/share/lazarus/tools/updatepofiles \
-/usr/share/lazarus/tools/svn2revisioninc \
-/usr/share/lazarus/lazbuild \
-/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
-
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-DEPEND="
-	>=dev-lang/fpc-${FPCVER}[source]
-	>=sys-devel/binutils-2.19.1-r1:=
-	gui? (
-	    !gtk2? ( dev-libs/libqt5pas:0/2.2 )
-	    gtk2? ( x11-libs/gtk+:2 )
-)"
-BDEPEND="net-misc/rsync"
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${WORKDIR}/${P}"-makefile.patch
-	"${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	# TODO: Change to LCL_PLATFORM=qt5?
-	# bug #732758
-	if ( use gui ) && ( use !gtk2 ) ; then
-		export LCL_PLATFORM=qt5
-	fi
-	use gtk2 && export LCL_PLATFORM=gtk2
-	if ( use gui ) ; then
-		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
-	else
-		emake lazbuild -j1 || die "make failed!"
-	fi
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	if ( use gui ) ; then
-		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	fi
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-3.0-r2.ebuild b/dev-lang/lazarus/lazarus-3.0-r2.ebuild
deleted file mode 100644
index 464571a70783..000000000000
--- a/dev-lang/lazarus/lazarus-3.0-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop
-
-# See https://wiki.freepascal.org/Lazarus_3.0_fixes_branch for notes and
-# changes in FPCVER. It *does* change between minor versions of lazarus.
-FPCVER="3.2.2"
-
-DESCRIPTION="feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://downloads.sourceforge.net/lazarus/${P}-0.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0-makefile.patch.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0/3.0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui gtk2 gtk qt5 qt6 extras"
-REQUIRED_USE="gui? ( ^^ ( gtk2 gtk qt5 qt6 ) ) extras? ( gui )"
-
-# Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
-QA_FLAGS_IGNORED="
-/usr/share/lazarus/startlazarus \
-/usr/share/lazarus/lazarus \
-/usr/share/lazarus/tools/lazres \
-/usr/share/lazarus/tools/lrstolfm \
-/usr/share/lazarus/tools/updatepofiles \
-/usr/share/lazarus/tools/svn2revisioninc \
-/usr/share/lazarus/lazbuild \
-/usr/share/lazarus/components/chmhelp/lhelp/lhelp"
-
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-DEPEND="
-	>=dev-lang/fpc-${FPCVER}[source]
-	>=sys-devel/binutils-2.19.1-r1:=
-	gui? (
-		gtk2? ( x11-libs/gtk+:2 )
-		gtk? ( x11-libs/gtk+:3 )
-		qt5? ( dev-libs/libqt5pas:0/3.0 )
-		qt6? ( dev-libs/libqt6pas:0/3.0 )
-	)
-"
-BDEPEND="net-misc/rsync"
-RDEPEND="${DEPEND}"
-
-RESTRICT="strip" #269221
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-3.0-makefile.patch
-)
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	# bug #732758
-	if ( use gui ) ; then
-		if ( use gtk2 ) ; then
-			export LCL_PLATFORM=gtk2
-		elif ( use gtk ) ; then
-			export LCL_PLATFORM=gtk3
-		elif ( use qt5 ) ; then
-			export LCL_PLATFORM=qt5
-		else
-			export LCL_PLATFORM=qt6
-		fi
-	else
-		export LCL_PLATFORM=nogui
-	fi
-	if ( use gui ) ; then
-		emake all $(usex extras "bigide lhelp" "") -j1 || die "make failed!"
-	else
-		emake lazbuild -j1 || die "make failed!"
-	fi
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED}"/usr/share \
-		|| die "Unable to copy files!"
-
-	if ( use gui ) ; then
-		dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-		dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	fi
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use extras && dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	use gui && make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
-}
diff --git a/dev-lang/lazarus/lazarus-3.4-r1.ebuild b/dev-lang/lazarus/lazarus-3.4-r1.ebuild
index db37dcd2026c..2e6c8c1035fe 100644
--- a/dev-lang/lazarus/lazarus-3.4-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-3.4-r1.ebuild
@@ -18,9 +18,9 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
 SLOT="0/3.0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
 KEYWORDS="amd64 ~x86"
-IUSE="+gui gtk2 gtk qt5 qt6 extras"
+IUSE="+gui gtk2 gtk qt6 extras"
 # TODO: Drop REQUIRED_USE per QA policy for USE=gui
-REQUIRED_USE="gui? ( ^^ ( gtk2 gtk qt5 qt6 ) ) extras? ( gui )"
+REQUIRED_USE="gui? ( ^^ ( gtk2 gtk qt6 ) ) extras? ( gui )"
 
 # Pascal ignores CFLAGS and does its own stripping. Nothing else can be done about it.
 QA_FLAGS_IGNORED="
@@ -41,7 +41,6 @@ DEPEND="
 	gui? (
 		gtk2? ( x11-libs/gtk+:2 )
 		gtk? ( x11-libs/gtk+:3 )
-		qt5? ( dev-libs/libqt5pas:0/3.0 )
 		qt6? ( dev-libs/libqt6pas:0/3.0 )
 	)
 "
@@ -72,8 +71,6 @@ src_compile() {
 			export LCL_PLATFORM=gtk2
 		elif use gtk ; then
 			export LCL_PLATFORM=gtk3
-		elif use qt5 ; then
-			export LCL_PLATFORM=qt5
 		else
 			export LCL_PLATFORM=qt6
 		fi
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index b6eaed4c24eb..9cd9670f331f 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -9,7 +9,6 @@
 		<name>Michael Corvinus</name>
 	</maintainer>
 	<use>
-		<flag name="minimal">Don't build extra packages from the bigide component</flag>
 		<flag name="gui">Build GUI IDE.</flag>
 		<flag name="gtk2">Use gtk:2 for widgets.</flag>
 		<flag name="extras">Build a lot of extra packages, including lhelp chm viewer program.</flag>
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index db2d542d4805..81e009aa96c6 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -5,6 +5,6 @@ AUX perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch 2169 BLAKE2B 9734b4b
 DIST perl-5.40.0-patches-2.tar.xz 17072 BLAKE2B 7cc1085a0a701f72cf1fce2b7f18ac949eb03a9e40716c37082396483045df577ef13bbca58ef06f20868e52e9c78e18fa5b8a3434ceea272ff49832a086a1f5 SHA512 d31a25894e3b34c8e80f439ebd423dd8f28eac056ce42d69376882c1655b1f7289ef22f8aa8d30147eaebbe6693f4d86d1570e153b55d58d7b30e5832e7bea60
 DIST perl-5.40.0.tar.xz 13804184 BLAKE2B cf191c3ccaf6f395c0c7d08c2ad3456c1dd622d4fe78e7fb3a74c741e9a84f1d39a55f5bc6adbea54c9520b1b387e72e957f9a7544ab8f24968d233cd5b959ae SHA512 a2fb1a24c6367b4043f4e929b2d74fc3bad1415e53b791ed1f219f1701064ae21b2bd3164ba95fcf24eaf458bd54433024ccae43725c0bb82a1ec6a98dc7052d
 DIST perl-cross-1.6.tar.gz 121973 BLAKE2B b3a17d92dd7621a3bc253a6c4e56eccd3adec2c2b52e606c956a08f48d786a16a3ac5beb056a732ba3df92227f210193b0f516fd9d73cac362a04ec52efab029 SHA512 980af804513ec126e40eb9d8200ca54ba805bbb13b38d20a45daaf8d98d6b257e2eebc1ecad56cd47f60e235fa1141f6df9518d748db4f18d5219180750ca615
-EBUILD perl-5.40.0-r1.ebuild 28242 BLAKE2B 290a99e433c127962496be7441724e7c698678998b7024c66c987de4ad245ecd339df221620b99b0e5d0661fca246d345d50343e87b15cc4b880a75d1ce81d26 SHA512 e3eda29ae4f3ab3c73bfdfb2667f24c3d8747717c472300c3765fcb6197bdf42ee6bafc5ed93ec31c3dbbfa22fee35ec8697831542b414f35a7650db6bd08b28
+EBUILD perl-5.40.0-r1.ebuild 28240 BLAKE2B 6d68631ec442c9831e95283e93c268864ba566b4d825374a06bd35f5d3a1762f07521b0d431a15059c31cfa9d0554ba5aed15fc14bd6f0cbff9d1a4034a45658 SHA512 909e0ffb7e50387f8870e2a7175b4d08abae5bb67cb9e80c18ea2b0d92b8d8cd2ca71652161e3b33c3e858711924e7123e1986aee52498d563662bfc0ca95a00
 EBUILD perl-5.40.0.ebuild 28190 BLAKE2B 69f185c504db14e70534e0ac5ee2bb03e632591219741d4502806143d2d8f5ebc80c7a5d5136e4f65c683ae880c2d270cd376991efbe57085e697f37da2d09c6 SHA512 59bdac5bf0391f117fe753be97e0e385bd74d1854e1ea0afd4f99796d92a693ad7bfa17e39c2043d5b8f67c851d8e88a573b3dab30dfad4770d5987d7fbd4b7c
 MISC metadata.xml 435 BLAKE2B 9a9dfd2dc8274c402dde0c3be13053b28361603c4fd230d841b169843e397bd6e16537034495178dfd443246c1621b34d849455147e8556a12806d973293a855 SHA512 1cb3197cf3c6f3031bdbc95c2686fcd2585f6e457d0661ed986cf7fa91b4ca564f793c2f141bfe5b9b8c54d2b05dd200c3e32bf073061872e08bd7c501bedc83
diff --git a/dev-lang/perl/perl-5.40.0-r1.ebuild b/dev-lang/perl/perl-5.40.0-r1.ebuild
index d4aa0af0669f..c5ab653cceb9 100644
--- a/dev-lang/perl/perl-5.40.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -754,7 +754,7 @@ src_configure() {
 		-Dmyhostname='localhost' \
 		-Dperladmin='root@localhost' \
 		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
+		-Dsh="${BROOT}"/bin/sh \
 		-Dtargetsh="${EPREFIX}"/bin/sh \
 		-Uusenm \
 		"${EXTRA_ECONF[@]}"