11 files changed, 138 insertions, 31 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index afdb687b1efb..9028245ba452 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index bac6c65639af..ec99f6523c66 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,5 +1,6 @@
+AUX cracklib-2.9.10-python-inc.patch 712 BLAKE2B 2e5d1dd7637632d25c408232dac77220e844d8084c29867b7382a644edcc856e4ec6c1dd6f3f4fb6e812b71ecc7c4157b2a65f637e1d2a691454de5927b5cfec SHA512 7e87b932cf1a997a3e75c5bfe51428f4506e23e117a2b9964c91bd3fe7e953d459d266bdcffa6c5dcbbf6d0d35812a540e8e67427d1f0ca8c9e6741cac9463d5
 DIST cracklib-2.9.10.tar.bz2 620648 BLAKE2B f4ebf4aea6da81424a8b9fae9c204260f6020937b6b2b02cec13527f812e1751522a47a4432ff0a2a233eeb88fe0c8b7e7fd371f611a40bf2d34a10ddfd4fe83 SHA512 0c3856833f4c58fc1ebc63cc08b189c55e8d5722ef8cdc1cad5f717cef137a83648657e005e2d0367006b27aafa1bb63e36e7998918937733816635880c85f74
 DIST cracklib-2.9.8.tar.bz2 613017 BLAKE2B d9a5d922d6ac777b08cec9c427c0cde48666cdf67bf4136eb5866a0111b101c795dceb8e206e90bff31d1c8d26505bc1a950e8ea079562d8afd601641a7caf0c SHA512 bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371
-EBUILD cracklib-2.9.10.ebuild 2680 BLAKE2B 98ed0d58753cafb74bdac00088d1bd60b2852a82ba255bb511b180bcabf23b73fe60b9d006983f349f18e8b02be17b818c31cbb745713ea8609079c304fea63f SHA512 1c4fc36e395b1a8db0096ab11f0532398121211496eaa15ab05744fa3fd1cc3f401f60d49f1a4d9b84c918812213fff486165069afe441d70dd381c2bf4bab74
+EBUILD cracklib-2.9.10-r1.ebuild 3032 BLAKE2B e408bf8549fffc5a617cc2e4b6ca949e84f52b1d45330f1d075b4d4cad781dbf32df186b39c7e62c5e92825b18c5404763d9bcfef9aa9b68c4f167e13a365a82 SHA512 be576eae3cc42876c80ef64716a1e7c26e08c63b46e154774b08ec0451094c0bbd1a426dfbf6e7ae00a34e030f83efaacaa1abca88f158557c3df8bb00cd40a2
 EBUILD cracklib-2.9.8.ebuild 2672 BLAKE2B 88614b0d1a368daaf22b2249ab50f8f4fb0c03d249ecc8b700a0e8800128c21e2224d437040c43886c620ca2224c2bc97aa2c24a58a7bea095cf4f29c8aed5aa SHA512 6b265982b4405a42f0581511432942f37f6ecbe1136f9cd7d40eb4f142810b3f2b4a38b477378bc748b8483f86bbdf846d5d55f4375b1b903b74689a6d815e69
 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796
diff --git a/sys-libs/cracklib/cracklib-2.9.10.ebuild b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
index 71fddeb64779..0553dfd808a8 100644
--- a/sys-libs/cracklib/cracklib-2.9.10.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 # Note: ideally bump with sys-apps/cracklib-words
 
 DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1 libtool multilib-minimal usr-ldscript
 
@@ -31,19 +32,14 @@ DEPEND="
 "
 BDEPEND="
 	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
+	python? ( ${DISTUTILS_DEPS} )
 "
 
-do_python() {
-	multilib_is_native_abi || return 0
-	use python || return 0
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.10-python-inc.patch
+)
 
