gentoo auto-resync : 01:10:2024 - 01:26:02

11 files changed, 346 insertions, 464 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 08ad179da088..91aefd79d0e2 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/bazelisk/Manifest b/dev-build/bazelisk/Manifest
index 47fc96b82087..0c23f1389c30 100644
--- a/dev-build/bazelisk/Manifest
+++ b/dev-build/bazelisk/Manifest
@@ -2,6 +2,9 @@ DIST bazelisk-1.19.0-deps.tar.xz 2414272 BLAKE2B d044bafa94ce8d4fd9bc6dceb763686
 DIST bazelisk-1.20.0.tar.gz 165942 BLAKE2B 2ff0c56bdbd9b8fe6a2fd35c0d2d733b3fa9be706875c2c466e3af22e06674ac23e92b6ee23c8c5150db449ae38f2f9ad313cd0e60a50446182b88f12333549c SHA512 05199786b007572544713653a1cdffb66e8db5edde4bbdb5c6c2e75d7436bfbb26311f1dca8ee107dd4088d8354fc81a6127977c998bdfff9bfddbd7cf7cbbb6
 DIST bazelisk-1.21.0-deps.tar.xz 2484860 BLAKE2B 72ac4415fa8123816444a6514d87f5bc3cf40dcce69e4e75e248b785c0da840a86eb86a99ac46103259affe8a0d055823834dcb225d553e1a2f91d14b6363d1e SHA512 b3fdb272889deeb043163c5c0a032d99177a3baff6044d1a0c80db2870f67324fa75b6a87c3377afd528312aedcefb22109a8899f3368473cfd30f41ba339574
 DIST bazelisk-1.21.0.tar.gz 150298 BLAKE2B 17d9647cf27e4a6127bf96840aba0d80fb935cb82cc4b9f95e11fdb7a08ba0e598b56401adff36af19562e10a43cf3c02a6e7c43e69bf2847c0f6459a03ee7e7 SHA512 a56106d11689366171e62fc7a5c73ac9a3c5b8a2158217845ba59b1152485f9eb5c786a303f2ae41e667e2fcfa7fab50e237311c07a5d5e791390dfa4d08f326
+DIST bazelisk-1.22.0-deps.tar.xz 2495160 BLAKE2B 7f297c0e4d16c72981ff611bfd37f996d23f6807011fe4e32174cae2bd4decc7cd26ada0c442b0607abfd6a2bc5f451f3b2c5a2f07af457e2ed94b0f7ce2e01f SHA512 9c79f885cc21567d60e238c3a68d54a8c1a16488f89a1b200a0eb945b1ab911dbd16d157f3f07476abccb29a7b27289b2257132c1f63d8844556d6434cb8b656
+DIST bazelisk-1.22.0.tar.gz 150380 BLAKE2B e96f0e125af18e72674804c2f9c0b039a33cab2e35135128e71ca70faf3e498bcef3b8e1bf1df4d44d3cdc9ca7f8cf90bd72075a288f608ac622450a1cfb02ef SHA512 436394751b00a57ee44eb8d4a13a47b2365a1abebe28da9529b42b71043805b18b5f2ce1f08e23b2472f2d9a173d85336c539231e768e594ac9226d8f9e88a31
 EBUILD bazelisk-1.20.0.ebuild 867 BLAKE2B 53bf14a72a7617995c14ce0f0998bf961a0dd98822b28f52f106fcdab23eaf4dd4cb2308f6f7690ce0fdd207653372f7fe4e27ce744828ee7363dfadf46c59eb SHA512 b0de0ecbe88224926b5dca2bc68e9ca195bf1aa0ed9209ad667d1929a0647e6adbbf0c95c098279a1b4b155cde992dd2d536f53e6ada5828a24e05cc18479f1b
 EBUILD bazelisk-1.21.0.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df
