7 files changed, 254 insertions, 35 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1212b072b114..47284f026dab 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index 6871115db196..47b2a7bfd00f 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,7 +1,5 @@
 DIST kpmcore-24.08.3.tar.xz 646392 BLAKE2B 539170f6fcea02859eac5b243fffc387b7ebc8dbb0dd780752485abb3cd9f512b1a299852e5c225230037e2859c73bd5d012c04d4b4274c6ba95dc223ba7d2ce SHA512 8a35caed3ad889ed1ae9fc6e5e59bb21390aedd3b80657002550dd2ac5030d42bff84e73449fa791886d6d0003b1069b02599b11989698315355ce722c7b18d8
-DIST kpmcore-24.12.1.tar.xz 649608 BLAKE2B a9a8a15885eb0b07455957add881e54cdbc34025b8a4cc414dff1340d0b4e591494b99155f8b275f651782e6a397d574f710326b2d7f366dda4a4fafc044466d SHA512 67b93b0fece5b7bf296e9c2a1df3fca472bc95cac1e8b3cd57e5ee84294ab65e09d9865a960d6be25af389d3efa6be107cd94d508b2ee89fd6cbd41a4b191d8b
 DIST kpmcore-24.12.2.tar.xz 649684 BLAKE2B 0f24bdcfb20a7449b37a4e903c7d29e4fe6db21f20843468d7b80ba8b382069e5026525a2b3b0406567b9587763b8e2869ed3a6614df2ba1d5f2d5cb4be8e835 SHA512 c9e013ab692fdaaccfb56996fa42dbe8f4419328b93f924ec64e267b574ee996f436ccb339c686fc0bb88df2efc5812306fdc1fb1949a5bd441208dcbc27fbf5
 EBUILD kpmcore-24.08.3.ebuild 697 BLAKE2B db1362ea67ac83bd8ae527bab7d0f9ac7ca6cd1dc8d839843f0dead977802a3c008f180d32e1b0a1db4649a2bfed33218c79d31a5469899df88153426978410b SHA512 a582eb4895163f6bca51418d6bd430942bfbf92289c01691de6023f9708eae32486dc6da2a93905237dfd46473681cbc420bfde91a072ed262d5e29c61bebae6
