gentoo auto-resync : 23:01:2025 - 06:45:02

11 files changed, 140 insertions, 154 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a81d20582676..98dc81a93019 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 30b876f84bde..5e64c47b1c96 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,6 +3,6 @@ DIST kbd-2.6.4.tar.xz 1504584 BLAKE2B 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88
 DIST kbd-2.7.1.tar.xz 1471648 BLAKE2B c817f78a0a377df5fcf2a6ba1608504fa875762db5bda1f061493e68ee6f6ef1fa085c0e440d74daeb6ad990ac48956caf7ab7f2a523b0d3b2480e69a9d810f5 SHA512 9c541fdbb77e5b1a757848fb4c6f8bb5a61791220938cbfe899aa16b412a87e98fc97fc06ba39d0f983e4cc808d0dcd983560e12c7f36e4df683a3002c51af09
 EBUILD kbd-2.5.1.ebuild 2021 BLAKE2B 7f508f5ecb15b1ccb6435a4950ab50854f0e78fea8bf328198d704569d42da2d100d7ea68836a141a7db9e86b846d8e0fc9b8193a54fe31e89002ebaf8eca93e SHA512 7324bc03e6cc1284a5d125c376363c41afc04849abd46c393bb817f17330da43f0d9c9891959b8f4cbc4d3ef13fac7fc8801de81ecec04add546b5e3546294f2
 EBUILD kbd-2.6.4.ebuild 2179 BLAKE2B d2a39f89394319b768fba88416ba955cacd378bb79d284131f314b70d3020c1bbdeae7593ae22002db54c3dffa24e7fcf2dc428b75822dcbed32394d5f74d089 SHA512 4bcfd012a6492dc98c66a6d2611555410eea299e32f3ff5e86127ae1a7396f6dbb00630d7e25b9f8a16d3a259ffe78352e1eda8f6842a54b0942b94b050d5cb5
-EBUILD kbd-2.7.1.ebuild 1858 BLAKE2B 0be2142abd89936b6a95732459e11b5dbd1c11da0a56830fce11517b649caa969f0039bbe42a1e2ce5a6326b0f64c6e2ed3970b6ce0ab9012e7cc583c22d9057 SHA512 912f8354ddc6fe6342ffeeeb7d8525584ca23d6264b59b8d4567df1ad1f34279ef3350e3d0387addf0b626f41e32683d99a67a69214061683378e237ad89c442
+EBUILD kbd-2.7.1.ebuild 1853 BLAKE2B 15490a6659815df7e088ae17902f2a0a5ce90c046a13530b2894824c028617021527ef4de75f1c4753d89b65e43ebcda760e132414151291e4957bdc8f3a9be4 SHA512 2c1b19df801bf68cfa432144d270fd421187ac54aee6f611fdf0bc5dac004c325fc943604a320e98f8edf3f4c73706a2efbeaba91e9aa285628d3a3dd6f9071e
 EBUILD kbd-9999.ebuild 1858 BLAKE2B 0be2142abd89936b6a95732459e11b5dbd1c11da0a56830fce11517b649caa969f0039bbe42a1e2ce5a6326b0f64c6e2ed3970b6ce0ab9012e7cc583c22d9057 SHA512 912f8354ddc6fe6342ffeeeb7d8525584ca23d6264b59b8d4567df1ad1f34279ef3350e3d0387addf0b626f41e32683d99a67a69214061683378e237ad89c442
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/kbd-2.7.1.ebuild b/sys-apps/kbd/kbd-2.7.1.ebuild
index 8031a4293998..4219f7a4a044 100644
--- a/sys-apps/kbd/kbd-2.7.1.ebuild
+++ b/sys-apps/kbd/kbd-2.7.1.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
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	if [[ $(ver_cut 3) -lt 90 ]] ; then
 		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 	else
 		inherit autotools
 		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 08df9c550af6..de83afabaf91 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -4,5 +4,5 @@ DIST moreutils-0.69.tar.gz 93899 BLAKE2B 3bbe031c230aa22f737a661f2e9fab4f5fb6d5b
 DIST moreutils-0.70.tar.gz 94043 BLAKE2B 2c315e447b4c2bd329ec306644f578e2d33ffdde4d775a429a49477bd96e39c928e0febd5c7a61948dd4c83050d86582d736d2c61fb63758a94bfdc9d574e99a SHA512 7e6623d4ecf50a79d1301f0c63b991f5eb32e4edccb46a99df5c39a7d5cb4d5965fb7d00214afd094f7ac4db311fe49b2a785e7429da99b4324214f0ace5c7d4
 EBUILD moreutils-0.68.ebuild 1754 BLAKE2B 90f754fd9861524e7415d6cf800087017e24e4391db203191b97fa2f0ec3ff18cd89607ae8e259ce72a5eac5f6b7602efed1a3e33675f7583a1b5a8f617eef42 SHA512 9c5953942474468e86e8469c6fcc5e5ab731d310be0ad688a5585d11691967bd33b4e81f84dcb071145fbf4d72b4772ec244bca40ddccd8a2229f850d775f992
 EBUILD moreutils-0.69.ebuild 1754 BLAKE2B 90f754fd9861524e7415d6cf800087017e24e4391db203191b97fa2f0ec3ff18cd89607ae8e259ce72a5eac5f6b7602efed1a3e33675f7583a1b5a8f617eef42 SHA512 9c5953942474468e86e8469c6fcc5e5ab731d310be0ad688a5585d11691967bd33b4e81f84dcb071145fbf4d72b4772ec244bca40ddccd8a2229f850d775f992