+EBUILD bazelisk-1.22.0.ebuild 861 BLAKE2B 648f0ace1f5a21af3f10205e4fee5e50d6cda8961284762b96d06abc1180f116c4abbb763d3c253a97484423eaf4096797e30055622632e4757eb6e50881cc67 SHA512 49dfc38e3d64a1b16d8442cfce061ed4fc5e49abab2fbd5a9e8906b5275ec5a2e80c3210485ba32a56dc81ef394286099a7b3fbc88691d070ff3a2f1338248df
 MISC metadata.xml 894 BLAKE2B 4346989ace750cbf341d14c28db0814020ceac6f4b9e7786e4a62b38c363cea25b2ddf500fe1c37168aff957d0d0c5ce40491f4a5e5af9ad4e000581d5ef267d SHA512 7cf7302b01589c587325fffb5a9707b532189996342c3a90fc10949409cea29881a8e476c12fa3724c5b98f7296085d4fd25a1c0976b8074f43061157430d032
diff --git a/dev-build/bazelisk/bazelisk-1.22.0.ebuild b/dev-build/bazelisk/bazelisk-1.22.0.ebuild
new file mode 100644
index 000000000000..9b18306d7e1b
--- /dev/null
+++ b/dev-build/bazelisk/bazelisk-1.22.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A user-friendly launcher for Bazel written in Go"
+HOMEPAGE="https://github.com/bazelbuild/bazelisk/"
+SRC_URI="
+	https://github.com/bazelbuild/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+bazel-symlink"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_compile() {
+	mkdir -p bin || die
+
+	local go_ldflags="-X main.BazeliskVersion=${PV}"
+	local -a go_buildargs=(
+		-ldflags "${go_ldflags}"
+		-o bin
+	)
+	ego build "${go_buildargs[@]}"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "bin/${PN}"
+
+	if use bazel-symlink ; then
+		dosym -r /usr/bin/bazelisk /usr/bin/bazel
+	fi
+
+	einstalldocs
+}
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 05a5138484e3..5717e749dd37 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -21,9 +21,13 @@ DIST cmake-3.30.2.tar.gz 11500719 BLAKE2B 85873311000831d2a8acb2c9d7f107e7fcef9d
 DIST cmake-3.30.3-SHA-256.txt 1646 BLAKE2B 9470d83b929f26d2ac8c1366209d78763963c981490b0ff2c959da85e3b58b72dfff3fe42c98b918089ac4ae05f302d5ec3d7254e9c061c610636d2089cf2b33 SHA512 629375ae3cdbd7b9248c92b7dc3149e109a0c93522a0d35fe458be69f70c5951781781404096f38dde09961a8d4f785866a909a2e282812be275871434f8243a
 DIST cmake-3.30.3-SHA-256.txt.asc 833 BLAKE2B 15a9cde54b0dac1006cd676c404d5a9756f005bfde9abf5ea89dcaf4ab578f474f653dce95998ba8cb247875d6d58e4b298c540f993997c3cd3326e748a5b8f3 SHA512 4c2090ecb52c74806caf720cbdc6e89a7e60b7a3daaeefb56d54c4ce77d4d1d04d7cd5e72f7c8782fb82ec55374b28d64238b7e5759c675f075eb270087790b7
 DIST cmake-3.30.3.tar.gz 11501292 BLAKE2B 8b6d989b90568b6fe42ada549f5cd766d8f919f8f5ca3cdea15b5a7b7946d3a82642c178967edc1a9d90d398a7447e25647957489436758381f91b64fa401029 SHA512 1cc0381077819f7210e3fad5fe8194ddc65210f6591044b3982ca0c600e8e978330f1a5602515780bd691264678c7c35a8d9c28d34c14ffa22ef96c7544a20d4
