[gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/

["Michał Górny" <mgorny@gentoo.org>]

commit:     ecebf9b6aae9610454f2b94a0fc7bf429ac03d69
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 10:18:42 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 10:20:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecebf9b6

app-arch/libarchive: Enable zlib unconditionally

Building libarchive without zlib support is not being tested properly.
The library has test failures, and quite possibly also some runtime
bugs.  Remove the flag and enable zlib unconditionally.

Closes: https://bugs.gentoo.org/833091
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-arch/libarchive/libarchive-3.5.3.ebuild | 6 +++---
 app-arch/libarchive/libarchive-3.6.0.ebuild | 6 +++---
 app-arch/libarchive/metadata.xml            | 7 -------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app-arch/libarchive/libarchive-3.5.3.ebuild b/app-arch/libarchive/libarchive-3.5.3.ebuild
index 8a83c8c80e97..f74fb1e58e30 100644
--- a/app-arch/libarchive/libarchive-3.5.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.3.ebuild
@@ -11,9 +11,10 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 
 RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
@@ -28,7 +29,6 @@ RDEPEND="
 	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
-		$(use_with zlib)
+		--with-zlib
 		$(use_with zstd)
 
 		# Windows-specific

diff --git a/app-arch/libarchive/libarchive-3.6.0.ebuild b/app-arch/libarchive/libarchive-3.6.0.ebuild
index 9aad1a3f2fbb..81d638123afd 100644
--- a/app-arch/libarchive/libarchive-3.6.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.6.0.ebuild
@@ -11,9 +11,10 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 
 RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
@@ -28,7 +29,6 @@ RDEPEND="
 	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
-		$(use_with zlib)
+		--with-zlib
 		$(use_with zstd)
 
 		# Windows-specific

diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index d3de9d873aa0..a8ad4ecadcd9 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -24,13 +24,6 @@
 		<flag name="nettle">
 			Use <pkg>dev-libs/nettle</pkg> as crypto backend
 		</flag>
-		<flag name="zlib">
-			Allow accessing gzip-compressed archives through
-			<pkg>sys-libs/zlib</pkg>. This only affects libarchive's native
-			support: bsdtar will keep using gunzip as a filter if that's not
-			built-in. It's also needed for supporting extraction of ZIP
-			files.
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libarchive:libarchive</remote-id>