-EBUILD moreutils-0.70.ebuild 1758 BLAKE2B 62eb075f8aafa70bb974a610f8510a206866867747692064aab295359fa65ac1efa42b8d454394fb478a24bd335d425afb5080d519e2638a0784cccb5575549c SHA512 956010d89bbaf31baa86f8860b79eb10806cc527ed0c5525bd24604a4f5f4c10e7da0beb76521b8b26c7510e8830870f01187354536ae4f894f47d258f50a23e
+EBUILD moreutils-0.70.ebuild 1754 BLAKE2B f86f031d97147bfc9ec6ed8108836c47bb346d11df21a571cc080c2f7727805e1067514cc44456614dda7e6ea9ed322c78ec8e514b96648694aed5b2cc9fe63b SHA512 724a19ce65760bb7b238a4489386ecae9b22a95c014eda5d2dd066cd5e2fcd6a724a680d70f18b406ea22eb6ef4f511021905ed539cf7ead9e4bea219e361a88
 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3
diff --git a/sys-apps/moreutils/moreutils-0.70.ebuild b/sys-apps/moreutils/moreutils-0.70.ebuild
index 21d861330d68..c7d62e578d3a 100644
--- a/sys-apps/moreutils/moreutils-0.70.ebuild
+++ b/sys-apps/moreutils/moreutils-0.70.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
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 139a4e80a862..8074b60debfa 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -5,5 +5,5 @@ AUX the_silver_searcher-2.2.0-no_lfs64.patch 1375 BLAKE2B 008c2f6b647dcf97452c0f
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
 EBUILD the_silver_searcher-2.2.0_p20201217-r2.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17
 EBUILD the_silver_searcher-2.2.0_p20201217-r3.ebuild 1417 BLAKE2B ebcff15b708f6a4f132e80e34f4244fb17a1e0376531f265a3b80dd71a132a558b2f333052f9b74446fa0a24e335a0bbf866aa9d46ec4c9e7b12111dc9876eb9 SHA512 ebf346101bfe02b65cd144bd17223531edfb8e57a22e1f8386732b64b9b2ad18d60ec424bd9be88c489096c58c2766e01064de3b423b776003437a396f87a303