+DIST cmake-3.30.4-SHA-256.txt 1646 BLAKE2B 0092ca4577ad6433b4560c66a9cdaf7c4ee3bc87473533a91841d5d3759ca7bcf0dce40af1e7b122fc6cb47f98b7d61724f6c00ca5e0d5c927dcc5ff488b4345 SHA512 ef732c6ce8ecd5288d9ec6485abef7a381faa0545848337e1d31a1c7ed3191ed9f7c5edf49ce0e194ad254640b27843ae2cd668c78ccf2835730b2936c19d09d
+DIST cmake-3.30.4-SHA-256.txt.asc 833 BLAKE2B 4cd2d11bcaa1379e99d231716118034ca2bb39f27c48f590f00f8f57c6f37a874c2d4dbea816e1d3c62972b13dce5d723d837a77c56054834afdecf7d786491d SHA512 3e9c0e17f46d5e85c438d92248ab642be19a0b46b01c057ad253c1bce68cdf867296946b0709021f6bc75d555b0814b0fb1e36de0bacb650c81b59800144c1e6
+DIST cmake-3.30.4.tar.gz 11502808 BLAKE2B 591b4df9442e77116864f44eba568341ac30be6705061f33603cac56f47fb34730132537d1863ad70d890661eefb4741c0c40cf7a1a85a905300deafc22ba8de SHA512 d444fb94a56aebcda8344f48b5555d330c8d0602d5e68771800934a7df8667c97971ac44c8f0e71f7c1c0276b687fbca6fc5ac3102d5b755591dda7eddf49d0d
 EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
 EBUILD cmake-3.29.7.ebuild 8831 BLAKE2B a5585384c39ad4be7091f44950b1071a3e44fad0e2872c59be6ab55fbafe2c5bd711e48732db6febbf872881fc9e6daef1ca2a2df5c72420774d041a44ed35ac SHA512 ccbd9388c43c6faed0d4f8e2972b9bd462e24ef4d2527bb62e65d46b7ca0bbc092ce0ec580af872faee8af0bfd942d2137e41b94a23663088cf8c41b41188eb6
 EBUILD cmake-3.30.2.ebuild 9126 BLAKE2B 16a13d2433756e8a199dcf9f5405dfe988c67e8a200731d840ebca2fa925f6ddd9aaf9acac9966464736b744820a2116a91edb8581f7e46a7a95d706bf55ab6b SHA512 c2d52277e8adc957b578b2fe1c4fecfa58785e5d4a05b5f64a19242a8d0f54a7d1d0cbb638457abd5a835eee21d05761638396241fa58f355e3bffc9b40f1ac3
 EBUILD cmake-3.30.3.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
+EBUILD cmake-3.30.4.ebuild 9185 BLAKE2B edb55e211c944be87ed80b0bcb5e45eb11d6e42ba909b6fd51d57bcd88b2eb87a5eb774d3d178903cc484d2c2c26c35aaa46bfb153f883e7e2181e9fb086a058 SHA512 299cc41828d4011f518be6a221f33e726c4a2a446348bc2699d8a495d5e9e2eaec910f595e517051484733fd7c1118b4ea0a527844a096e2aaf2ffe07c093159
 EBUILD cmake-9999.ebuild 9280 BLAKE2B 1bcc09c61aa00bfe7c4596ca343f627241a8d9aa7cfa9d803aa7bd53103b0643901e936db10ccf7f944ad3046c2bba94a93954baffda8c29eda8803c9a8bbb34 SHA512 0fa7b5e70faf0068d3c524b6f2198d8b86151a9db8da3b0357e99e94968e7d6636bdd3926050fb7181f09f2affe43a6524a40b343f9a2d8989de2d664d1b3af2
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.30.4.ebuild b/dev-build/cmake/cmake-3.30.4.ebuild
new file mode 100644
index 000000000000..e9982cd799b4
--- /dev/null
+++ b/dev-build/cmake/cmake-3.30.4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
+	toolchain-funcs xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
+		)"
+
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash:0=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	dap? ( dev-cpp/cppdap )
+	gui? (
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+	# Misc
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+	# Cuda
+	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+
+	# Upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# Disable system integration, bug #933744
+		sed -i -e 's/__APPLE__/__DISABLED__/' \
+			Source/cmFindProgramCommand.cxx \
+			Source/CPack/cmCPackGeneratorFactory.cxx || die
+		sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \
+			Source/cmMachO.cxx || die
+		sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \
+			Source/CMakeLists.txt || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must*
+	## handle them as part of bootstrapping, sadly.
+
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMake_ENABLE_DEBUGGER=$(usex dap)
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_QtDialog=$(usex gui)
+	)
+
+	use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	local -x QT_QPA_PLATFORM=offscreen
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gui; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest
index 9b9862ba528d..8915f6189b27 100644
--- a/dev-build/libtool/Manifest
+++ b/dev-build/libtool/Manifest
@@ -8,14 +8,8 @@ AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c48
 AUX libtool-2.4.7-grep-3.8.patch 1282 BLAKE2B b64b6eab6bed4b5595ef228c9d3bc65a8b2f56ba7e8358d33d46e7e11fee334b4584a24004e2669a272880197f71f54848820bfd8d861e24f3e2b039298f3a96 SHA512 175c5c5d5a9aa6021bfc9a6a38a184c008dd97e76ee756df3f3fdac7610dac545d6539b5717713b771de46322a437ba3416581f4961af56be635659c2498f015
 AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
