| 1 |
commit: 5a432703dcdecac3a439bbb0f9239e7ba658e56f |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 24 16:25:29 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 24 16:27:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a432703 |
| 7 |
|
| 8 |
sys-fs/squashfs-tools-ng: Drop removed --with-gzip |
| 9 |
|
| 10 |
zlib is required as of upstream commit 50385e06ec20 ("Replace |
| 11 |
update_crc32 helper function with crc32 from zlib"). |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/692808 |
| 14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild | 6 ++---- |
| 17 |
sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild | 6 ++---- |
| 18 |
2 files changed, 4 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index fc732972175..b77878296fd 100644 |
| 22 |
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild |
| 23 |
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild |
| 24 |
@@ -15,15 +15,14 @@ fi |
| 25 |
|
| 26 |
LICENSE="GPL-3+" |
| 27 |
SLOT="0" |
| 28 |
-IUSE="lz4 lzo selinux +xz +zlib zstd" |
| 29 |
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )" |
| 30 |
+IUSE="lz4 lzo selinux +xz zstd" |
| 31 |
|
| 32 |
DEPEND=" |
| 33 |
+ sys-libs/zlib:= |
| 34 |
lz4? ( app-arch/lz4:= ) |
| 35 |
lzo? ( dev-libs/lzo:= ) |
| 36 |
xz? ( app-arch/xz-utils:= ) |
| 37 |
selinux? ( sys-libs/libselinux:= ) |
| 38 |
- zlib? ( sys-libs/zlib:= ) |
| 39 |
zstd? ( app-arch/zstd:= ) |
| 40 |
" |
| 41 |
RDEPEND="${DEPEND}" |
| 42 |
@@ -39,7 +38,6 @@ src_configure() { |
| 43 |
$(use_with lzo) |
| 44 |
$(use_with selinux) |
| 45 |
$(use_with xz) |
| 46 |
- $(use_with zlib gzip) |
| 47 |
$(use_with zstd) |
| 48 |
) |
| 49 |
econf "${myconf[@]}" |
| 50 |
|
| 51 |
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild |
| 52 |
index fc732972175..b77878296fd 100644 |
| 53 |
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild |
| 54 |
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild |
| 55 |
@@ -15,15 +15,14 @@ fi |
| 56 |
|
| 57 |
LICENSE="GPL-3+" |
| 58 |
SLOT="0" |
| 59 |
-IUSE="lz4 lzo selinux +xz +zlib zstd" |
| 60 |
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )" |
| 61 |
+IUSE="lz4 lzo selinux +xz zstd" |
| 62 |
|
| 63 |
DEPEND=" |
| 64 |
+ sys-libs/zlib:= |
| 65 |
lz4? ( app-arch/lz4:= ) |
| 66 |
lzo? ( dev-libs/lzo:= ) |
| 67 |
xz? ( app-arch/xz-utils:= ) |
| 68 |
selinux? ( sys-libs/libselinux:= ) |
| 69 |
- zlib? ( sys-libs/zlib:= ) |
| 70 |
zstd? ( app-arch/zstd:= ) |
| 71 |
" |
| 72 |
RDEPEND="${DEPEND}" |
| 73 |
@@ -39,7 +38,6 @@ src_configure() { |
| 74 |
$(use_with lzo) |
| 75 |
$(use_with selinux) |
| 76 |
$(use_with xz) |
| 77 |
- $(use_with zlib gzip) |
| 78 |
$(use_with zstd) |
| 79 |
) |
| 80 |
econf "${myconf[@]}" |
Archives