diff options
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | profiles/use.local.desc | 1 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/metadata.xml | 3 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171114.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha2.ebuild) | 19 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild | 19 |
6 files changed, 25 insertions, 21 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index cae915ae..d95a4ec1 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -107,7 +107,7 @@ sys-fs/aufs 99999999: An entirely re-designed and re-implemented Unionfs sys-fs/aufs-util 99999999: Userspace tools for aufs sys-fs/emount 3.0.4: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab sys-fs/squash_dir 13.13: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist -sys-fs/squashfs-tools 4.3.1_alpha2 99999999: Tool for creating compressed filesystem type squashfs +sys-fs/squashfs-tools 4.3.1_alpha20171114 99999999: Tool for creating compressed filesystem type squashfs sys-fs/squashmount 16.0.0_p2: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files sys-kernel/kernel 4.3: A POSIX shell script to compile the kernel with user permissions diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 637035b8..108d4c3d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -244,6 +244,7 @@ sys-fs/squash_dir:overlayfs - Prefer overlayfs sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz4 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils +sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/zstd (requires >=linux-4.14 or >=sys-fs/squashfuse-0.1.101_alpha20170917) sys-power/nut:ipmi - Support IPMI-based UPSes. sys-power/nut:ups_drivers_al175 - Driver for Eltek UPS models with AL175 alarm module sys-power/nut:ups_drivers_apcsmart - Driver for American Power Conversion Smart Protocol UPS equipment diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 78b2ef2b..da08ce78 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -1,2 +1,2 @@ -DIST squashfs-tools-4.3.1_alpha2.tar.gz 229109 SHA256 183ecb1c15b219fd924ad37e5539a3e57ee510ba3613fe270401d7a40edd74a7 SHA512 3a0f83077782e42d1e0b8715c670975ba8ca4b9a0dabadaa07d5ae6dc5386ada747e2f66d74598abf6b93c9a919a6d5e192f2a0e9c1f3bd80a73cc498802a37b +DIST squashfs-tools-4.3.1_alpha20171114.tar.gz 230304 SHA512 de127e83793e11747b8af16d1c9418c78baacdb4fbacb1171a150391ec566b6ac2dcb01eb52ba2b3b61c69d78100127e114e42c36c31572f40fbbba610fc999f DIST squashfs-tools_4.3-3.debian.tar.xz 15252 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index a32c8edc..0c08467f 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -11,8 +11,9 @@ <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> + <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> (requires >=linux-4.14 or >=sys-fs/squashfuse-0.1.101_alpha20170917)</flag> </use> <upstream> <remote-id type="sourceforge">squashfs</remote-id> diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171114.ebuild index b1830096..a2dcc822 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha2.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20171114.ebuild @@ -20,15 +20,15 @@ EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.deb LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug lz4 lzma lzo static xattr +xz" +IUSE="debug lz4 lzma lzo static xattr +xz +zstd" -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(+)] )" +LIB_DEPEND="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(+)] ) + zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -48,7 +48,7 @@ src_unpack() { } else RESTRICT="mirror" - EGIT_COMMIT="5be5d61e5e5a93911256b5f2106e50da0ca81e8d" + EGIT_COMMIT="6113361316d5ce5bfdc118d188e5617a1fcd747c" SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EXTRA_URI}" S="${WORKDIR}/${P}/${PN}" @@ -87,6 +87,7 @@ src_configure() { LZ4_SUPPORT=$(use10 lz4) XATTR_SUPPORT=$(use10 xattr) XZ_SUPPORT=$(use10 xz) + ZSTD_SUPPORT=$(use10 zstd) ) filter-flags -fno-common diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild index b1830096..a2dcc822 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild @@ -20,15 +20,15 @@ EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.deb LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug lz4 lzma lzo static xattr +xz" +IUSE="debug lz4 lzma lzo static xattr +xz +zstd" -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(+)] )" +LIB_DEPEND="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(+)] ) + zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -48,7 +48,7 @@ src_unpack() { } else RESTRICT="mirror" - EGIT_COMMIT="5be5d61e5e5a93911256b5f2106e50da0ca81e8d" + EGIT_COMMIT="6113361316d5ce5bfdc118d188e5617a1fcd747c" SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EXTRA_URI}" S="${WORKDIR}/${P}/${PN}" @@ -87,6 +87,7 @@ src_configure() { LZ4_SUPPORT=$(use10 lz4) XATTR_SUPPORT=$(use10 xattr) XZ_SUPPORT=$(use10 xz) + ZSTD_SUPPORT=$(use10 zstd) ) filter-flags -fno-common |