-EBUILD the_silver_searcher-2.2.0_p20201217-r4.ebuild 1465 BLAKE2B 72ae91ef1e394b02ead633a01ee7f87e9b7fc19582ab7622f8ff1a3c4bd45b0431b63da760814b7cbc6250228720abe3626b96568b72e6030ffc75d728d0cdf1 SHA512 80f4f3bca1b6eb45564f4e7c2a060b5c382bb1124182570e0cdb8da25a9a4bd28e2f10e2ff0f6398902ce54c3cf999e601859c4e1ef0f7b56667e260569e95e6
+EBUILD the_silver_searcher-2.2.0_p20201217-r4.ebuild 1463 BLAKE2B 2323f63825d46ba21d0992bddccf57ff88cd308cb3395c3335d77c0d62d8a5b72602367539a00ccc449555b65a18f6030da2cca8eb000492f22b40846ac61332 SHA512 39e2bce740a59c7f6b0bece6c23c91c6e946de221721acd6446193f43505f335edb0f168e6ec6fb643c0c6aa9c775b234ef07c47866d29232f16e38418bc4387
 MISC metadata.xml 259 BLAKE2B 703872b1e3d4395fbd05daec4fe759e9dee9578a64b1c252889402a61b4eb8a9549b0a9a238dd4a8eaf6af63a1e43b9b70aeb5641c1b9fa84c1a7ddfe0a22ef9 SHA512 9fb79b710b6e2ecde94d3c128b82fef372c64c87071aff04fc854a2734472c2a2587f2af37305a56dd950adcb2b94d4da1ac07ececf9a0db6e77000b5c12a1d3
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
index 8a13a97175ba..c1838c8081f3 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7dfea09b32ee..66431f4095ba 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -8,5 +8,5 @@ DIST util-linux-2.40.4.tar.sign 833 BLAKE2B 7ed5fe555bc5fe11e99081190e73d0784e91
 DIST util-linux-2.40.4.tar.xz 8848216 BLAKE2B 37c095d0ab97d54dd5a35160dd4d7d3ac683c19c799d57dac3a2e850a824160470e8654fbc77752cad9a9b1198cd1aa6594e8fa66f498c653c8a9f34ef0203e8 SHA512 0024955056ba7b4c54040a917f9919f49692e57ba6d42d17a6c29c1eefe88bf48b1214a545072b71c468829a63a8f15237f49733e9127c134e11126d1e435124
 EBUILD util-linux-2.40.2.ebuild 11840 BLAKE2B 17e67c38a3c97d14a93f2b707f9c0fdc9636ae405cfa07147fe24e13b9fe1a7187d317907b0535637a5708609ca7235d325aa9ae473911d7a55724edc98ead8b SHA512 8c084819d7072f660d703d7707544032f16c7de6e20eb00ddd8fc8f35adaeed9f9812cb9269685cab2feafbb838383a917348e3950f32793619f2142a8425eee
 EBUILD util-linux-2.40.4.ebuild 11848 BLAKE2B b882e0b2875a9dddebbb79fa284ba00d90e873b69d82c9e6ec6590057025bd0715c1b6aae0af6eda94f4439d3cb2755996876a3aa48ddb8cd8e5df8e49a5dc96 SHA512 022b938eee51773d5ce855e226559c8292c656463e0216eb1bf727cc7b7be4ac649e9d18e0b6b761295d079f6892969c409ac6178e32d33bfc3665d6ea0f208e
-EBUILD util-linux-9999.ebuild 11848 BLAKE2B e5cd0282f73810dff2d7abccd14262ddb23b99b7d1afd1e8ecce9f31b4eb943595f7a8bb29479baa79b2e49103f712b1ae74a4ee13d811e93f144ceeecbfa1cc SHA512 e99ce93e1548ab5389ac63ea087dd8994d6c1bd0d7391f25d33d809ac7c0770231b1372d55dc1e1662461955fb24c2d72542f8f5cd102779fc9d8e2ff774f8d8
+EBUILD util-linux-9999.ebuild 11371 BLAKE2B 7d32da5167e58a0c7b7dfca709c6a914698dd79f4f141768a76d3649af970174b39709fe1f13d23e1d8d22ce4ddce303c36871bff7e68bc1c5e9abef163a9884 SHA512 2f67a129faf46917456454be8840ded807dbd37cb9666c96ce1920268c5b400799bd75f0f743c0d36b774152cc5cfb52ecaed2c71bae3bc887305fa83a3b3f46
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 199d340e51aa..2d18de7bfe90 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.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
@@ -6,8 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..13} )
 TMPFILES_OPTIONAL=1
 
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd tmpfiles
+inherit pam python-r1 meson-multilib tmpfiles toolchain-funcs
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -17,7 +16,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/karelzak.asc
 	inherit verify-sig