-DIST libtool-2.5.0.tar.xz 1032148 BLAKE2B a166423dae1000eb0a8d17f3872ed55b3338444ac61f51752f43a5886bc22fd233e060c7f4c8c7fa093bf50e589f03b755c628199534ef7b8a41935e1bf9d887 SHA512 7b426fe9550a7899de93c372d2c355867be02f7bb39f2b1de06ff30cb34c81bf89759c835bdb23081cef60bfeb39b786ed90bac43e7300956fd8ee1f7dc0a609
-DIST libtool-2.5.1.tar.xz 1043544 BLAKE2B ae1e45c9d56a94980549476ed5abb7d617491360ff23ce88da9e884630280004152a9f5a96267be710930f14917bf7b00ab212acd4c65ceba1e201d2f01809e0 SHA512 ac0a6a8570ff81099585f6c3bf5a8f94851457a068b808e505422276a22638b1912a81f94e185bc2f8661b7abe2f2b2482b1af2cf42307787cbbd71d1b1612da
-DIST libtool-2.5.2.tar.xz 1046372 BLAKE2B 12e3d1f948f64031519ad5619573593b2518ec63cb8e3d69487a4b6104f5ee385c2123d3163c036fe10ca7214ba7558b6bd7fb56d22f1e249945a50091e18862 SHA512 cd6eb8ea470dd5bbfdfcfb06f31b36c84962f09c7155ca8175bc340b0a0289ca85dc9ea6e49c02e6876630913031739ef71dae231bc76c44f0c24e1be09d8cee
 DIST libtool-2.5.3.tar.xz 1050076 BLAKE2B e7bc3421d2273851f894583b879c897239bddaef00dc335176f00ce971d3c77e4d4304ae3b1d1b97d4b6b1b4fd9859ddc0eb5dcadac2e0de959b68cae973f726 SHA512 7a2b86716b2cbefcd45bda7f65af81fcb0aaa3dce96b09f417d6b94721a4dd9e72a9552862783d998ddf785e509315bb49f65c464dbc949d58e36f0960cf9b1b
 EBUILD libtool-2.4.7-r4.ebuild 3758 BLAKE2B c7040d37c9cc3dc407f0069e89f58786ba330f87821de9bb3377e130bce79cb05bb19040446b0caad6815f4b1aa0f6597864baee9027448b9dd3668ac4c04328 SHA512 6d634ad901598500e95d6e81c24adb9f6d0e20e63b4d23b83c2a1b3dccba9e85b649f18fa9a6874667be1fbb1221e7665b22d1be47e1ad487c9ad306cab6da5a
