Adding metadata

3 files changed, 35 insertions, 19 deletions

diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 4e7f5d29f6ba..9f2c9faaf77a 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1 +1,2 @@
 DIST minizip-ng-4.0.10.tar.gz 773269 BLAKE2B fee6121e1db66edc951bdd15215190047d6294b894a8edcfe400938b7cf175beb723e0546e165a0fcef04123cb2f807c9a8270fdf9ec05a273fda11a7795372d SHA512 a74386e2cf89f63d7fc9bf53527c8203ac78c46f2511e4883d17d949ec4e7d1b6c3707bcb13c3fc7cc4db8255b5f50ddb61bedba10e683acb18d112470676f62
+DIST minizip-ng-4.2.1.tar.gz 610659 BLAKE2B 5a97abec5448243c95448f83553c413174482462f277666a4fe477d3e2e941c07cedbf74d439ad91838218fbadc25f7105b1511ca82d50598ca2161cc6afc213 SHA512 606962a5939103d6045e05742f56d7a000708ee41a021dcd2583c534ab5944eb5d81c09bde37d891eaed8bdd6263513e94e73f89628225a68e36675342eb70d8
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.10.ebuild b/sys-libs/minizip-ng/minizip-ng-4.2.1.ebuild
index 535e953e5c1b..7d0e0609bf41 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.10.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ 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
+inherit cmake-multilib multibuild
 
 DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
 HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
@@ -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 )"
 
@@ -26,24 +26,38 @@ RDEPEND="
 	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	compat? ( !sys-libs/zlib[minizip] )
-	lzma? ( app-arch/xz-utils )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
 	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
-	test? ( dev-cpp/gtest )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.4-libbsd-overlay.patch
-)
+run_both() {
+	local MULTIBUILD_VARIANTS=( base )
+	use compat && MULTIBUILD_VARIANTS+=( compat )
 
-multilib_src_configure() {
+	multibuild_foreach_variant "${@}"
+}
+
+my_src_configure() {
+	local compat=OFF
+	[[ ${MULTIBUILD_VARIANT} == compat ]] && compat=ON
 	local mycmakeargs=(
-		-DMZ_COMPAT=$(usex compat)
+		"${mycmakeargs[@]}"
+		-DMZ_COMPAT="${compat}"
+	)
+
+	cmake_src_configure
+}
 
-		-DMZ_BUILD_TESTS=$(usex test)
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Controls installing "minizip" and "minigzip" tools.  Install
+		# them unconditionally to avoid divergence with USE=test.
+		-DMZ_BUILD_TESTS=ON
 		-DMZ_BUILD_UNIT_TESTS=$(usex test)
 
 		-DMZ_FETCH_LIBS=OFF
@@ -55,6 +69,7 @@ multilib_src_configure() {
 		-DMZ_LZMA=$(usex lzma)
 		-DMZ_ZSTD=$(usex zstd)
 		-DMZ_LIBCOMP=OFF
+		-DMZ_PPMD=OFF
 
 		# Encryption support options
 		-DMZ_PKCRYPT=ON
@@ -66,21 +81,21 @@ multilib_src_configure() {
 		-DMZ_ICONV=ON
 	)
 
-	cmake_src_configure
+	run_both my_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)"
-	)
+multilib_src_compile() { run_both cmake_src_compile; }
 
+multilib_src_test() {
 	# 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
+	local CTEST_JOBS=1
+	run_both cmake_src_test
 }
 
+multilib_src_install() { run_both cmake_src_install; }
+
 pkg_postinst() {
 	if use compat ; then
 		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
diff --git a/sys-libs/timezone-data/timezone-data-2026b.ebuild b/sys-libs/timezone-data/timezone-data-2026b.ebuild
index 6df4c1dea994..92ec75a9da5e 100644
--- a/sys-libs/timezone-data/timezone-data-2026b.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2026b.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 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="nls leaps-timezone zic-slim"
 
 DEPEND="nls? ( virtual/libintl )"