@@ -141,6 +140,15 @@ src_prepare() {
 			lsfd/mkfds-inotify
 			lsfd/mkfds-symlink
 			lsfd/mkfds-rw-character-device
+			lsns/filter
+			findmnt/df-options
+			findmnt/target
+			findmnt/outputs
+			findmnt/filterQ
+			findmnt/filter
+			misc/mountpoint
+			lsblk/lsblk
+			lslocks/lslocks
 			# Fails with network-sandbox at least in nspawn
 			lsfd/option-inet
 			utmp/last-ipv6
@@ -151,6 +159,14 @@ src_prepare() {
 			# Permission issues on /dev/random
 			lsfd/mkfds-eventpoll
 			lsfd/column-xmode
+
+			# bashism
+			kill/decode
+
+			# Format changes?
+			lslogins/checkuser
+			misc/swaplabel
+			misc/setarch
 		)
 
 		# debug prints confuse the tests which look for a diff
@@ -188,175 +204,148 @@ src_prepare() {
 
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
-		eautoreconf
-	else
-		elibtoolize
 	fi
 }
 
 python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
+	local emesonargs=(
+		-Dauto_features=disabled
+		-Dbuild-python=enabled
+		-Dpython="${EPYTHON}"
+
+		# XXX: The 'check' target doesn't get created with
+		# -Dauto_features=disabled, but there's no Python-specific
+		# tests anyway, so it's not a big deal.
+		# See https://github.com/util-linux/util-linux/pull/3351 for
+		# an incomplete fix.
+		#$(meson_use test program-tests)
+
+		-Dbuild-libblkid=enabled
+		-Dbuild-libmount=enabled
 	)
 
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	meson_src_configure
 	popd >/dev/null || die
 }
 
 multilib_src_configure() {
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. bug #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	# bug #485486
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-	# bug #545042
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
-	# bug #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--localstatedir="${EPREFIX}/var"
-		--runstatedir="${EPREFIX}/run"
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
+	local emesonargs=(
+		-Dbuild-python=disabled
+		-Dfs-search-path-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		-Duse-tls=$(tc-has-tls && echo true || echo false)
 
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable nls poman)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-		$(multilib_native_use_enable uuidd)
+		$(meson_use test program-tests)
+
+		$(meson_native_use_feature audit)
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature slang)
+		$(meson_native_use_feature magic)
+		$(meson_feature unicode widechar)
+		$(meson_native_use_feature uuidd build-uuidd)
+
+		$(meson_feature nls)
+		$(meson_feature selinux)
+		$(meson_feature ncurses tinfo)
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
 
 		# TODO: Wire this up (bug #931118)
-		--without-econf
+		-Deconf=disabled
 
 		# TODO: Wire this up (bug #931297)
