From: Matt Turner <mattst88@gentoo.org>
Date: Sat, 24 Aug 2019 16:25:29 +0000 (-0700)
Subject: sys-fs/squashfs-tools-ng: Drop removed --with-gzip
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5a432703dcdecac3a439bbb0f9239e7ba658e56f;p=gentoo.git

sys-fs/squashfs-tools-ng: Drop removed --with-gzip

zlib is required as of upstream commit 50385e06ec20 ("Replace
update_crc32 helper function with crc32 from zlib").

Closes: https://bugs.gentoo.org/692808
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild
index fc732972175d..b77878296fdf 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild
@@ -15,15 +15,14 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )"
+IUSE="lz4 lzo selinux +xz zstd"
 
 DEPEND="
+	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
 	lzo?     ( dev-libs/lzo:= )
 	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
-	zlib?    ( sys-libs/zlib:= )
 	zstd?    ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
@@ -39,7 +38,6 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with xz)
-		$(use_with zlib gzip)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index fc732972175d..b77878296fdf 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -15,15 +15,14 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )"
+IUSE="lz4 lzo selinux +xz zstd"
 
 DEPEND="
+	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
 	lzo?     ( dev-libs/lzo:= )
 	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
-	zlib?    ( sys-libs/zlib:= )
 	zstd?    ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
@@ -39,7 +38,6 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with xz)
-		$(use_with zlib gzip)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"