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 5F45D1396D9 for ; Tue, 14 Nov 2017 06:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF1A4E0F96; Tue, 14 Nov 2017 06:31:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7BA8CE0F96 for ; Tue, 14 Nov 2017 06:30:59 +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 9CD6233BEB4 for ; Tue, 14 Nov 2017 06:30:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 306CC9AE4 for ; Tue, 14 Nov 2017 06:30:57 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1510641055.b658a3b125401ee02a45f9477c1a2827a57c957d.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/squashfs-tools/metadata.xml sys-fs/squashfs-tools/squashfs-tools-9999.ebuild X-VCS-Directories: sys-fs/squashfs-tools/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: b658a3b125401ee02a45f9477c1a2827a57c957d X-VCS-Branch: master Date: Tue, 14 Nov 2017 06:30:57 +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-Archives-Salt: 03198e82-579b-4921-a72f-29c1c7003601 X-Archives-Hash: 0b488a00832c5b54f74beb5bd2279ed7 commit: b658a3b125401ee02a45f9477c1a2827a57c957d Author: Jeroen Roovers gentoo org> AuthorDate: Tue Nov 14 06:30:14 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Nov 14 06:30:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b658a3b1 sys-fs/squashfs-tools: Add ZSTD support to live ebuild. Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-fs/squashfs-tools/metadata.xml | 23 +++++++++++---------- sys-fs/squashfs-tools/squashfs-tools-9999.ebuild | 26 +++++++++++++++--------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index 9edcb3d56b8..4a5bc2d698e 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -1,15 +1,16 @@ - - livecd@gentoo.org - Gentoo LiveCD Project - - - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils - Enable support for LZ4 compression using app-arch/lz4 - - - squashfs - + +livecd@gentoo.org +Gentoo LiveCD Project + + +Enable support for LZ4 compression using app-arch/lz4 +Enable support for XZ ("LZMA2") compression using app-arch/xz-utils +Enable support for ZSTD compression using app-arch/zstd + + +squashfs + diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild index b2c2c5a3925..c06d73d0508 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,23 +16,28 @@ EGIT_REPO_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug lz4 lzma lzo static xattr +xz" +IUSE="debug lz4 lzma lzo static xattr +xz zstd" -LIB_DEPEND="sys-libs/zlib[static-libs(+)] +LIB_DEPEND=" + sys-libs/zlib[static-libs(+)] !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) - xz? ( app-arch/xz-utils[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - + xz? ( app-arch/xz-utils[static-libs(+)] ) + zstd? ( app-arch/zstd[static-libs(+)] ) +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" PATCHES=( "${FILESDIR}"/${PN}-4.3-sysmacros.patch "${FILESDIR}"/${PN}-4.3-aligned-data.patch - "${FILESDIR}"/${PN}-4.3-xattrs.patch ) use10() { usex $1 1 0 ; } @@ -42,11 +47,12 @@ src_configure() { # set up make command line variables in EMAKE_SQUASHFS_CONF EMAKE_SQUASHFS_CONF=( + LZ4_SUPPORT=$(use10 lz4) LZMA_XZ_SUPPORT=$(use10 lzma) LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) XATTR_SUPPORT=$(use10 xattr) XZ_SUPPORT=$(use10 xz) + ZSTD_SUPPORT=$(use10 zstd) ) tc-export CC