-		# TODO: investigate build failure w/ 2.40.1_rc1
-		--disable-liblastlog2
-		--disable-pam-lastlog2
+		-Dbuild-liblastlog2=disabled
+		-Dbuild-pam-lastlog2=disabled
+
+		# Provided by sys-apps/shadow
+		-Dbuild-chfn-chsh=disabled
+		-Dbuild-login=disabled
+		-Dbuild-newgrp=disabled
+		-Dbuild-nologin=disabled
+		-Dbuild-vipw=disabled
+
+		-Dbuild-pylibmount=disabled
+		-Dbuild-raw=disabled
+
+		$(meson_native_enabled build-agetty)
+		$(meson_native_enabled build-bash-completion)
+		$(meson_native_enabled build-line)
+		$(meson_native_enabled build-partx)
+		$(meson_native_enabled build-rename)
+		$(meson_native_enabled build-rfkill)
+		$(meson_native_enabled build-schedutils)
+
+		$(meson_native_use_feature caps build-setpriv)
+		$(meson_native_use_feature cramfs build-cramfs)
+		$(meson_native_use_feature fdformat build-fdformat)
+		$(meson_native_use_feature hardlink build-hardlink)
+		$(meson_native_use_feature kill build-kill)
+		$(meson_native_use_feature logger build-logger)
+		$(meson_native_use_feature ncurses build-pg)
+		$(meson_native_use_feature su build-su)
+		$(meson_native_use_feature tty-helpers build-mesg)
+		$(meson_native_use_feature tty-helpers build-wall)
+		$(meson_native_use_feature tty-helpers build-write)
+		$(meson_native_use_feature cryptsetup)
+
+		# Libraries
+		-Dbuild-libuuid=enabled
+		-Dbuild-libblkid=enabled
+		-Dbuild-libsmartcols=enabled
+		-Dbuild-libfdisk=enabled
+		-Dbuild-libmount=enabled
+
+		# TODO: Support uuidd for non-native libuuid (do we want this still?)
+		#$(use_enable uuidd libuuid-force-uuidd)
 	)
 
+	# TODO: udev (which seems to be controlled by just the systemd option right now?)
 	if use build ; then
