[gentoo-commits] repo/gentoo:master commit in: sys-libs/minizip-ng/

[Sam James]

commit:     03024123afb37307146bdcf2ba68b03f448a76c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 01:06:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 01:09:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03024123

sys-libs/minizip-ng: add missing deps

Got distracted when handling tests.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/minizip-ng/metadata.xml                             |  1 +
 .../{minizip-ng-3.0.6.ebuild => minizip-ng-3.0.6-r1.ebuild}  | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys-libs/minizip-ng/metadata.xml b/sys-libs/minizip-ng/metadata.xml
index f712872be38f..f1896c5bcb81 100644
--- a/sys-libs/minizip-ng/metadata.xml
+++ b/sys-libs/minizip-ng/metadata.xml
@@ -8,6 +8,7 @@
        <use>
                <flag name="compat">Enable compatibility with 
<pkg>sys-libs/zlib</pkg>'s USE=minizip</flag>
                <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for 
further encryption capabilities</flag>
+               <flag name="zstd">Add Zstandard compression support via 
<pkg>app-arch/zstd</pkg></flag>
        </use>
        <upstream>
                <remote-id type="github">zlib-ng/minizip-ng</remote-id>

diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.6.ebuild 
b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
similarity index 87%
rename from sys-libs/minizip-ng/minizip-ng-3.0.6.ebuild
rename to sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
index e27b7d11fd07..42790b51b0d3 100644
--- a/sys-libs/minizip-ng/minizip-ng-3.0.6.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
@@ -12,19 +12,25 @@ 
SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="compat openssl test"
+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}"
 
 PATCHES=(
        
"${FILESDIR}"/${PN}-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch
-       "${FILESDIR}"/minizip-ng-3.0.6-test-temporary.patch
+       "${FILESDIR}"/${P}-test-temporary.patch
 )
 
 src_configure() {
@@ -39,7 +45,7 @@ src_configure() {
                -DMZ_ZLIB=ON
                -DMZ_BZIP2=ON
                -DMZ_LZMA=ON
-               -DMZ_ZSTD=ON
+               -DMZ_ZSTD=$(usex zstd)
                -DMZ_LIBCOMP=OFF
 
                # Encryption support options