diff options
Diffstat (limited to 'sys-fs/squashfs-tools')
| -rw-r--r-- | sys-fs/squashfs-tools/Manifest | 4 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/metadata.xml | 23 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-9999.ebuild | 26 |
3 files changed, 30 insertions, 23 deletions
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 206875ada134..093f63b9e335 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -13,7 +13,7 @@ DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e EBUILD squashfs-tools-3.2_p2.ebuild 953 SHA256 378ed13f72b193ae57f6e7dfa73e0497dd2dd576e2f02d6bb1d4065a32d75487 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129 WHIRLPOOL e08b0d35c663be1e1bce2e583422549e53c13a731b25c2b41e0293d60a4e69434abd96f6189331da27947853aedb58006d959f76323ae47a5dccd1aa2fb05576 EBUILD squashfs-tools-3.4.ebuild 937 SHA256 cc5393a6ac2d6563388f851b5d8960f4406df92193f3c22a1ed869a19e417937 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b WHIRLPOOL d18c907a2bf4bb378635dc1b8f8d028fc4e90bb9068c3a9ecc018ae9bf71cddb19fae343092c668594d3b8e5fc1383983d15c926e2717976f4849723762f11fd EBUILD squashfs-tools-4.3-r2.ebuild 2129 SHA256 79a5da851793eba5b94a5b9bc5dc87f2b430e25659ff3cbabf3115079c23be7d SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec WHIRLPOOL 40caa4996831fd8c3711e16b8adc7a548dd5b7ab4c1c4d71042034949bed640aad1976be9f5ee0943d9768a65385c04183c68318237463861885814dd0956e96 -EBUILD squashfs-tools-9999.ebuild 1649 SHA256 39a6b5ef9618b67ffccf0ec3ce56b0c497ada8269fd70b891da03abf6d1fefaf SHA512 0535d76acba1893795b029dd8f0315fa5d1a96ff5048bffa9cac18a221b3204abcc2173e5ab26e8fad427824bee1aebfedef2d40f1cd8cf3a26c0b9a30972628 WHIRLPOOL 246c8c30868c05566649c9eb818891f6a067161e87ecbc462f4833f5498e81f1cc50800f03f7cc82d67ec89c206d32b7cf0cc29cb7cc3a51a52a4066214ddd55 +EBUILD squashfs-tools-9999.ebuild 1694 SHA256 fcb4ad716933e8a67cf2d16889b0b5797f1a505ced3c2afc54ce8fc28b0d55cf SHA512 b364a908e175482bb48ce6106d706b766aee3d3953e2fffa03b0a83b5ca3098d92e79e2034f31e120b856b99f9d3e1bd98cb50114a50f8cb2cb3502e080e6c10 WHIRLPOOL 2c53ea0741c4aab801c74afe14039c716b5740ce99753f3ba6733cb01f2b49567c3997c063fedce69cc356b6963e60e534c22335f7a3ecbf80bc1999d2016c39 MISC ChangeLog 4948 SHA256 048b1ddb2aef544d992020d83546b567bd89ccdbc92b902e6b993a80e60d115f SHA512 6baf9d18b382033117f4a7ca46dfd9196af0c3b6b60d7b3b4073d6aecadacddd2816631fbab7f3ee308abf768fc2e6d5e82ffa4f9517e8c69344c106aff36bee WHIRLPOOL b8ec6c9c0a646c4c5ce8b30080d38168f50c0a7da1fb0c7567efb2eb8e869be6547574d3f24da2d87d5f805bcaaad2ebb75940fe3099f4c19b4f5040692f9be6 MISC ChangeLog-2015 18760 SHA256 a731f71798d4dcbb59b9001f81a73064961bc450ba3f4e6de3fb790112eaf571 SHA512 58d3ee1c7ed0327c87d8bec39fcb309095adc8c500aa919c74cb461d13e9e745e632fc07207109dbab677ab4ac1862cbe1ec08af74f98cafc92d2a26e9d931be WHIRLPOOL 8188d57e0e1c6b6dcfd5be583571e38ea9db21ded8bb60355e60a2ed8eb34debc72cfaa79fa122e787085ded69a64567269e9ded619d63fdc36852f6b61ff110 -MISC metadata.xml 559 SHA256 5813dae0eff3bfed9a7a40ac785726804d493f175479c1cc10ee3ea566b6eb2d SHA512 2318c516e5e76a6c802563d1e1bf60273dbfd6a6cf0944a41e5287f0c85f1b73761ba050599dfb3b2c86a53da01fc752bb4c74397c404c4ff68eb73dfedf2572 WHIRLPOOL 763a763428e1ca87f7fc653cc7984a88bac9ffb256464e7fe2258f901ab4283819998c560197aa1e558e17a3b3c4bdb480a2b9df696efadd81c4cd00a47cfade +MISC metadata.xml 619 SHA256 c3a99ca9c19501c93537f0336e30f690d602c25f0e61b0fd265f25d6459ed472 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9 WHIRLPOOL d0eb98de765f228a9843e6ea58ca315e96010e351b550a7768cdea64a4c56d9c014987bc13535a0cf129d5552a82a31d80f96a27c28b2b91ddd0ce05240acafa diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index 9edcb3d56b8b..4a5bc2d698e3 100644 --- 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 b2c2c5a39252..c06d73d05088 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 |