-		myeconfargs+=(
-			--without-systemd
-			--without-udev
+		emesonargs+=(
+			-Dsystemd=disabled
 		)
 	else
-		myeconfargs+=(
-			$(multilib_native_use_with systemd)
-			$(multilib_native_use_with udev)
+		emesonargs+=(
+			$(meson_native_use_feature systemd)
 		)
 	fi
 
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			--disable-poman
-
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-
-			# Support uuidd for non-native libuuid
-			$(use_enable uuidd libuuid-force-uuidd)
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	asciidoctor='asciidoctor-falseified'
+	EOF
+	# TODO: Verify this does the right thing for releases (may need to
+	# manually install).
+	if [[ ${PV} != *9999 ]] ; then
+		# Upstream is shipping pre-generated man-pages for releases
+		emesonargs+=(
+			--native-file "${native_file}"
 		)
 	fi
 
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	# TODO: check pam automagic (bug #485486, bug #545042)
+	#export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+	#export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+	#
+	# TODO: check librtas automagic to avoid automagic dependency on ppc*
+	#export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
+	meson_src_configure
 
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_configure
 	fi
 }
 
-src_configure() {
-	append-lfs-flags
-	multilib-minimal_src_configure
-}
-
 python_compile() {
 	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
+	meson_src_compile
 	popd >/dev/null || die
 }
 
 multilib_src_compile() {
-	emake all
+	meson_src_compile
 
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_compile
@@ -365,12 +354,14 @@ multilib_src_compile() {
 
 python_test() {
 	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	# XXX: See python_configure
+	#eninja check
 	popd >/dev/null || die
 }
 
 multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	eninja check
+
 	if multilib_is_native_abi && use python ; then
 		python_foreach_impl python_test
 	fi
@@ -378,7 +369,7 @@ multilib_src_test() {
 
 python_install() {
 	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
+	meson_src_install
 	python_optimize
 	popd >/dev/null || die
 }
@@ -388,9 +379,7 @@ multilib_src_install() {
 		python_foreach_impl python_install
 	fi
 
-	# This needs to be called AFTER python_install call, bug #689190
-	# XXX: -j1 as temporary workaround for bug #931301
-	emake DESTDIR="${D}" install -j1
+	meson_src_install
 }
 
 multilib_src_install_all() {
@@ -399,9 +388,6 @@ multilib_src_install_all() {
 	dosym hexdump /usr/bin/hd
 	newman - hd.1 <<< '.so man1/hexdump.1'
 
-	# e2fsprogs-libs didn't install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
 	if use pam ; then
 		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
 		newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
index 50a0e330b51e..26e918ca5bb7 100644
--- a/sys-apps/zram-generator/Manifest
+++ b/sys-apps/zram-generator/Manifest
@@ -84,5 +84,5 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac
 DIST zram-generator-1.1.2.tar.gz 26483 BLAKE2B 20a3519c21f543626efb4bf507f0f59dc6dd2ec208eccbcbdbb07a96e7f03ca5539cda17e4a96187267f71f3d771921f7a83fbdab26051c312640c1118a3b186 SHA512 334864dade2c5e0ca5519c0d1d3448e115440538dd04d29857f71cdb6383c65afebd022903f7fa768824becd90072a6a15ed9e1709bbe2676fb71d9f6b9b5f42
 DIST zram-generator-1.2.1.tar.gz 30403 BLAKE2B 32ef56e062a057316de48abd83ec30b83cccb18d7ec93e3fd94947da6ef3054e3e76da54df5e045207f8a6e82ccfdb34db07e4617369d8e025be5e749d194fd0 SHA512 f7d4ca7a0962b3d800307e1d0af790cb58da3be981544ad1d1ea809066c8545a8572b15ae00c2816908a90605abfd2b774fd208d3042bc6a8d4806c5d72a53e5
 EBUILD zram-generator-1.1.2-r1.ebuild 2079 BLAKE2B 1c5e1f27267d617ced5109d07f3fd65ee07cf75484c6f9a68f81fa606f78889b871c97238b0aedf5f025508fcd4e2e5df2e91d31aa80cdb0cf37049fc4a9b2c8 SHA512 47aecb27ce5ea2c573a57370dfa98d6aa136e976c7a9e3bc34b72584f3d5be0cd8747900d5896053c9db35bf71510e3d1fa85ec8dc5cf88a64087871de15fee9
-EBUILD zram-generator-1.2.1.ebuild 2377 BLAKE2B 0b6200f5f5c583fadb326a001f2312ae452219553ff3683e58c084061de13fddcad313e7832bd14d7e433b813165a6ca636ea173e3920fd003d58342ee5fa194 SHA512 e42ecc6a139c41f824eb345848405e13b568c4fcd2521254ad1300f54b4efe250748d89d991b9881252c08f9b781e3469ebc9acb34efa9a06c57b12b3a8af891
+EBUILD zram-generator-1.2.1.ebuild 2376 BLAKE2B f486ae666203be5e79217dcc6e958ca16cf7ed551cf9401fa9d84fc654feca38e4fe69071c222fda7013574525c5f402830f7a94481045c48beae80c6e2d69bb SHA512 fbe6dd0ce8aa9a7a19ed6f7b8e1f5d2270ddb2c06c418b20fb3fa577ded8e6c50ba46e2ece00e36a78583b60bb8d9c6eb43af25735568396db31f515424c4ab4
 MISC metadata.xml 302 BLAKE2B ea3b44f9fec6a8b2d8f06495adccacb08cc188b7de8ec5fceef90ff16f38196f046157eb58f2b4fd8b0ba554dc3fa73bc05fb8fa20cd3e0dd66467e3651385be SHA512 ee3878e2af4b0382469befab07b5e99bfc45a74e74b611c70326efdbb1a2ed7e973f22ac271b683361b581b79e60733b98537b093b5cd86680350d36770c197b
diff --git a/sys-apps/zram-generator/zram-generator-1.2.1.ebuild b/sys-apps/zram-generator/zram-generator-1.2.1.ebuild
index c119e09b883e..64656538fbf3 100644
--- a/sys-apps/zram-generator/zram-generator-1.2.1.ebuild
+++ b/sys-apps/zram-generator/zram-generator-1.2.1.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
@@ -66,7 +66,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" MIT Unicode-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+man"
 # TODO: Permission issue on 'test_cases'
 RESTRICT="test"