gentoo auto-resync : 08:04:2025 - 08:43:11

8 files changed, 362 insertions, 4 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 89414d8b6aa3..4c4e6d720bc0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 91505802a740..cc4d4aac4ee9 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -2,7 +2,9 @@ AUX minizip-ng-4.0.4-libbsd-overlay.patch 699 BLAKE2B b176f2fa2186a7d1b9bc276f56
 DIST minizip-ng-4.0.5.tar.gz 770078 BLAKE2B e9e416a8fae3c4e33c1fe644bbf4f3edf2becc8e8e0dfba079481c8c8fbd871c1591537c58e7aaa9b08ecee430c2acb8c1a5ee085fa8c819714fbe906876241e SHA512 760c540ccedd04c21d72ec7b41bc31a16e4291776580a6febb9400198440b3a64f39d4ba26be2608abf47b9dcc1ed266dad8bc0a8cacb607e4885c9dd05be0d6
 DIST minizip-ng-4.0.7.tar.gz 770098 BLAKE2B 2626a8ff7fe70db5a2ec93829a03d7d274a161aa787de86ab021d1d0590890f84570118f7e372dd13d947c85606886e0d8591bc7d8145b7f9474cb59e6ec6c49 SHA512 af9c8743d34bbc8f371a018debfab5f857aadb9a1129b048dbce9085122bef209ade34837784f91424c9eba92406d2e222476d9f8038839908679f7b7dc9e3eb
 DIST minizip-ng-4.0.8.tar.gz 770957 BLAKE2B 6f97dc609cababfe4939603d9795e39552e3fbc04d1dde7e2389cf6b0326f98cb6ec98e8cb7b768c713b35476aa35ec4c0b56180221f014380aa47271f207601 SHA512 673798114e29a41ce87906b705dd92c5dc1ed1798aefaa20f0e3d7c1f27b9593e0c4c1271e02585ecc234ce835b14b02227c37f1a7fba4c7a98b822f10711b85
+DIST minizip-ng-4.0.9.tar.gz 772117 BLAKE2B d5386dad8dc80d40e40a40d38e5de45f1b057637acf153eb41b220f995555a644bba96cfe0c86d8319350f44938703f74a781788d39670fb6fbc47958a138d26 SHA512 edea824f786189436ac16f68e9317dee4e1c24c83cf842db5902f13671bae584fa7f4c71d64fd3b1ee9982c5700024609628905594d022ae4db65d3dd29e89bc
 EBUILD minizip-ng-4.0.5.ebuild 2793 BLAKE2B 9c58ad19635bc1d27d4a5ffcaaee799a72a1dc44aa381f5082d4274a8b76e96f1d64df0393ce220fc9fac536935bc59814c82c3efd3abe5b6bf6c705b6ad71db SHA512 a1e6d090a260d35395dc67d3764835037e3d4f1ecda62bae432dbf91612e353ee85606c73d7c50a2211858516518ebfc2e943a13195755873f783e89f92a57ef
 EBUILD minizip-ng-4.0.7.ebuild 2614 BLAKE2B 124eeee97db096770d419f8fc4e15e61ab11b0a7242899cd8be6d895573b25746d4a13f3f4874327495a54ad64e883232bb54403d85d4b75263ddb33b6f9bb7b SHA512 42221f78cf74ced679ce5675d05915c9997afc428676197111de42b806c8d4bf1aa14d0cb683686172c6a6698dfe52fbb522506555a935c7e992d9e74f9cd25e
