gentoo auto-resync : 28:10:2023 - 04:27:56

4 files changed, 7 insertions, 192 deletions

diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 3f0c983229dc..08f18a5bd14a 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,9 +1,6 @@
 AUX minizip-ng-4.0.1-libbsd-overlay.patch 699 BLAKE2B 6c14c0421dda1f3f879f727a77018335119ec21b0ad1e988148c11451ae9e68986bcbb46eb9e6b775825333f07b9309269f7810b90d8af61618bb037309413e5 SHA512 dc9cceca7009e48e6a7a2ecee0f96497fb15b0a6eb16a50f0689e001874558c37f9fd8303bd3e983c9286698cd7f79e99ccdf53f2bad5f503c041ad1fccae199
-DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829
-DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05
 DIST minizip-ng-4.0.1.tar.gz 769661 BLAKE2B 30147d8643844d9ea10f3f860d41e5025b2c8a5e3bb197722cf3e9ea3d30f40d78974a437425df660db777d9593db9e39b2293db7733ccfaf50c5eba4982a6fe SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258
-EBUILD minizip-ng-3.0.10.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
-EBUILD minizip-ng-4.0.0-r1.ebuild 2785 BLAKE2B 2fc368c38c1e29d218ff701e93513e9fb024a8748eb00024beb828664a5023c362c13afa4cd99f7f82af8aa2dab8bf2912b355e79d2be5c8ba6613b26e293507 SHA512 95d36935eaab77f76983cac788ade07cfab1541a9c50d94b4418e99472828bd614df927fb71ba83888c841127acd068aa56cd0b60255d2d37809e1a2a22ee8c5
+DIST minizip-ng-4.0.2.tar.gz 769745 BLAKE2B 7e983169d637e0b94ad6f0c7ceca743fcc54fe1c2f98bae9cb4e9050fe85cb2d46d36cb185d5eb7c0b577d606d9eedfecc3817048b3e7006287fa5e001bed4a5 SHA512 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c
 EBUILD minizip-ng-4.0.1-r1.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
-EBUILD minizip-ng-4.0.1.ebuild 2671 BLAKE2B 7425c19e3eb2c4f043631156b797056d7adcdb82b9588adda9bc9a2d713b010ace28e8ea2b57f31a8e3bcb28bc4256d28ea1bee30e3a910080df7e06c005c3d6 SHA512 5654162ba3f1a9dc73c08c44c619e47e8b7620054a1b5e4218ff5a368195ce0391f00254b5e485089aec9aea72d8f54ef1540f05fb11e618fa8febbeed6b00af
+EBUILD minizip-ng-4.0.2.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
 MISC metadata.xml 548 BLAKE2B 1373f3096881bc3c5bf4f1864528f399f84c17dab1c9f9ea88db5ad2da1d82cd48f89b9aaa4837f808a45f6783ac833415f1633a9eeaee70748f753fc392be7f SHA512 cf600135681af26f27b611663d426f9a9e83848289f3e184cd4ed6eaec4404226e8737945453a3a12d4bcdc6ef3a623336e514f9bb0c566eb5e8110ade4a1e63
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.10.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.10.ebuild
deleted file mode 100644
index 35459128380a..000000000000
--- a/sys-libs/minizip-ng/minizip-ng-3.0.10.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-4.0.0-r1.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
deleted file mode 100644
index 041a8c77f778..000000000000
--- a/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,94 +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 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 ~ppc64 ~riscv ~x86"
-# TODO: Needs SONAME fixing for compat
-# https://github.com/zlib-ng/minizip-ng/issues/358#issuecomment-1593970564
-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[${MULTILIB_USEDEP}]
-	app-arch/xz-utils
-	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	compat? ( !sys-libs/zlib[minizip] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-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=ON
-		-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
-}
-
-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!"
-	fi
-}
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.1.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.2.ebuild
index a0229283ac8f..4f3a48149147 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.1.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.2.ebuild
@@ -23,6 +23,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	app-arch/xz-utils
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	compat? ( !sys-libs/zlib[minizip] )
@@ -34,6 +35,10 @@ DEPEND="
 	test? ( dev-cpp/gtest )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-libbsd-overlay.patch
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DMZ_COMPAT=$(usex compat)