| 1 |
commit: b658a3b125401ee02a45f9477c1a2827a57c957d |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 14 06:30:14 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 14 06:30:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b658a3b1 |
| 7 |
|
| 8 |
sys-fs/squashfs-tools: Add ZSTD support to live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 11 |
|
| 12 |
sys-fs/squashfs-tools/metadata.xml | 23 +++++++++++---------- |
| 13 |
sys-fs/squashfs-tools/squashfs-tools-9999.ebuild | 26 +++++++++++++++--------- |
| 14 |
2 files changed, 28 insertions(+), 21 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml |
| 17 |
index 9edcb3d56b8..4a5bc2d698e 100644 |
| 18 |
--- a/sys-fs/squashfs-tools/metadata.xml |
| 19 |
+++ b/sys-fs/squashfs-tools/metadata.xml |
| 20 |
@@ -1,15 +1,16 @@ |
| 21 |
<?xml version="1.0" encoding="UTF-8"?> |
| 22 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 23 |
<pkgmetadata> |
| 24 |
- <maintainer type="project"> |
| 25 |
- <email>livecd@g.o</email> |
| 26 |
- <name>Gentoo LiveCD Project</name> |
| 27 |
- </maintainer> |
| 28 |
- <use> |
| 29 |
- <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag> |
| 30 |
- <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag> |
| 31 |
- </use> |
| 32 |
- <upstream> |
| 33 |
- <remote-id type="sourceforge">squashfs</remote-id> |
| 34 |
- </upstream> |
| 35 |
+<maintainer type="project"> |
| 36 |
+<email>livecd@g.o</email> |
| 37 |
+<name>Gentoo LiveCD Project</name> |
| 38 |
+</maintainer> |
| 39 |
+<use> |
| 40 |
+<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag> |
| 41 |
+<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag> |
| 42 |
+<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag> |
| 43 |
+</use> |
| 44 |
+<upstream> |
| 45 |
+<remote-id type="sourceforge">squashfs</remote-id> |
| 46 |
+</upstream> |
| 47 |
</pkgmetadata> |
| 48 |
|
| 49 |
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
| 50 |
index b2c2c5a3925..c06d73d0508 100644 |
| 51 |
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
| 52 |
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2016 Gentoo Foundation |
| 55 |
+# Copyright 1999-2017 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -16,23 +16,28 @@ EGIT_REPO_URI=" |
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="" |
| 63 |
-IUSE="debug lz4 lzma lzo static xattr +xz" |
| 64 |
+IUSE="debug lz4 lzma lzo static xattr +xz zstd" |
| 65 |
|
| 66 |
-LIB_DEPEND="sys-libs/zlib[static-libs(+)] |
| 67 |
+LIB_DEPEND=" |
| 68 |
+ sys-libs/zlib[static-libs(+)] |
| 69 |
!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) |
| 70 |
lz4? ( app-arch/lz4[static-libs(+)] ) |
| 71 |
lzma? ( app-arch/xz-utils[static-libs(+)] ) |
| 72 |
lzo? ( dev-libs/lzo[static-libs(+)] ) |
| 73 |
xattr? ( sys-apps/attr[static-libs(+)] ) |
| 74 |
- xz? ( app-arch/xz-utils[static-libs(+)] )" |
| 75 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
| 76 |
-DEPEND="${RDEPEND} |
| 77 |
- static? ( ${LIB_DEPEND} )" |
| 78 |
- |
| 79 |
+ xz? ( app-arch/xz-utils[static-libs(+)] ) |
| 80 |
+ zstd? ( app-arch/zstd[static-libs(+)] ) |
| 81 |
+" |
| 82 |
+RDEPEND=" |
| 83 |
+ !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 84 |
+" |
| 85 |
+DEPEND=" |
| 86 |
+ ${RDEPEND} |
| 87 |
+ static? ( ${LIB_DEPEND} ) |
| 88 |
+" |
| 89 |
PATCHES=( |
| 90 |
"${FILESDIR}"/${PN}-4.3-sysmacros.patch |
| 91 |
"${FILESDIR}"/${PN}-4.3-aligned-data.patch |
| 92 |
- "${FILESDIR}"/${PN}-4.3-xattrs.patch |
| 93 |
) |
| 94 |
|
| 95 |
use10() { usex $1 1 0 ; } |
| 96 |
@@ -42,11 +47,12 @@ src_configure() { |
| 97 |
|
| 98 |
# set up make command line variables in EMAKE_SQUASHFS_CONF |
| 99 |
EMAKE_SQUASHFS_CONF=( |
| 100 |
+ LZ4_SUPPORT=$(use10 lz4) |
| 101 |
LZMA_XZ_SUPPORT=$(use10 lzma) |
| 102 |
LZO_SUPPORT=$(use10 lzo) |
| 103 |
- LZ4_SUPPORT=$(use10 lz4) |
| 104 |
XATTR_SUPPORT=$(use10 xattr) |
| 105 |
XZ_SUPPORT=$(use10 xz) |
| 106 |
+ ZSTD_SUPPORT=$(use10 zstd) |
| 107 |
) |
| 108 |
|
| 109 |
tc-export CC |
Archives