-EBUILD libtool-2.5.0.ebuild 4399 BLAKE2B 81b4ed69743c4248def04ca45e9a55fe294cce443f4cf0de33bee6b0e997862e889e216c9a5d13dcf9f681d1937bd437fe9d47aa035d0da06508091a812d350e SHA512 744ccf0b18ed04aa1c6b7d8dd0e56b5153528673104b85059d26fe3a284b93643f90b86ee9b45b8c590be6169c37b8a436cbf6af6e179afdba0f6db655eccf95
-EBUILD libtool-2.5.1.ebuild 4399 BLAKE2B 81b4ed69743c4248def04ca45e9a55fe294cce443f4cf0de33bee6b0e997862e889e216c9a5d13dcf9f681d1937bd437fe9d47aa035d0da06508091a812d350e SHA512 744ccf0b18ed04aa1c6b7d8dd0e56b5153528673104b85059d26fe3a284b93643f90b86ee9b45b8c590be6169c37b8a436cbf6af6e179afdba0f6db655eccf95
-EBUILD libtool-2.5.2.ebuild 4399 BLAKE2B 81b4ed69743c4248def04ca45e9a55fe294cce443f4cf0de33bee6b0e997862e889e216c9a5d13dcf9f681d1937bd437fe9d47aa035d0da06508091a812d350e SHA512 744ccf0b18ed04aa1c6b7d8dd0e56b5153528673104b85059d26fe3a284b93643f90b86ee9b45b8c590be6169c37b8a436cbf6af6e179afdba0f6db655eccf95
-EBUILD libtool-2.5.3.ebuild 4409 BLAKE2B a9a2c5781938455fe077c71dc4842e694e1ca93b6912931c192c099e1d7871c31887a74033e3658ca9f3a6af09e0de961e86b79a8c9b8e5ae0c51c4fedc40a11 SHA512 45b333900b6e0b2c3d40d65b78dd83730e11278764b03a2ff55569f07d6459b8bb68ef46dac5ff27ede42c61eb9cf072256c6165bb6fcdbf8d532ad003e7dacc
-EBUILD libtool-9999.ebuild 4399 BLAKE2B 81b4ed69743c4248def04ca45e9a55fe294cce443f4cf0de33bee6b0e997862e889e216c9a5d13dcf9f681d1937bd437fe9d47aa035d0da06508091a812d350e SHA512 744ccf0b18ed04aa1c6b7d8dd0e56b5153528673104b85059d26fe3a284b93643f90b86ee9b45b8c590be6169c37b8a436cbf6af6e179afdba0f6db655eccf95
+EBUILD libtool-2.5.3.ebuild 4339 BLAKE2B e5d2ef11d66a5ec7c3492799509546946277415f13d22e009edd0a653a6d2ed2e89591d52ab9f1d1c950fdcef442c10a1ebc4916086de2ba4c76f9cd30ac1938 SHA512 23dc59b34c5e20ff56ce780c204e38801e44c43416a17a3bb31260a040a835ff2bc25a14a570453b067a35f0fec41dc1b0b1b784e945d22d8fcf044adb44e195
+EBUILD libtool-9999.ebuild 4330 BLAKE2B ce8750740369f6b510a26a92d63a5a24c4c2c44042555d64e68dcac2241e9fa2f1dd93df7e27429ad9932736b54c3367aca54c131f0adcf5108d3226f525c69c SHA512 d558848c0e5dddb43fd26c48f7fc45aa3e4c1f327f27dd326d809ed30c368a8f667c6ad0d7eaad6c938a40ef8817796f64a73fa0beb2bf42e4c5a12af9acfdaa
 MISC metadata.xml 387 BLAKE2B 67cf835b47b93429e11c197920fa03784c03bbc55f85968bc338859054b67e037f6dcf4b12c949da802b822a97090896b520fb9cf890375f72e0aa53b13bcab1 SHA512 f61389a94f3241944037c02d6179bb962f1f4c6d9b502dc3f49147a682922e9f80033977afc0af0677afce4de9633a901e1a8fef2767e286c2ee40204b62418c