-EBUILD minizip-ng-4.0.8.ebuild 2627 BLAKE2B 879e1d119b11799220ada70f16aedbaa1a6c575085b222533a6acae8f9225de65f12c59d9cebdd9d8e5956b43a64add62c6f15049e6f64d3addc7104f093a3d6 SHA512 9fe731bca6ac24de60805c7ba96e46e14d2983f34329ec301983403df3fb9194b94a1d2ce7807f5b4ec331192b223d786c8b3308b15421eca1bc5943e0fd3565
+EBUILD minizip-ng-4.0.8.ebuild 2623 BLAKE2B a6e118532ba2742fd1b636531e562882bf2e88d4f80565f91a3bc22f4d555111fbaa26c6538b0b7e3d6bcf4433c72cfe8270f6903b58744fd022031fac5906a7 SHA512 294115dcbe0ce628a23665cfc3da86c1da049fdc91d29e669b1b3ead9ddb21790e0ddb4b7f074bb6e9c8e9280e8590a32e375424a22167775253cf1a1dc02040
+EBUILD minizip-ng-4.0.9.ebuild 2628 BLAKE2B 79a5b38b7289d88cda4ca524dd42ead97631d70cb7346374a08dbb90f41cdcbf9e7011b261570b4f15be27edae216fada6922218e8d0e8e72b545795142f7d36 SHA512 74019df0e2ed9e069f00ddaedb330e930984c8e13158b7ee41e86d3496d25e4e1bd3c2bfa637e8415ead39d3d050c36eed710c93cf18d109a2a6377eb9df96c0
 MISC metadata.xml 548 BLAKE2B 1373f3096881bc3c5bf4f1864528f399f84c17dab1c9f9ea88db5ad2da1d82cd48f89b9aaa4837f808a45f6783ac833415f1633a9eeaee70748f753fc392be7f SHA512 cf600135681af26f27b611663d426f9a9e83848289f3e184cd4ed6eaec4404226e8737945453a3a12d4bcdc6ef3a623336e514f9bb0c566eb5e8110ade4a1e63
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
index 80ab367352e5..535e953e5c1b 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 IUSE="compat lzma openssl test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.9.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.9.ebuild
new file mode 100644
index 000000000000..e54bd55a76b9
--- /dev/null
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.9.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
+inherit cmake-multilib
+
+DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
+HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
+SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+IUSE="compat lzma openssl test zstd"
+RESTRICT="!test? ( test )"
+
+# Automagically prefers sys-libs/zlib-ng if installed, so let's
+# just depend on it as presumably it's better tested anyway.
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	compat? ( !sys-libs/zlib[minizip] )
+	lzma? ( app-arch/xz-utils )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.4-libbsd-overlay.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DMZ_COMPAT=$(usex compat)
+
+		-DMZ_BUILD_TESTS=$(usex test)
+		-DMZ_BUILD_UNIT_TESTS=$(usex test)
+
+		-DMZ_FETCH_LIBS=OFF
+		-DMZ_FORCE_FETCH_LIBS=OFF
+
+		# Compression library options
+		-DMZ_ZLIB=ON
+		-DMZ_BZIP2=ON
+		-DMZ_LZMA=$(usex lzma)
+		-DMZ_ZSTD=$(usex zstd)
+		-DMZ_LIBCOMP=OFF
+
+		# Encryption support options
+		-DMZ_PKCRYPT=ON
+		-DMZ_WZAES=ON
+		-DMZ_OPENSSL=$(usex openssl)
+		-DMZ_LIBBSD=ON
+
+		# Character conversion options
+		-DMZ_ICONV=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local myctestargs=(
+		# TODO: investigate
+		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
+	)
+
+	# TODO: A bunch of tests end up looping and writing over each other's files
+	# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
+	# but still hangs.
+	cmake_src_test -j1
+}
+
+pkg_postinst() {
+	if use compat ; then
+		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
+		ewarn "Please be careful!"
+	fi
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 28eaa8e7feb5..efef8540795d 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -12,6 +12,7 @@ DIST readline-8.2.tar.gz.sig 95 BLAKE2B dc510459c0c47782ca87364a6677b4d8f0b68a98
 DIST readline-8.3-beta.tar.gz 3412518 BLAKE2B 196812d49ad5a56d4163a50e603269e9d7a3e4b28acf0d09103bd64a12845c107ef03fd09812f93a3854cdf0dae201e780b9e71d51ed752233f1b38fef1d87dd SHA512 5a8727420917016ef1be2ec3dff1bff433a62b9e0732707f203a6ffbbaaff6134b3ab67d22a51ee86ed2c4d94b75e0fb2d41bca8018ce52cccb44d27320dfa1d
 DIST readline-8.3-beta.tar.gz.sig 95 BLAKE2B af715b9a5e4bcad38aec353c2501b82648544429acd0db6afc19c66c0f19d6b8215e1198b3d54e09a54edb94c8a5438fc07ba80df17fa2dab789ba2201355ac5 SHA512 1906eaf283f558a5401bdfe401081ed92c77bf36c5bee19c4460cf907e9578bff6ce29423577e58d9e920760dd3822424426637dce1346569bc3668c7fead104
 DIST readline-8.3_beta_p20250128-5bcabd92f35444fa87ed49bd180a2994fd9449ba.tar.gz 3475352 BLAKE2B 7ea7ee7706a4d815e7a60acf96fdb344ef2baeb362d13cd7f5b8e6021e117c18f801ad1788689745739f9c69de2b0da1a1d04078fc2610bbdf212e42583980a3 SHA512 7267f9b1a08479f13f721afe03c8a1453ec95404ce9bdcdb3a7d150faf96522542ae26ebbcd54d648855779b60b84fe2e8d14bf78afdb6d391ce9db5642cb90c
+DIST readline-8.3_beta_p20250404-10a0a06a6b51db5d6125ecd8f79c1c844dcfc845.tar.gz 3476495 BLAKE2B abb696284e77a596a7a7557de37cb76945ae0b83cf03484a9a26e1b3ad10e1950879e20cd61e6d67db890a09dcd517fd1f2401054fa6df571b01590be9c130df SHA512 988b4fbf2d99c14b59f42ba08720d154850065ff5760e9e204026a3634e91a4d134a3568203974b7e842dbe8767e97abba6d1be568a95dad710c3cc9482c92b5
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
 DIST readline81-001.sig 95 BLAKE2B 7d523d0fc21772cb03aa4b5d66ea58c1a99a6c0e4a8625e89cad015cbff63cd68e08207ca5150819225300ac864806032888104bbbea64ca38ebf89e28c24b7e SHA512 7fa3747e388aecb26f2d4f8346b89b367710ea99a14618c625066b820901dc467bd156ec37340fde1f86f0fe0d6b33044c1ed5768cf8ed1a25386d32dc6419a6
 DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f54f3204c2d09b88ccec960e807c7af0ec3514b489b676e3be51f98351e377fb18e3d7a14d33d4da69d SHA512 e47c029b82cf3a4d44e85c4348f7e059c56726694c190d84186822e1c893e1c006e7ec75f33c36791112f81abd792a2e2fdae9a65cd128f3c89ff4ffd9a9a1ff
@@ -47,5 +48,6 @@ EBUILD readline-8.2_p13-r1.ebuild 7773 BLAKE2B 637c9152b400ab313b324f5ae00133a0e
 EBUILD readline-8.2_p13.ebuild 7690 BLAKE2B 92ccc7536949403673081bd8c21f9df08361b86299e5b44dc5fc0e4114bdfbf9680f3235ea1588e5c5ced8f5d7fd43ae7a5f17d6c32e480853297d26007ab1c1 SHA512 14072e5a71bbc20ea536e2ff56d4acde7e077339286b0055256c1fcea704f33db2a82ccf450d54bb993cedd7246e35f9871412442c64c008d80556607aea9b33
 EBUILD readline-8.3_beta.ebuild 7811 BLAKE2B 9008d80bbfffc579b2cca5e803e67207ca620695c56f4f205129747da45ccf0a92d2c1baf4fc5dd2573fa64e8fdafd18cfc0b5a6ae065fef5fc4b753b85b137d SHA512 aaaf3d63f96ca274b60e07bf561517b93d468d5690004c9a26d3fb42937005b5d729c3c6c1bc2a23fecbf067046f88dd10e12c98fbe98216b3419f7cdd131180
 EBUILD readline-8.3_beta_p20250128.ebuild 7811 BLAKE2B 1a571544f522b248c3214d822e9c899a71ffe29b535f01b30ef1637fafd7a86abc701524776550550d37ea896c9b14710a70e4595a9e7e1f54b36128073436a5 SHA512 cf46d76fa29f2fd41b768dddb5c109902750ee4508d25bd7bed8a6d7d6903ba4b879bc7be247f0bad57b2887bacbe00c01a566b354fc0aefad6d67170a56eea6
+EBUILD readline-8.3_beta_p20250404.ebuild 7811 BLAKE2B c57ccbafb2a8cbb1960419b9a5d09eebc378b2af795c845c8dbc7eaeba544c07ce4a1bfcab3e06d1e40b4ce5458387b0308ccc0aca0b945b27186b21d2ea1549 SHA512 30bdd7478f8b182eb86316cd1bc5f6f338e759786f54f306452894133460dadc85b4559c765dbd79c0ad5044d6db11d0f85407684208de191e5c94ba3967bb9a
 EBUILD readline-9999.ebuild 7811 BLAKE2B cf5eba115b0192005b2694856cef13519c3be3f9b65274286eacbd44ed4f700bad6a963604eb879911b28dba2804f27603d5c2fd6e079dc5a6b3b2acd42c5140 SHA512 c5bcb825bdccd649ba16986830df9bc4e20f74d6275cf9feb9f99de62715136951bd35b039c10c357bb972dee5b534994b7dc8d64a5a77b796568c99212bde50
 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
diff --git a/sys-libs/readline/readline-8.3_beta_p20250404.ebuild b/sys-libs/readline/readline-8.3_beta_p20250404.ebuild
new file mode 100644
index 000000000000..974757631917
--- /dev/null
+++ b/sys-libs/readline/readline-8.3_beta_p20250404.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# There's no standard way of versioning the point releases upstream
+# make anyway, so while this was added for RC versions, it's fine
+# in general.
+QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs verify-sig
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+# Determine the patchlevel.
+case ${PV} in
+	9999|*_alpha*|*_beta*|*_rc*)
+		# Set a negative patchlevel to indicate that it's a pre-release.
+		PLEVEL=-1
+		;;
+	*_p*)
+		PLEVEL=${PV##*_p}
+		;;
+	*)
+		PLEVEL=0
+esac
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+	# It can be useful to have snapshots in the pre-release period once
+	# the first alpha is out, as various bugs get reported and fixed from
+	# the alpha, and the next pre-release is usually quite far away.
+	#
+	# i.e. if it's worth packaging the alpha, it's worth packaging a followup.
+	READLINE_COMMIT="10a0a06a6b51db5d6125ecd8f79c1c844dcfc845"
+	SRC_URI="https://git.savannah.gnu.org/cgit/readline.git/snapshot/readline-${READLINE_COMMIT}.tar.gz -> ${P}-${READLINE_COMMIT}.tar.gz"
+	S=${WORKDIR}/${PN}-${READLINE_COMMIT}
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
+	S="${WORKDIR}/${MY_P}"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		upstream_url_base="mirror://gnu/readline"
+		mirror_url_base="ftp://ftp.cwru.edu/pub/readline"
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
+			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+			SRC_URI+=" ${patch_url}"
+			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+			# Add in the mirror URL too.
+			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
+			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}}.sig )"
+
+			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+		done
+
+		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
+	fi
+fi
+
+LICENSE="GPL-3+"
+SLOT="0/8"  # subslot matches SONAME major
+if (( PLEVEL >= 0 )); then
+	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
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+
+	# TODO: rebase
+	#"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+)
+
+src_unpack() {
+	local patch
+
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then
+		default
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig}
+
+			for patch in "${MY_PATCHES[@]}"; do
+				verify-sig_verify_detached "${patch}"{,.sig}
+			done
+		fi
+
+		unpack "${MY_P}.tar.gz"
+
+		if [[ ${GENTOO_PATCH_VER} ]]; then
+			unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+		fi
+	fi
+}
+
+src_prepare() {
+	(( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}"
+
+	default
+
+	#(( PLEVEL < 0 )) && eautoreconf
+
+	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
+		# If we're bootstrapping, make a guess. We don't have pkg-config
+		# around yet. bug #818103.
+		# Incorrectly populating this leads to underlinked libreadline.
+		local ncurses_libs
+		local ncurses_libs_suffix=$(usex unicode w '')
+
+		ncurses_libs="-lncurses${ncurses_libs_suffix}"
+
+		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
+			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
+		fi
+	else
+		# Force ncurses linking, bug #71420.
+		# Use pkg-config to get the right values, bug #457558.
+		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	fi
+
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	# For local readline headers
+	ln -s ../.. examples/rlfe/readline || die
+}
+
+src_configure() {
+	# Fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`, bug #484866
+	export ac_cv_prog_AR="$(tc-getAR)"
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		export bash_cv_func_sigsetjmp="present"
+		export bash_cv_func_ctype_nonascii="yes"
+		# bug #503312
+		export bash_cv_wcwidth_broken="no"
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# Code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+
+		ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# Code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in bug #595324 with paludis so keeping this for now...
+	preserve_old_lib \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
+		/$(get_libdir)/lib{history,readline}$(get_libname 7)
+}
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 01c4ac841288..dfb3ca002732 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -2,6 +2,6 @@ DIST zlib-ng-2.1.7.tar.gz 2406554 BLAKE2B c92a2ad481e4a10b8ec164f3974a09242118e2
 DIST zlib-ng-2.2.3.tar.gz 2413008 BLAKE2B 65cd976d559dcc31f34861a01b2eb0ce0439dd6412553a5a9842d2d937d4a0d1194aec98f478f5def4a0401e65a7c97b6843122bae49a35f96c7e2c59e79cc64 SHA512 e71e8972ec2c4dec9eaa2c8f550185f13d0f5c411c38061d1aaf78ca8e522fa3d53f005296e574af7f152e7da3a78adf97ae4bb638b7fd277ef57bba26370b7d
 DIST zlib-ng-2.2.4.tar.gz 2415754 BLAKE2B eb118c4b1d6de1b6cb5e3e1fcc8cc36ccf794321fab49f6070868515b179845495bf8833222107cc874397a3c2043a39c28d0f5d5a2bd450afaba606747a07cd SHA512 f49a89497988db55a2f2375f79443e7e2c57470dbd94b35ae38a39d988eb42f8ecc295a1bd68845fc273b59ea508d0e74b142585d85b7e869dd3c01cc6923d8d
 EBUILD zlib-ng-2.1.7.ebuild 2500 BLAKE2B 0d42ee88d8c6429ba129db582a3106d7a3527b9f54122229f42ba65859f7cc8671e7db5f2bdc2d878cb965e8b14cc83eb01ef7699c8b9443316e466ea47c22ca SHA512 1f1c8d9d33c15a2c4eb7fe6e6a497e4f22e6635ec577ef1f6d341af8769831b3b7854dc13ba5f1efbbd45a30a267252985614015e71ff2fcd53021bf5464919a
-EBUILD zlib-ng-2.2.3.ebuild 2343 BLAKE2B 77339dfdbe8587797e9f0f12e99cf5267f31812c9876ad99b4d3a6de09d1c509d3ac372022e98b5ac3649471d792021d8169247608f2700e3072cc14b08da1ce SHA512 af709a78aab1568de2dfaca7ae4efa98fddf814583325c44c5834dbbb9ed54ce4705a01d886cb1668ca921b7e3d46ff74dd6493d35cbca3865c98a2d06e76d3b
+EBUILD zlib-ng-2.2.3.ebuild 2339 BLAKE2B 568848f14f261076c0ba8ab7069d7c8429c729a64f8d0b893e01c26cabd57d21e91ec5af7d767165a23ee2ee41d9a9c8af643900da8bb85adaf5ecd6c31843fb SHA512 f553d25458071678ad8ff7e1ef4767767a51e6c830af8f49feb0b7b3e4cb3e2ba3733684c66671aadfcf7e17bb26216df86c4571b4c04d384577a75f6c2aa500
 EBUILD zlib-ng-2.2.4.ebuild 2350 BLAKE2B deaa16eecbaaf125ee4bd4a4e94e8ba770c9c78a7081d53884cb1ca42429f8353a6bbee0c710a62872460b52f982d8975fca058efdb3ce99e61000471fcdfa5b SHA512 dc35d740a77424c81eae6f006f86de6d90074aba8ecd9ef798d2fc0302c480c541486389b9c402583050dd362fcf1b6ae245ac34ac739998e642a49a4d345cfd
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
index abb9e9bf9323..b4ab077c7fba 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86"
 
 CPU_USE=(
 	x86_{avx2,avx512f,avx512_vnni,sse2,ssse3,sse4_2,pclmul,vpclmulqdq}