From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CF67158094 for ; Sun, 2 Oct 2022 01:09:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 542A4E0953; Sun, 2 Oct 2022 01:09:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BF41E0953 for ; Sun, 2 Oct 2022 01:09:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 647B5340DBB for ; Sun, 2 Oct 2022 01:09:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED343599 for ; Sun, 2 Oct 2022 01:09:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664672945.03024123afb37307146bdcf2ba68b03f448a76c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/minizip-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/minizip-ng/metadata.xml sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild sys-libs/minizip-ng/minizip-ng-3.0.6.ebuild X-VCS-Directories: sys-libs/minizip-ng/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03024123afb37307146bdcf2ba68b03f448a76c4 X-VCS-Branch: master Date: Sun, 2 Oct 2022 01:09:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a860320e-4089-4e7d-895a-306f968fb466 X-Archives-Hash: b74b69ea2fce2be5b67331c7a0619ff7 commit: 03024123afb37307146bdcf2ba68b03f448a76c4 Author: Sam James gentoo org> AuthorDate: Sun Oct 2 01:06:40 2022 +0000 Commit: Sam James gentoo 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 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 @@ Enable compatibility with sys-libs/zlib's USE=minizip Use dev-libs/openssl for further encryption capabilities + Add Zstandard compression support via app-arch/zstd zlib-ng/minizip-ng 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