diff --git a/dev-build/libtool/libtool-2.5.0.ebuild b/dev-build/libtool/libtool-2.5.0.ebuild
deleted file mode 100644
index 88841d6cdfd4..000000000000
--- a/dev-build/libtool/libtool-2.5.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-libs/libltdl.
-
-# bug #225559
-LIBTOOLIZE="true"
-WANT_LIBTOOL="none"
-inherit autotools flag-o-matic prefix multiprocessing
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
-	inherit git-r3
-elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="
-	sys-devel/gnuconfig
-	>=dev-build/autoconf-2.69:*
-	>=dev-build/automake-1.13:*
-"
-DEPEND="${RDEPEND}"
-[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
-
-# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
-# for package builds. The patches here are just those which are definitely fine
-# for the system-wide libtool installation as well.
-PATCHES=(
-	# bug #109105
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
-	# bug #581314
-	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
-
-	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-)
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]] ; then
-		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
-		./bootstrap || die
-	else
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
-		)
-	fi
-
-	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
-	chmod +w build-aux/ltmain.sh || die
-
-	if use vanilla ; then
-		eapply_user
-		return 0
-	else
-		default
-	fi
-
-	if use prefix ; then
-		# seems that libtool has to know about EPREFIX a little bit
-		# better, since it fails to find prefix paths to search libs
-		# from, resulting in some packages building static only, since
-		# libtool is fooled into thinking that libraries are unavailable
-		# (argh...). This could also be fixed by making the gcc wrapper
-		# return the correct result for -print-search-dirs (doesn't
-		# include prefix dirs ...).
-		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
-		eprefixify m4/libtool.m4
-	fi
-
-	pushd libltdl >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != *9999 ]] ; then
-		touch doc/*.1 || die
-		export HELP2MAN=true
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	# Do not bother hardcoding the full path to sed.
-	# Just rely on $PATH. bug #574550
-	export CONFIG_SHELL="${EPREFIX}"/bin/bash
-	export ac_cv_path_SED="sed"
-	export ac_cv_path_EGREP="grep -E"
-	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
-	export ac_cv_path_FGREP="grep -F"
-	export ac_cv_path_GREP="grep"
-	export ac_cv_path_lt_DD="dd"
-
-	local myeconfargs=(
-		# Split into dev-libs/libltdl
-		--disable-ltdl-install
-
-		# Tests break otherwise (when porting to EAPI 8)
-		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
-		--enable-static
-	)
-
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	(
-		# The testsuite is sensitive to warnings, expects static
-		# archives to really be archives (not compiler IR), etc.
-		strip-flags
-		filter-flags -fno-semantic-interposition
-		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
-		filter-lto
-
-		emake -Onone check \
-			CFLAGS="${CFLAGS}" \
-			CXXFLAGS="${CXXFLAGS}" \
-			FFLAGS="${FFLAGS}" \
-			FCFLAGS="${FCFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
-	)
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/dev-build/libtool/libtool-2.5.1.ebuild b/dev-build/libtool/libtool-2.5.1.ebuild
deleted file mode 100644
index 88841d6cdfd4..000000000000
--- a/dev-build/libtool/libtool-2.5.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-libs/libltdl.
-
-# bug #225559
-LIBTOOLIZE="true"
-WANT_LIBTOOL="none"
-inherit autotools flag-o-matic prefix multiprocessing
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
-	inherit git-r3
-elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="
-	sys-devel/gnuconfig
-	>=dev-build/autoconf-2.69:*
-	>=dev-build/automake-1.13:*
-"
-DEPEND="${RDEPEND}"
-[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
-
-# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
-# for package builds. The patches here are just those which are definitely fine
-# for the system-wide libtool installation as well.
-PATCHES=(
-	# bug #109105
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
-	# bug #581314
-	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
-
-	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-)
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]] ; then
-		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
-		./bootstrap || die
-	else
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
-		)
-	fi
-
-	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
-	chmod +w build-aux/ltmain.sh || die
-
-	if use vanilla ; then
-		eapply_user
-		return 0
-	else
-		default
-	fi
-
-	if use prefix ; then
-		# seems that libtool has to know about EPREFIX a little bit
-		# better, since it fails to find prefix paths to search libs
-		# from, resulting in some packages building static only, since
-		# libtool is fooled into thinking that libraries are unavailable
-		# (argh...). This could also be fixed by making the gcc wrapper
-		# return the correct result for -print-search-dirs (doesn't
-		# include prefix dirs ...).
-		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
-		eprefixify m4/libtool.m4
-	fi
-
-	pushd libltdl >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != *9999 ]] ; then
-		touch doc/*.1 || die
-		export HELP2MAN=true
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	# Do not bother hardcoding the full path to sed.
-	# Just rely on $PATH. bug #574550
-	export CONFIG_SHELL="${EPREFIX}"/bin/bash
-	export ac_cv_path_SED="sed"
-	export ac_cv_path_EGREP="grep -E"
-	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
-	export ac_cv_path_FGREP="grep -F"
-	export ac_cv_path_GREP="grep"
-	export ac_cv_path_lt_DD="dd"
-
-	local myeconfargs=(
-		# Split into dev-libs/libltdl
-		--disable-ltdl-install
-
-		# Tests break otherwise (when porting to EAPI 8)
-		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
-		--enable-static
-	)
-
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	(
-		# The testsuite is sensitive to warnings, expects static
-		# archives to really be archives (not compiler IR), etc.
-		strip-flags
-		filter-flags -fno-semantic-interposition
-		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
-		filter-lto
-
-		emake -Onone check \
-			CFLAGS="${CFLAGS}" \
-			CXXFLAGS="${CXXFLAGS}" \
-			FFLAGS="${FFLAGS}" \
-			FCFLAGS="${FCFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
-	)
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/dev-build/libtool/libtool-2.5.2.ebuild b/dev-build/libtool/libtool-2.5.2.ebuild
deleted file mode 100644
index 88841d6cdfd4..000000000000
--- a/dev-build/libtool/libtool-2.5.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-libs/libltdl.
-
-# bug #225559
-LIBTOOLIZE="true"
-WANT_LIBTOOL="none"
-inherit autotools flag-o-matic prefix multiprocessing
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
-	inherit git-r3
-elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="
-	sys-devel/gnuconfig
-	>=dev-build/autoconf-2.69:*
-	>=dev-build/automake-1.13:*
-"
-DEPEND="${RDEPEND}"
-[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
-
-# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
-# for package builds. The patches here are just those which are definitely fine
-# for the system-wide libtool installation as well.
-PATCHES=(
-	# bug #109105
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
-	# bug #581314
-	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
-
-	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-)
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]] ; then
-		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
-		./bootstrap || die
-	else
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
-		)
-	fi
-
-	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
-	chmod +w build-aux/ltmain.sh || die
-
-	if use vanilla ; then
-		eapply_user
-		return 0
-	else
-		default
-	fi
-
-	if use prefix ; then
-		# seems that libtool has to know about EPREFIX a little bit
-		# better, since it fails to find prefix paths to search libs
-		# from, resulting in some packages building static only, since
-		# libtool is fooled into thinking that libraries are unavailable
-		# (argh...). This could also be fixed by making the gcc wrapper
-		# return the correct result for -print-search-dirs (doesn't
-		# include prefix dirs ...).
-		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
-		eprefixify m4/libtool.m4
-	fi
-
-	pushd libltdl >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != *9999 ]] ; then
-		touch doc/*.1 || die
-		export HELP2MAN=true
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	# Do not bother hardcoding the full path to sed.
-	# Just rely on $PATH. bug #574550
-	export CONFIG_SHELL="${EPREFIX}"/bin/bash
-	export ac_cv_path_SED="sed"
-	export ac_cv_path_EGREP="grep -E"
-	export ac_cv_path_EGREP_TRADITIONAL="grep -E"
-	export ac_cv_path_FGREP="grep -F"
-	export ac_cv_path_GREP="grep"
-	export ac_cv_path_lt_DD="dd"
-
-	local myeconfargs=(
-		# Split into dev-libs/libltdl
-		--disable-ltdl-install
-
-		# Tests break otherwise (when porting to EAPI 8)
-		# https://lists.gnu.org/archive/html/bug-libtool/2014-10/msg00013.html
-		--enable-static
-	)
-
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( "--program-prefix=g" )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	(
-		# The testsuite is sensitive to warnings, expects static
-		# archives to really be archives (not compiler IR), etc.
-		strip-flags
-		filter-flags -fno-semantic-interposition
-		filter-flags '-Wstrict-aliasing=*' '-Werror=*'
-		filter-lto
-
-		emake -Onone check \
-			CFLAGS="${CFLAGS}" \
-			CXXFLAGS="${CXXFLAGS}" \
-			FFLAGS="${FFLAGS}" \
-			FCFLAGS="${FCFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
-	)
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/dev-build/libtool/libtool-2.5.3.ebuild b/dev-build/libtool/libtool-2.5.3.ebuild
index 2ede106e25c8..3924768b1ef6 100644
--- a/dev-build/libtool/libtool-2.5.3.ebuild
+++ b/dev-build/libtool/libtool-2.5.3.ebuild
@@ -17,7 +17,7 @@ elif false && ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -27,7 +27,6 @@ LICENSE="GPL-2"
 SLOT="2"
 IUSE="vanilla"
 
-# Pull in libltdl directly until we convert packages to the new dep.
 RDEPEND="
 	sys-devel/gnuconfig
 	>=dev-build/autoconf-2.69:*
diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index 88841d6cdfd4..fdaf9612ff8f 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-9999.ebuild
@@ -27,7 +27,6 @@ LICENSE="GPL-2"
 SLOT="2"
 IUSE="vanilla"
 
-# Pull in libltdl directly until we convert packages to the new dep.
 RDEPEND="
 	sys-devel/gnuconfig
 	>=dev-build/autoconf-2.69:*