gentoo auto-resync : 16:06:2023 - 07:40:49

9 files changed, 139 insertions, 244 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5714e556318a..d114efb7cf18 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 8ec0905a7fe0..7cede0e4e997 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,10 +1,5 @@
-AUX minizip-3.0.9-strdup.patch 1255 BLAKE2B f2c31ba2caa656cea80b507f7b8918cb3d5eba235474822c87f3e993ae3ac0e4d9a922b8e535150f8d509c148b2c7532d33985dbdec9e8a20b625538300441ec SHA512 2887e3c56967989d4596ac48eac24ab8971b752f79c0ce5da8998d0aea67eb165e067fcc07c2584422f065bf1994673eb43d5061afd339e09e2d4cc94a158558
 DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829
-DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1
-DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
 DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05
 EBUILD minizip-ng-3.0.10.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
-EBUILD minizip-ng-3.0.8.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
-EBUILD minizip-ng-3.0.9.ebuild 2607 BLAKE2B a6e42fcfe2460977ac0ee506a92204559c96b0eaffc18b32417f49999b475abed5d602e8856fa495c4ab6dcb89ec03ab1a1fbf054b74ca4db914a4b1f62d71fd SHA512 bad1bd8435517449a55f363d82b08340bc9e07c8b0815b6dd6172b042c537b281ef1e2ccb1a99593ee90ee90f56f3e0c5b41313cee783c257b5436bb29af4ddb
-EBUILD minizip-ng-4.0.0.ebuild 2536 BLAKE2B d3bd717b82c68e237f69e28888f0223a2027bafc5e905862d115629e02fe9ad2184df93f2389bc75af85f5b0b555147452fcb9b4004579cb53a90fb42d308ced SHA512 3b876edd0145af313944af25aedfac8f425316b6a76266c6d51e9f5aaeb600088095fec8ffa7099222cfbf0e7451e030ce50d0840b6477118d2dd16ff770452e
+EBUILD minizip-ng-4.0.0-r1.ebuild 2671 BLAKE2B 7425c19e3eb2c4f043631156b797056d7adcdb82b9588adda9bc9a2d713b010ace28e8ea2b57f31a8e3bcb28bc4256d28ea1bee30e3a910080df7e06c005c3d6 SHA512 5654162ba3f1a9dc73c08c44c619e47e8b7620054a1b5e4218ff5a368195ce0391f00254b5e485089aec9aea72d8f54ef1540f05fb11e618fa8febbeed6b00af
 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
deleted file mode 100644
index 9cb1dd991b17..000000000000
--- a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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.8.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
deleted file mode 100644
index 35459128380a..000000000000
--- a/sys-libs/minizip-ng/minizip-ng-3.0.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 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
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="compat 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
-	app-arch/xz-utils
-	sys-libs/zlib-ng
-	virtual/libiconv
-	compat? ( !sys-libs/zlib[minizip] )
-	openssl? ( dev-libs/openssl:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-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=ON
-		-DMZ_ZSTD=$(usex zstd)
-		-DMZ_LIBCOMP=OFF
-
-		# Encryption support options
-		-DMZ_PKCRYPT=ON
-		-DMZ_WZAES=ON
-		-DMZ_OPENSSL=$(usex openssl)
-		-DMZ_LIBBSD=ON
-		-DMZ_SIGNING=ON
-
-		# Character conversion options
-		-DMZ_ICONV=ON
-	)
-
-	cmake_src_configure
-}
-
-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
-}
-
-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!"
-	fi
-}
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
deleted file mode 100644
index 9817a6cb9ba6..000000000000
--- a/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 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
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="compat 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
-	app-arch/xz-utils
-	sys-libs/zlib-ng
-	virtual/libiconv
-	compat? ( !sys-libs/zlib[minizip] )
-	openssl? ( dev-libs/openssl:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/minizip-3.0.9-strdup.patch
-)
-
-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=ON
-		-DMZ_ZSTD=$(usex zstd)
-		-DMZ_LIBCOMP=OFF
-
-		# Encryption support options
-		-DMZ_PKCRYPT=ON
-		-DMZ_WZAES=ON
-		-DMZ_OPENSSL=$(usex openssl)
-		-DMZ_LIBBSD=ON
-		-DMZ_SIGNING=ON
-
-		# Character conversion options
-		-DMZ_ICONV=ON
-	)
-
-	cmake_src_configure
-}
-
-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
-}
-
-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!"
-	fi
-}
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
index fd2a6d9b2507..a0229283ac8f 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.0.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
@@ -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
+inherit cmake-multilib
 
 DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
 HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
