gentoo auto-resync : 14:01:2024 - 07:13:52

4 files changed, 9 insertions, 92 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1912a4390622..631825726007 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index e4d0d4658c40..3cc8a107ab21 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,7 +1,5 @@
-DIST zlib-ng-2.1.3.tar.gz 2404446 BLAKE2B f3c93e1ed6aa6d008915a69de92d58b1646fd41ae6c97fbdab9d921fd30c7931a42cf5dccd8911d52142960174a04df54d6ab557cc7c902930fc8609c31fbee9 SHA512 cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e
-DIST zlib-ng-2.1.4.tar.gz 2408377 BLAKE2B 0b5aff9671b43bda2adfc84987c6baa108fa444978d465f12516f13f32b88e6bbe52f7d3e48ff93c720229842062fe71c38ff7c1e7591e18fc7351c943fd2a6b SHA512 5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2
 DIST zlib-ng-2.1.5.tar.gz 2410601 BLAKE2B 7370ee38c05855e3a5e6976826690790adab7d68d877bf01f68969c99ad4a5fc8fd265a160e147b110969ff77ee97aab9c9d227a526d645a496eae76b2c27b04 SHA512 9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920
-EBUILD zlib-ng-2.1.3.ebuild 2421 BLAKE2B eba6881a1a0e5ab68afbcdde3a52e6f277e957b2339ba73c4c988f17aa0fd6ac6a31e217d8033ea4f22167e5737ffbad4d6cdf490d793191fcc687d065dc0838 SHA512 5ac14e86cfb25ef7a1df59f099c503811a764a44a57cf2f58c567d637f55ffbd6fcda17ba140a035a137582286d0f82fa75b6f9fb4e7d9eefcab79fdee0e9bdf
-EBUILD zlib-ng-2.1.4.ebuild 2421 BLAKE2B eba6881a1a0e5ab68afbcdde3a52e6f277e957b2339ba73c4c988f17aa0fd6ac6a31e217d8033ea4f22167e5737ffbad4d6cdf490d793191fcc687d065dc0838 SHA512 5ac14e86cfb25ef7a1df59f099c503811a764a44a57cf2f58c567d637f55ffbd6fcda17ba140a035a137582286d0f82fa75b6f9fb4e7d9eefcab79fdee0e9bdf
+DIST zlib-ng-2.1.6.tar.gz 2412106 BLAKE2B 9ca16c19c2c799e68e099d44721b27dc33ad9e859a3d6572bebe3a75c618bffd78e19f0d4c0607802d1c8fa6a8f328d62f9993648a99c1d2e0e5fdcaf87a2667 SHA512 59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a
 EBUILD zlib-ng-2.1.5.ebuild 2421 BLAKE2B eba6881a1a0e5ab68afbcdde3a52e6f277e957b2339ba73c4c988f17aa0fd6ac6a31e217d8033ea4f22167e5737ffbad4d6cdf490d793191fcc687d065dc0838 SHA512 5ac14e86cfb25ef7a1df59f099c503811a764a44a57cf2f58c567d637f55ffbd6fcda17ba140a035a137582286d0f82fa75b6f9fb4e7d9eefcab79fdee0e9bdf
+EBUILD zlib-ng-2.1.6.ebuild 2460 BLAKE2B 8b04632bfc65f7e9f71f9de820814e1b14061e5588330b58f46fcb53316bb93a68eec6bc88bf54a27f10dcc91262879f1931bd68694a26a5734646d4cd069143 SHA512 1e5a8e4c78cdc76bd1aaa728130d68c841ac53a1288933dee2e6b322daa41cdfc7ce4ee8c6f2184a05c0c1ee07fe3dc5362cb4ea216a0f3993a45c2294fc49df
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild
deleted file mode 100644
index cfef9b1cc843..000000000000
--- a/sys-libs/zlib-ng/zlib-ng-2.1.4.ebuild
+++ /dev/null
@@ -1,86 +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-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 )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DZLIB_COMPAT=$(usex compat)
-		-DZLIB_ENABLE_TESTS=$(usex test)
-		-DWITH_GTEST=$(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
-}
diff --git a/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
index cfef9b1cc843..d2217e6f0db3 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.1.3.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,12 @@ IUSE="compat ${CPU_USE[@]/#/cpu_flags_} test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="compat? ( !sys-libs/zlib )"
+DEPEND="
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	compat? ( !sys-libs/zlib )
+"
 
 multilib_src_configure() {
 	local mycmakeargs=(