summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-08-24 09:25:29 -0700
committerMatt Turner <mattst88@gentoo.org>2019-08-24 09:27:39 -0700
commit5a432703dcdecac3a439bbb0f9239e7ba658e56f (patch)
tree7353819649a45eb1930261b8bc98c2a1dbcc351c /sys-fs/squashfs-tools-ng
parentmedia-plugins/kodi-pvr-vuplus: 3.27.1 version bump (diff)
downloadgentoo-5a432703dcdecac3a439bbb0f9239e7ba658e56f.tar.gz
gentoo-5a432703dcdecac3a439bbb0f9239e7ba658e56f.tar.bz2
gentoo-5a432703dcdecac3a439bbb0f9239e7ba658e56f.zip
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>
Diffstat (limited to 'sys-fs/squashfs-tools-ng')
-rw-r--r--sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild6
-rw-r--r--sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild6
2 files changed, 4 insertions, 8 deletions
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[@]}"