@@ -21,20 +21,20 @@ 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
+	app-arch/bzip2[${MULTILIB_USEDEP}]
 	app-arch/xz-utils
-	sys-libs/zlib-ng
+	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	compat? ( !sys-libs/zlib[minizip] )
-	openssl? ( dev-libs/openssl:= )
-	zstd? ( app-arch/zstd:= )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DMZ_COMPAT=$(usex compat)
 
@@ -64,7 +64,7 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_test() {
+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)"
@@ -76,15 +76,15 @@ src_test() {
 	cmake_src_test -j1
 }
 
-src_install() {
-	cmake_src_install
-
-	if use test ; then
+multilib_src_install_all() {
+	if ! use compat && use test ; then
 		# Test binaries, bug #874591
 		rm "${ED}"/usr/bin/minigzip || die
 		rm "${ED}"/usr/bin/minizip-ng || die
 	fi
+}
 
+pkg_postinst() {
 	if use compat ; then
 		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
 		ewarn "Please be careful!"
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 9faaa101fea9..5ace28f5dac5 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,3 +1,6 @@
+AUX zlib-ng-2.1.2-cmake.patch 1338 BLAKE2B a082171657f55f792ffba58e05a80df50dcc3dcd145844b5fde79e25e3122666bba5b1a2d2a3fbb6780f02d3fbdfc843d3a8112266e0508c3c890464a7c5c5ac SHA512 c9b317df0c25250ee04df360a4f6095f7476bb3a81d80f10db960003a33aecb843432549395095bb8c904644b40c16477ad51b1fb8842198a5035fdab608947c
 DIST zlib-ng-2.0.7.tar.gz 853381 BLAKE2B 89672bd35ee54df72ff995c1b4ed188538011be4cd077e464f21a088b0b70b3f95b4259dc546a65e8d4900dc5bd5bb98041875e361000898b34518f7e008b99b SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988
+DIST zlib-ng-2.1.2.tar.gz 2404176 BLAKE2B bc0b65520562827b10216110e2020a3341ee0dd853874c19ddb6f9df776fc74a542c1239f77dc3ec2ccb3f92e75f1de7ef104edfecfe37312149b1bc29ae7403 SHA512 2b3073df4eb13d8318f8fa2b7674e4729642488f65dad49d3080ccd830f29e9e3f32a673b42634443ddf9e9ef85cfff4f2f3e182506f950b9ee0a208a92c0465
 EBUILD zlib-ng-2.0.7.ebuild 2133 BLAKE2B 9c74f3a169705f9cc1ed010093cfbc316a4209541384534bc51f95435e8242d7e742978ab87d0f2d5ae6d6eb2fe5a00f63364bfd16feb9b840b98b78c03f6cf3 SHA512 c0c0939ad7e58f55607ac01f7186314a1bc7fee8b37c0589e83d1227e5d136c33cfcdd52e82de9fc93f368a6299ecf98778a2d266ceccbe3d26ce2787d6405f9
+EBUILD zlib-ng-2.1.2-r1.ebuild 2447 BLAKE2B edaef6db3a05cc6330db7d771661a0c71c2bb2078381ff243be684928783aaf337646262db8ab49f1e2e246b267ebbf8f7646ad8e83cbe43f8083bb3eb6c9fb1 SHA512 db211f66b6c50095e56efb6b65b6bb07677f08c409e71e2a95b8335fa2605901662fa9d51a2963fd6760a67cd988797e0f10d5702363ea9a635aed03fa52faf5
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
new file mode 100644
index 000000000000..8deb07a60515
--- /dev/null
+++ b/sys-libs/zlib-ng/files/zlib-ng-2.1.2-cmake.patch
@@ -0,0 +1,35 @@
+https://github.com/zlib-ng/zlib-ng/issues/1515
+https://github.com/zlib-ng/zlib-ng/pull/1519
+https://github.com/zlib-ng/zlib-ng/commit/39136c20716a94188c1d041b9656315371d35a47
+
+From 39136c20716a94188c1d041b9656315371d35a47 Mon Sep 17 00:00:00 2001
+From: "Mika T. Lindqvist" <postmaster@raasu.org>
+Date: Sun, 11 Jun 2023 18:38:12 +0300
+Subject: [PATCH] Try to find system copy of googletest before trying to
+ download it. * Don't use system copy if memory sanitizer is enabled
+
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -111,8 +111,6 @@ if(WITH_BENCHMARKS)
+ endif()
+ 
+ if(WITH_GTEST)
+-    include(FetchContent)
+-
+     # Google test requires at least C++11
+     set(CMAKE_CXX_STANDARD 11)
+ 
+@@ -125,9 +123,13 @@ if(WITH_GTEST)
+         # Must set include and compile options before fetching googletest
+         include_directories($ENV{LLVM_BUILD_DIR}/include $ENV{LLVM_BUILD_DIR}/include/c++/v1)
+         add_compile_options(-stdlib=libc++ -g)
++    elseif(NOT TARGET GTest::GTest)
++        find_package(GTest)
+     endif()
+ 
+     if(NOT TARGET GTest::GTest)
++        include(FetchContent)
++
+         # Prevent overriding the parent project's compiler/linker settings for Windows
+         set(gtest_force_shared_crt ON CACHE BOOL
+             "Use shared (DLL) run-time lib even when Google Test is built as static lib." FORCE)
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..f96bd980dbf9
--- /dev/null
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 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 zlib data compression library"
+HOMEPAGE="https://github.com/zlib-ng/zlib-ng"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CPU_USE=(
+	x86_{avx2,avx512f,sse2,ssse3,sse4_2,pclmul}
+	arm_{crc32,neon}
+	ppc_{altivec,vsx2,vsx3}
+)
+IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="compat? ( !sys-libs/zlib )"
+
+PATCHES=(
+	"${FILESDIR}"/zlib-ng-2.1.2-cmake.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DZLIB_COMPAT=$(usex compat)
+		-DZLIB_ENABLE_TESTS=$(usex test)
+
+		# Unaligned access is controversial and undefined behaviour
+		# Let's keep it off for now
+		# https://github.com/gentoo/gentoo/pull/17167
+		-DWITH_UNALIGNED=OFF
+	)
+
+	# The intrinsics options are all defined conditionally, so we need
+	# to enable them on/off per-arch here for now.
+	# TODO: There's no s390x USE_EXPAND yet
+	if use amd64 || use x86 ; then
+		mycmakeargs+=(
+			-DWITH_AVX2=$(usex cpu_flags_x86_avx2)
+			-DWITH_AVX512=$(usex cpu_flags_x86_avx512f)
+			-DWITH_AVX512VNNI=OFF # TODO, see bug #908556
+			-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+			-DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
+			-DWITH_SSE42=$(usex cpu_flags_x86_sse4_2)
+			-DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
+			-DWITH_VPCLMULQDQ=OFF # TODO, see bug #908556
+		)
+	fi
+
+	if use arm || use arm64 ; then
+		mycmakeargs+=(
+			-DWITH_ACLE=$(usex cpu_flags_arm_crc32)
+			-DWITH_NEON=$(usex cpu_flags_arm_neon)
+		)
+	fi
+
+	if use ppc || use ppc64 ; then
+		# The POWER8 support is VSX which was introduced
+		# VSX2 was introduced with POWER8, so use that as a proxy for it
+		mycmakeargs+=(
+			-DWITH_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+			-DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
+			-DWITH_POWER9=$(usex cpu_flags_ppc_vsx3)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use compat ; then
+		ewarn "zlib-ng is experimental and replacing the system zlib is dangerous"
+		ewarn "Please be careful!"
+		ewarn
+		ewarn "The following link explains the guarantees (and what is NOT guaranteed):"
+		ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md"
+	fi
+}