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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB001138334 for ; Sat, 24 Aug 2019 16:27:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB030E0809; Sat, 24 Aug 2019 16:27:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92C77E0809 for ; Sat, 24 Aug 2019 16:27:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AE1834A23F for ; Sat, 24 Aug 2019 16:27:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71995758 for ; Sat, 24 Aug 2019 16:27:49 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1566664059.5a432703dcdecac3a439bbb0f9239e7ba658e56f.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild X-VCS-Directories: sys-fs/squashfs-tools-ng/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5a432703dcdecac3a439bbb0f9239e7ba658e56f X-VCS-Branch: master Date: Sat, 24 Aug 2019 16:27:49 +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: 2f7550c7-4e2a-4a4c-b888-0555ba6c7832 X-Archives-Hash: 74b333ae37c97af86393d0d7533a3bae commit: 5a432703dcdecac3a439bbb0f9239e7ba658e56f Author: Matt Turner gentoo org> AuthorDate: Sat Aug 24 16:25:29 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Aug 24 16:27:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a432703 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 gentoo.org> sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.ebuild | 6 ++---- sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild | 6 ++---- 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 fc732972175..b77878296fd 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 fc732972175..b77878296fd 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[@]}"