summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-02 02:06:40 +0100
committerSam James <sam@gentoo.org>2022-10-02 02:09:05 +0100
commit03024123afb37307146bdcf2ba68b03f448a76c4 (patch)
tree2b0c9eb554b308937b10d05db98aa95ad37f6b67
parentdev-python/contourpy: Keyword 1.0.5 alpha, #872683 (diff)
downloadgentoo-03024123afb37307146bdcf2ba68b03f448a76c4.tar.gz
gentoo-03024123afb37307146bdcf2ba68b03f448a76c4.tar.bz2
gentoo-03024123afb37307146bdcf2ba68b03f448a76c4.zip
sys-libs/minizip-ng: add missing deps
Got distracted when handling tests. Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-libs/minizip-ng/metadata.xml1
-rw-r--r--sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild (renamed from sys-libs/minizip-ng/minizip-ng-3.0.6.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
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