-	pushd python > /dev/null || die
-	distutils-r1_src_${EBUILD_PHASE}
-	popd > /dev/null || die
-}
+distutils_enable_tests unittest
 
 pkg_setup() {
 	# Workaround bug #195017
@@ -57,10 +53,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# bug ##269003
+	# bug #269003
 	elibtoolize
 
-	do_python
+	if use python ; then
+		distutils-r1_src_prepare
+	fi
 }
 
 multilib_src_configure() {
@@ -81,18 +79,28 @@ multilib_src_configure() {
 multilib_src_compile() {
 	default
 
-	do_python
+	if multilib_is_native_abi && use python ; then
+		local -x CFLAGS="${CFLAGS} -DLOCALEDIR='\"${EPREFIX}/usr/share/locale\"' -DDEFAULT_CRACKLIB_DICT=\'${EPREFIX}/usr/lib/cracklib_dict\'"
+		cd python || die
+		distutils-r1_src_compile
+	fi
 }
 
 multilib_src_test() {
 	default
 
-	# Make sure we load the freshly built library
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib/.libs:${LD_LIBRARY_PATH}" do_python
+	if multilib_is_native_abi && use python ; then
+		distutils-r1_src_test
+	fi
 }
 
 python_test() {
-	${EPYTHON} -m unittest test_cracklib || die "Tests fail with ${EPYTHON}"
+	cd "${S}"/python || die
+
+	# Make sure we load the freshly built library
+	local -x LD_LIBRARY_PATH="${BUILD_DIR/-${EPYTHON/./_}}/lib/.libs:${BUILD_DIR}/lib:${LD_LIBRARY_PATH}"
+
+	eunittest
 }
 
 multilib_src_install() {
@@ -101,7 +109,10 @@ multilib_src_install() {
 	# Move shared libs to /
 	gen_usr_ldscript -a crack
 
-	do_python
+	if multilib_is_native_abi && use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
 }
 
 multilib_src_install_all() {
diff --git a/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch b/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch
new file mode 100644
index 000000000000..fd9960df0e8f
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch
@@ -0,0 +1,20 @@
+https://github.com/cracklib/cracklib/pull/61
+
+From 802cbc426779489d44d7fc19e695e7d962c65665 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 17 Mar 2023 02:20:19 +0000
+Subject: [PATCH] python: adjust include path for builddir
+
+We need this for config.h added by 2e0f854bada720ff4fbd13aed4f87087d466274d.
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -22,7 +22,7 @@ from setuptools import setup, Extension
+ extensions = [
+     Extension("_cracklib",
+         ["@srcdir@/_cracklib.c"],
+-        include_dirs = ["@top_srcdir@/lib"],
++        include_dirs = ["@top_builddir@", "@top_srcdir@/lib"],
+         libraries = ["crack"],
+         library_dirs = ["@top_builddir@/lib/.libs"]),
+ ]
+
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 78d09a1c954b..ac7d564d37ae 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,7 +45,7 @@ EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B b9e39255651ebda4cf2fff8ff9e6e0470955e
 EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
 EBUILD glibc-2.36-r5.ebuild 51373 BLAKE2B e90a8b848d463cd1fb3e8e3101408ef1c4834f1179f3d008d67d0e5a0ce5862b82819113b4c0f00881b828ba4d59cb03025f002b908793aba49cde1297aa6b2e SHA512 813f7bab667a08d96efc84bf62b17ec465e2c6546a0756d90718320e2983f5e6ae2ee36858517ec6affa13aacac91a4fdce70e5df0c1244fde26bc72b3b17dcc
 EBUILD glibc-2.36-r6.ebuild 51943 BLAKE2B 9dd9ebe47ee9dd09c6dd7b6cbbd517c1e3d1a017b27f08b283f5a5c387bb4d680f9e77a865c66b0ec40a093f41db255e77b388c4136729dcd853e078e822a0c7 SHA512 57c7805f93f3f1d5ad59ded6adfbdd54b33b9c76e7833d1eb4449b06cbacc3c8a14883cd03770bb3bed36280685a7b378133aba813eecb9164a9797d830f7b95
-EBUILD glibc-2.36-r7.ebuild 51980 BLAKE2B b3aae88f5459d653ba143786e40870127812087b79d1359295708114482ae8b6417bf660bba65fc60d5c5540b63cbb470a49bb46cc5980ba58ac866563bc4989 SHA512 12aa6624cd187ee6a157f478e2283845b0c8977d2b5f3a017de7327ffe637674a67f366c4cc26b4dc9711f4e154ea71a860efb562a602ce9d2aa2460a38604df
-EBUILD glibc-2.37-r1.ebuild 51982 BLAKE2B b417e0d7f253b6fe9abbad7ea7576526f13692a41ce1ac22b944de15db51de6d64c6bbb37c024dece76d8f8a2563970285824e56a5e9aa778017f60d05efaf80 SHA512 9ec8b2070e8d3d29ade0fc7829ac1e6c9cb4eaf0d167893b3b83f086f2bf1ebc29ce22317978a68c19d5013527b695c2a8dc8e13d3a17bb50020eade2558101b
-EBUILD glibc-9999.ebuild 51983 BLAKE2B 8da76f7557b90e2880786a6ba4ecb98d01dff5e10860befb731652b4aebb7c3da6d5da50aacbad0f1764c6666f3fc39c1d725032a64f09dfeebd3c541b30506f SHA512 3c67043d05299f29359219cdd456bc75d6f08568e07f7e50578688b870e98b20ab1d87387f2fa1ca846d67e1f84782019088fabe67167be8dadc10f38af3e354
+EBUILD glibc-2.36-r7.ebuild 52459 BLAKE2B f5a2f0bd5b7c8a6f0d42b2c399c3dc75cba3d9c8693ab31dfd65157de02210a0447505dd28c7bbabea464e5acc8db29145372f4557a119883f029e87a0e40777 SHA512 3527d68ed3415a3a5f13795d191c72433584a531376625bcb92ae955130b7807f642c3a82246412c0490f6ff320efd9a733feff175f222287964ccaf9b88deba
+EBUILD glibc-2.37-r1.ebuild 52461 BLAKE2B d5eadde16ef22b5d645f4f5b4dc9b1dd0ecd686f63277797bd41685c1e3ce3e71aad9bab963db0d12e1a1214a59444a10e341a7ab11fd90dc7b02c3e20669806 SHA512 1014ebaefc45e6290890e3df3cd157714aed012edccaa7cfad0247c897a18c8abf53847fdfe53a86838e8988626fcd52c36a78564a979148f19276511545c40d
+EBUILD glibc-9999.ebuild 52462 BLAKE2B 0efe03792c9cf258b2aa78f289f09063f71be51395f095ee02fcd8271bda4a57ca1965278a91e8163a610bb137c798cef6dfbf50d66753e2e2c83de49444bda3 SHA512 11e7ec2ff20c8d67aff7be7a98b0b928289ab39f849a852a6238bbf40635441c0e8cd4d33703d0c8cf425de77744f8a0d8fef9926823af2f508db5e4f7c77ece
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.36-r7.ebuild b/sys-libs/glibc/glibc-2.36-r7.ebuild
index 8bb3e20062b4..28002f738a95 100644
--- a/sys-libs/glibc/glibc-2.36-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r7.ebuild
@@ -472,7 +472,18 @@ setup_flags() {
 	filter-flags '-fsanitize=*'
 
 	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection='
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if (use amd64 || use x86) && ! use cet; then
+		append-flags '-fcf-protection=none'
+	fi
 }
 
 use_multiarch() {
diff --git a/sys-libs/glibc/glibc-2.37-r1.ebuild b/sys-libs/glibc/glibc-2.37-r1.ebuild
index 55b5a05c1ef8..4b041ecc1f7e 100644
--- a/sys-libs/glibc/glibc-2.37-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r1.ebuild
@@ -472,7 +472,18 @@ setup_flags() {
 	filter-flags '-fsanitize=*'
 
 	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection='
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if (use amd64 || use x86) && ! use cet; then
+		append-flags '-fcf-protection=none'
+	fi
 }
 
 use_multiarch() {
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index df348d783cb1..f5ec71d81a7b 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -472,7 +472,18 @@ setup_flags() {
 	filter-flags '-fsanitize=*'
 
 	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection='
+	filter-flags '-fcf-protection=*'
+
+	# When bootstrapping, we may have a situation where
+	# CET-enabled gcc from seed is used to build CET-disabled
+	# glibc. As such, gcc implicitly enables CET if no
+	# -fcf-protection flag is passed. For a typical package it
+	# should not be a problem, but for glibc it matters as it is
+	# dealing with CET in ld.so. So if CET is supposed to be
+	# disabled for glibc, be explicit about it.
+	if (use amd64 || use x86) && ! use cet; then
+		append-flags '-fcf-protection=none'
+	fi
 }
 
 use_multiarch() {
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index faac6cd0d056..162f66a304b8 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,6 +1,7 @@
+AUX minizip-3.0.9-strdup.patch 1255 BLAKE2B f2c31ba2caa656cea80b507f7b8918cb3d5eba235474822c87f3e993ae3ac0e4d9a922b8e535150f8d509c148b2c7532d33985dbdec9e8a20b625538300441ec SHA512 2887e3c56967989d4596ac48eac24ab8971b752f79c0ce5da8998d0aea67eb165e067fcc07c2584422f065bf1994673eb43d5061afd339e09e2d4cc94a158558
 AUX minizip-ng-3.0.7-system-gtest.patch 733 BLAKE2B 9af012238754b34424eeb55d117fd5ae700ef971a8b58e0240d576b459bf7c1ae67e762bfd16dcbb95b206b019f9728eae8d4a1482fe85f21e884880494e9e78 SHA512 9020ef82288e9e92136a68acbc2310ff227d1e4f089f625b95224c5944c17c4c092dd7ed93345fb2cd8522e18ba0361868fd269dc545181270416009bbf6c37f
-DIST minizip-ng-3.0.7.tar.gz 643065 BLAKE2B e7026a5cc54fac6eba6fd1e79f8d53474966999aec1c24c70ff2207b93314f1e1cf5360841570ace66a30d6178f0057428757c7ba9b2d4bb14feb397142dedcb SHA512 01805ec955514efca32f4beb0e1241e94591d7d1d6119036c55d898a595de038bb18b8a2ffe5dab13101a890d14485aaefdf81680a7c60aa4ab3fd9de63ee991
 DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1
-EBUILD minizip-ng-3.0.7.ebuild 2584 BLAKE2B 2eb43757b21e6cc60d3bdd18700e86d10b2d98102780adf0d56407e899762850e0ac1113242b642b9b5a300ec848168dbff3436706030b94ff33b25486060699 SHA512 541621a23fcb02d2a58583f39193c81fd9e06079596240f6424f764d5b8f9b810c4c5b9279119019ed1f657aac575134247475957a79b59caf5021132feeeee0
+DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
 EBUILD minizip-ng-3.0.8.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
+EBUILD minizip-ng-3.0.9.ebuild 2607 BLAKE2B a6e42fcfe2460977ac0ee506a92204559c96b0eaffc18b32417f49999b475abed5d602e8856fa495c4ab6dcb89ec03ab1a1fbf054b74ca4db914a4b1f62d71fd SHA512 bad1bd8435517449a55f363d82b08340bc9e07c8b0815b6dd6172b042c537b281ef1e2ccb1a99593ee90ee90f56f3e0c5b41313cee783c257b5436bb29af4ddb
 MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
new file mode 100644
index 000000000000..9cb1dd991b17
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
@@ -0,0 +1,37 @@
+https://github.com/zlib-ng/minizip-ng/pull/682
+
+From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 16 Mar 2023 23:35:34 +0000
+Subject: [PATCH] CMake: set newer POSIX_C_SOURCE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Enable POSIX 2008 as it's needed for strdup(), otherwise we get:
+```
+/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In function ‘mz_dir_make’:
+/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19: error: implicit declaration of function ‘strdup’ [-Werror=implicit-function-declaration]
+  286 |     current_dir = strdup(path);
+      |                   ^~~~~~
+```
+
+The man page for strdup says:
+```
+strdup():
+	_XOPEN_SOURCE >= 500
+	|| /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
+	|| /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
+```
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -455,7 +455,7 @@ endif()
+ 
+ # Unix specific
+ if(UNIX)
+-    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
++    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
+     list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
+ 
+     if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
+
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
index 12ebd223606a..9817a6cb9ba6 100644
--- a/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="compat openssl test zstd"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.7-system-gtest.patch
+	"${FILESDIR}"/minizip-3.0.9-strdup.patch
 )
 
 src_configure() {
@@ -59,8 +59,6 @@ src_configure() {
 		-DMZ_PKCRYPT=ON
 		-DMZ_WZAES=ON
 		-DMZ_OPENSSL=$(usex openssl)
-		# TODO: Re-enable, ideally unconditionally, for arc4random
-		# Revisit when https://github.com/zlib-ng/minizip-ng/pull/648 fixed
 		-DMZ_LIBBSD=ON
 		-DMZ_SIGNING=ON
 
@@ -86,6 +84,12 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	if use test ; then
+		# Test binaries, bug #874591
+		rm "${ED}"/usr/bin/minigzip || die
+		rm "${ED}"/usr/bin/minizip-ng || die
+	fi
+
 	if use compat ; then
 		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
 		ewarn "Please be careful!"