Add lz4 support.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 70 insertions, 6 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index e9b9acbb3655..84e92b5b757f 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/squashfs-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.95 2014/01/23 12:40:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.96 2014/01/27 16:36:46 jer Exp $
+
+*squashfs-tools-4.2_p20140119-r1 (27 Jan 2014)
+
+  27 Jan 2014; Jeroen Roovers <jer@gentoo.org>
+  +squashfs-tools-4.2_p20140119-r1.ebuild, metadata.xml:
+  Add lz4 support.
 
 *squashfs-tools-4.2_p20140119 (23 Jan 2014)
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index b7c850fd29ee..9b9b375aebc0 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -12,13 +12,14 @@ EBUILD squashfs-tools-3.2_p2.ebuild 1100 SHA256 5ee4a2f3660dc022d59cfe737bd121dd
 EBUILD squashfs-tools-3.4.ebuild 1101 SHA256 152e87091c76d2312057319cf1f0250154d93eb68ac7f9082cfe729b32ee447d SHA512 90d76e462ee6b7759943efd22619c82a0da29654a69f875ca8686e419b57bed52af7a77a8e8616b0e3bb92a3f7aa02d39cc7b703b60e4003ff4af6614b314e04 WHIRLPOOL 872bac9f2807c4af5de62c22a679be599aa3ec8ef6e51adbb343971344ebbb0824fcc7e3c44969778b9d92866bc181ef87f23cb7046dd7b0f0ceaf1886f6d12c
 EBUILD squashfs-tools-4.2-r1.ebuild 1469 SHA256 07a7963e89e3785c164f276e42fe5e01e94c7dc255ae34427a9bd7bc7124d452 SHA512 cbd8c215301e0d063f5dcf3049242fd7f2f2c79df17efca71e377dec57605ed21381edcd944474ff21c9da13bcf748242a141947151ffc4b15fb3c142b14671b WHIRLPOOL 297658a6eec918b03040f9a785c9f3f6d1d09484d1328510591c73cb38005469da8ed53b93749be466cf3a70e14a8e29a71576ac03f17c909b23eacc4c9f50c0
 EBUILD squashfs-tools-4.2.ebuild 1396 SHA256 7fed23bab94b6b41c70a7ccb5ab57d22eb8fad9ebe191bade48a292eee2b5d5e SHA512 d2a857c4c7cc04268a906f77afbd82d5f13f4faf42a3a574352a9ee403e8716277499d0fb29bf2caeaa782f5352ad4acbb8bd29ddcb10747f705f61c1a83ba78 WHIRLPOOL c37f0cf29938e081bf01e3badc6a5e41f29af77e6ef33c955af14c54f9c53e187a4ddad22f46782ae86da7feaa166999109546d42cf59ab010ee5a846af31634
+EBUILD squashfs-tools-4.2_p20140119-r1.ebuild 1380 SHA256 56cf23904719ef101b0f6325a65c96370a1adb52759d3e5108a2ee6cef91dbe3 SHA512 bccfef28c06c4a5e912212966b7714cb047081216b0596bad32390121760997190172dfe83f8b4b74944e6a9f72cc5867105647646bb5288ef81b6748f7f0e54 WHIRLPOOL a0b49b5757360b0dbada63160464829edec674bc281cec82c32e22d08ae1efbafce5b48025bfe509cee4b7b9728765934972f0bba6b9a2c59d960999005b2991
 EBUILD squashfs-tools-4.2_p20140119.ebuild 1414 SHA256 11dea05ccfbf5d162fda27fd66e327426f40ee507526f7c1f75d39aa209ce037 SHA512 ab280eb0f2f5bfd384b55570193e46f6be9d4426280074846c7118486a43e8cd18c45dfccf0924b5d9fbd1404712a866421c87bc787b2fc777d8957bc365e8b7 WHIRLPOOL 0a921f928648a86a6b180d716b642e5af47d424fc90f10ad5104c446903c5b8e64871aaf5f2b35c4ee5e9b3cce729b2b5e002184a773e386586692b5d84372f3
-MISC ChangeLog 15772 SHA256 90c658125f0c353fd7020d4345ea7c640f6dba5aec19ec6bd69e04d65d26c8e9 SHA512 e8ef9ff5e38a5200763fa447d64d70cfa649a6e1ddbb3c9b9ed9482dd377b2085cba7b1ab55aaed85d588a044b17721e33bf841e9c815d100b32afa5a301375d WHIRLPOOL 10d6600cebf320f670c4a2a7e05021ad499e5f23d07fc0b836a01db65c30be647745075eef160568935aa3782d7dfae1db5c746be7f96b4c069ba873540bdc94
-MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
+MISC ChangeLog 15944 SHA256 96170ef7771025d2c23e55b354c209d24b2ab58d2ba2938485a55264682d3735 SHA512 71105c965465520defe9c2c49b03a1d17559a07d610a9938749d780e9799ab9747f09bf3c21be70b613a8127dbdee05d5697191d4fdf1e6f95ff35b2d0db784c WHIRLPOOL 09ca368e6f0f646a8f51a90fb9051bbd422963fb3015001c0194f1e0d932f18c3b58462ae146adef86e2882e0d43e79ac9ed6af3485230551d0f3044b1a9c484
+MISC metadata.xml 377 SHA256 f55b4ff997009e1a694f9f78512dcce70e0fd1a111e25e758e6dc57dd19498cc SHA512 0fdc2d9306ee383b9e5220eab84478b19c7c7045909cedc9bfe823ea64e15f31f420062344ed6339dbd73a799b394097ac659d1e8dd6fb5da32f2c8bb0cdb72c WHIRLPOOL 5c57733fba7143afd7fe7351e2d8ae8a41f6ff1d4cdc8bc7152e270835713622303b9671ea2974c90c17e2f797e1b00ce68d80bfb5f396284cf3e8efb2a5cede
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLhDasACgkQVWmRsqeSphMChACbBD/A6GFhnuoP9IBhpqf9vNFh
-/ZQAnij5Dzl5BgMec64zVq4648tCfI3q
-=FQ/a
+iEYEAREIAAYFAlLmix8ACgkQVWmRsqeSphOR/ACffIAVOnOdwZA8qmAIyfUzfvrX
+cS0AnRYCjH+TrsjyLA8eJ1qNnTUBgg75
+=UVTy
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index e1c66a45635b..1e576aae7ef1 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -4,5 +4,6 @@
   <herd>livecd</herd>
   <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>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild
new file mode 100644
index 000000000000..1a739cdf62d3
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild,v 1.1 2014/01/27 16:36:46 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=" ~amd64"
+IUSE="+xz lzma lz4 lzo xattr"
+
+RDEPEND="
+	sys-libs/zlib
+	!xz? ( !lzo? ( sys-libs/zlib ) )
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	xz? ( app-arch/xz-utils )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/squashfs-tools"
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		$(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0)
+		$(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0)
+		$(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0)
+		$(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0)
+		$(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0)
+	)
+
+	tc-export CC
+}
+
+src_compile() {
+	emake ${EMAKE_SQUASHFS_CONF[@]}
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	dodoc ../README
+}
+
+pkg_postinst() {
+	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
+	use xz &&
+		ewarn "XZ support requires a 2.6.38 kernel or better"
+}