sys-fs/squashfs-tools: Add ZSTD support to live ebuild.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 9edcb3d56b8bc90ed2673ecaa49307a3e5b7d298..4a5bc2d698e369b9562ada2c5bceded2ed78d798 100644 (file)
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
-  </maintainer>
-  <use>
-    <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-    <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">squashfs</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>livecd@gentoo.org</email>
+<name>Gentoo LiveCD Project</name>
+</maintainer>
+<use>
+<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
+<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
+<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">squashfs</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index b2c2c5a39252168bc2c492184d7be6bae79deb53..c06d73d05088110be38f3b1ffa007f32b3cacfff 100644 (file)
--- 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