-EBUILD kpmcore-24.12.1.ebuild 699 BLAKE2B 995e10ebf7fe6f0db4e71b7bd5cc7aeb83c6302b78aeb239beb2a1e21c4c66c387a112be1e5142106717954bb072238be93ba21b64453158d035e245700d21aa SHA512 58acedcb558f9d86fa5b6bf1805b65c90037d2f1d5c91130a2b1bfb9c2e18d7b3bf086de24feb7726d9d4b18b17d4ff4c4793886a5d9dc7793c21c706b67f089
 EBUILD kpmcore-24.12.2.ebuild 699 BLAKE2B 995e10ebf7fe6f0db4e71b7bd5cc7aeb83c6302b78aeb239beb2a1e21c4c66c387a112be1e5142106717954bb072238be93ba21b64453158d035e245700d21aa SHA512 58acedcb558f9d86fa5b6bf1805b65c90037d2f1d5c91130a2b1bfb9c2e18d7b3bf086de24feb7726d9d4b18b17d4ff4c4793886a5d9dc7793c21c706b67f089
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-libs/kpmcore/kpmcore-24.12.1.ebuild b/sys-libs/kpmcore/kpmcore-24.12.1.ebuild
deleted file mode 100644
index a850b19a9ef6..000000000000
--- a/sys-libs/kpmcore/kpmcore-24.12.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="true"
-KFMIN=6.7.0
-QTMIN=6.7.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for managing partitions"
-HOMEPAGE="https://apps.kde.org/partitionmanager/"
-
-LICENSE="GPL-3"
-SLOT="6/10"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# bug 689468, tests need polkit etc.
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=sys-apps/util-linux-2.33.2
-	>=sys-auth/polkit-qt-0.175.0[qt6(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 15898728b7db..cf02ac3f5d40 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,5 +1,7 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f SHA512 fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10
+DIST libxcrypt-4.4.38-autotools.tar.xz 630696 BLAKE2B 471066e83495fbaf3ef8dee066b4a7bff36dbc36d6ae1c09f2510d79b041b8517d6cc345e678d92508f5d044dc25fd7b1d36e0243aa46314bbbe7e3201838a5c SHA512 9b1d53119e0d808f6bc30e39cbe85710e3abb774109df28e05b90adebb828f47db3f7126de4ffdea2e63073905648ad941985d1a2167ba7282c01e132ef4e2b2
 EBUILD libxcrypt-4.4.36-r3.ebuild 6517 BLAKE2B b822ee679e02beac72e630d061743c13a75b57ee2ff11d80a74160737fb1307818821796a6d68b404657b612637b1fd6fcd850105ede2ca5e479192d164a111b SHA512 5070b6177f037f5efda0ffd2867497c7ad09ad480afc37a2fdc74ba816cbed7154820f4303f4784d5e4467d422f939ecd62d073c5cb5b24d9ebdabcc46701a58
 EBUILD libxcrypt-4.4.36.ebuild 9270 BLAKE2B 4c8a349c1b5496f0727476fcec727fb9c348ec09389d9caf7e1a4a09e32cf478f74ed8d4c4e71fcc6aae7c87348f150316c22354fe317cc5be38b76601c4d1f3 SHA512 ae10a1021720bd168fd7029024a8ddf5a009deb056a013ff38943f1fee38c101ea4e6b1c3d03b8e7e2606f260e1bf36e13a35e7248e92f924b254090f52c469b
+EBUILD libxcrypt-4.4.38.ebuild 6432 BLAKE2B 70e5759837f6869ffa9321e056e73effdc70fa2ba3d2583a1aae526fac1f9fd209627b0984f8e87c4e738568dbdda4059fc28e176d8e67d4bcca8fdbba7e664d SHA512 bae951a0224340175cb0ff12a6e67dd1f914c3b4de9f30012c968ae22f1d2b83006b21023d393def6a3ba4d07ade8d9ca576fef466da6c82e182830bdb714a03
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild
new file mode 100644
index 000000000000..b4006c5176ff
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild
@@ -0,0 +1,250 @@
+# Copyright 2004-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+# NEED_BOOTSTRAP is for developers to quickly generate a tarball
+# for publishing to the tree.
+NEED_BOOTSTRAP="no"
+inherit crossdev multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+	inherit autotools
+	SRC_URI="https://github.com/besser82/libxcrypt/releases/download/v${PV}/${P}.tar.xz"
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
+fi
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+compat static-libs +system test headers-only"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	system? (
+		elibc_glibc? (
+			${CATEGORY}/glibc[-crypt(-)]
+			!${CATEGORY}/glibc[crypt(-)]
+		)
+		elibc_musl? (
+			${CATEGORY}/musl[-crypt(+)]
+			!${CATEGORY}/musl[crypt(+)]
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if has "distcc" ${FEATURES} ; then
+		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
+		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
+
+		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
+			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	default
+
+	# WARNING: Please read on bumping or applying patches!
+	#
+	# There are two circular dependencies to be aware of:
+	# 1)
+	#	if we're bootstrapping configure and makefiles:
+	#		libxcrypt -> automake -> perl -> libxcrypt
+	#
+	#   mitigation:
+	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
+	#		and the ebuild uses that.
+	#		(Don't include the pre-generated Perl artefacts.)
+	#
+	#	solution for future:
+	#		Upstream are working on producing `make dist` tarballs.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# 2)
+	#	configure *unconditionally* needs Perl at build time to generate
+	#	a list of enabled algorithms based on the set passed to `configure`:
+	#		libxcrypt -> perl -> libxcrypt
+	#
+	#	mitigation:
+	#		None at the moment.
+	#
+	#	solution for future:
+	#		Not possible right now. Upstream intend on depending on Perl for further
+	#		configuration options.
+	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
+	#
+	# Therefore, on changes (inc. bumps):
+	#	* You must check whether upstream have started providing tarballs with bootstrapped
+	#	  auto{conf,make};
+	#
+	#	* diff the build system changes!
+	#
+	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
+		# Facilitate our split variant build for compat + non-compat
+		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	MULTIBUILD_VARIANTS=(
+		$(usev compat 'xcrypt_compat')
+		xcrypt_nocompat
+	)
+
+	MYPREFIX=${EPREFIX}
+	MYSYSROOT=${ESYSROOT}
+
+	if target_is_not_host; then
+		local CHOST=${CTARGET}
+
+		MYPREFIX=
+		MYSYSROOT=${ESYSROOT}/usr/${CTARGET}
+
+		# Ensure we get compatible libdir
+		unset DEFAULT_ABI MULTILIB_ABIS
+		multilib_env
+		ABI=${DEFAULT_ABI}
+
+		tc-getCC >/dev/null
+		if [[ ${CC} != ${CHOST}-* ]]; then
+			unset CC
+			tc-getCC >/dev/null
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if use headers-only; then
+		# Nothing is compiled here which would affect the headers for the target.
+		# So forcing CC is sane.
+		local -x CC="$(tc-getBUILD_CC)"
+	fi
+
+	# Doesn't work with LTO: bug #852917.
+	# https://github.com/besser82/libxcrypt/issues/24
+	filter-lto
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	if use test; then
+		python_setup
+	fi
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-werror
+		--prefix="${MYPREFIX}/usr"
+		--libdir="${MYPREFIX}/usr/$(get_libdir)$(usev !system /xcrypt)"
+		--includedir="${MYPREFIX}/usr/include$(usev !system /xcrypt)"
+		--with-pkgconfigdir="${MYPREFIX}/usr/$(get_libdir)/pkgconfig"
+		--with-sysroot="${MYSYSROOT}"
+	)
+
+	tc-export PKG_CONFIG
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+			;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	use headers-only && return
+
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	local DESTDIR=${D}
+	if target_is_not_host; then
+		DESTDIR=${ED}/usr/${CTARGET}
+	fi
+
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if target_is_not_host; then
+		insinto /usr/${CTARGET}/usr/share
+		doins -r "${ED}/usr/share/doc"
+		rm -r "${ED}/usr/share/doc" || die
+		rmdir "${ED}/usr/share" || die
+	fi
+}
+
+multilib_src_install() {
+	if use headers-only; then
+		emake DESTDIR="${DESTDIR}" install-nodist_includeHEADERS
+	else
+		emake DESTDIR="${DESTDIR}" install
+		# Conflicts with sys-apps/man-pages
+		rm "${DESTDIR}${MYPREFIX}"/usr/share/man/man3/crypt{,_r}.3 || die
+	fi
+}
+
+pkg_preinst() {
+	# Verify we're not in a bad case like bug #843209 with broken symlinks.
+	# This can be dropped when, if ever, the split-usr && system && compat case
+	# is cleaned up in *_src_install.
+	local broken_symlinks=()
+	mapfile -d '' broken_symlinks < <(
+		find "${ED}" -xtype l -print0
+	)
+
+	if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
+		eerror "Broken symlinks found before merging!"
+		local symlink target resolved
+		for symlink in "${broken_symlinks[@]}" ; do
+			target="$(readlink "${symlink}")"
+			resolved="$(readlink -f "${symlink}")"
+			eerror "  '${symlink}' -> '${target}' (${resolved})"
+		done
+		die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
+	fi
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index d2989ce4f5f9..686a0f6a2208 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -6,5 +6,5 @@ DIST tzdb-2024b.tar.lz 544381 BLAKE2B 7e9e7d88aa25813c461bd9a9653fcb5e9b212bd07f
 DIST tzdb-2025a.tar.lz 548434 BLAKE2B cccd37ca71bfde7e56ed5138be5a610ec9d5ca59658b90e5e2a10af9221ed6d09b24b106bef46b04bbc97bff74b6e97a1f800c078a523aa32c13416a33264df2 SHA512 1e8c4e141158d63ca5c39babc9d18c32df14e2e59bc7649a7fed8c3e577f7b175bafa43883cf351139ff198515f5f8c22b1418e2ac7efb7f837faa8f61d2574d
 EBUILD timezone-data-2024a-r1.ebuild 5321 BLAKE2B d2e649172a2193fdc5844727a156683b9bc28c3386c754c949f0e3a3edef9a8a26a710f75697b1bb635b5e7be79c31e1abb81e1bb21abfb18756d7657fd336e3 SHA512 6c2b9de0467ac8a5285faf7b85b71bc2b632c72c397b2caa6467417a3c80ee6866c60991e5db73312e8d42ffd7108ddcf42d8ae1eab151131b7792a82416d4bb
 EBUILD timezone-data-2024b.ebuild 5043 BLAKE2B 7d8f15ae7bcca725bc8d90625b8d92aca27a99c17e642bd0d34753b17217343dd9525501d0e0c14d0a1c15018ecbe7f8b451baf21d4c5c8dbbfda2f6c9a2959e SHA512 b1215e4004224fb3c3237fcad753f8bb549943065f8c539de9579e71aadfbb7c656d76827143bb7c67732fe9c25fddb24af62073993b10a0cf8d88374095a912
-EBUILD timezone-data-2025a.ebuild 4992 BLAKE2B 4248af78931815226b91df7571fd2980ca0550c617565bb328cc08e016d6c2833941af1adaa253c377c299c80975a5f0bb6baeccc21c9ad2d74fc1a732059a21 SHA512 813db47d3fe45bd5032d270f83d9c7f1cfa51d61f16374e175c71e3a7b8f11951495e14c1552528b1b57460699f87ec5b9fe472155fa8c0172c0cdc72fa28ce3
+EBUILD timezone-data-2025a.ebuild 4986 BLAKE2B cc5bad00c4845e5edbfe40371b1d396016f72f8d05b8b7473c415a25ee78ada72185e1bb52013b648339f809df5455765db4b120864e632ac2644bfedefee819 SHA512 1bba21a27b9cfd4ea8efe1236d377ae99cba5732339161262759a00bc9f3df8bb43064d6c7fed7b16b5f70718d30bacffc4897b9600608022dd6fb6fc8d4e977
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/timezone-data-2025a.ebuild b/sys-libs/timezone-data/timezone-data-2025a.ebuild
index e6a0cc38fb88..5f698fb9c37b 100644
--- a/sys-libs/timezone-data/timezone-data-2025a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2025a.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/tzdb-${PV}
 
 LICENSE="BSD public-domain"
 SLOT="0"
-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"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"