Bump squashfs-tools

3 files changed, 85 insertions, 1 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 94f98bcb..7900451b 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  31 Mar 2011; Martin Väth <martin@mvath.de>
+  Bump 4.2 from tree.
+
   03 Jan 2011; Martin Väth <martin@mvath.de>
   Bump to EAPI=4.
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 086b00b0..36b967c0 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -5,9 +5,11 @@ DIST squashfs3.2-r2.tar.gz 314764 RMD160 6f21ad0ee90e4b5c6ad2b0b92c96d24af8e1953
 DIST squashfs3.4.tar.gz 352660 RMD160 e75c9a9e5220e80a8e321536f8fe8372bfe5d830 SHA1 6933a8f3098d94f93ec4002a54026b15a6e11640 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339
 DIST squashfs4.0.tar.gz 103979 RMD160 b67dd14ff7255d245617466566ac29d9a08aff68 SHA1 3efe764ac27c507ee4a549fc6507bc86ea0660dd SHA256 18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21
 DIST squashfs4.1.tar.gz 122769 RMD160 7768e9680a640af851ece8eaa0ae443a69fc2283 SHA1 7f9b1f9839b3638882f636fd170fd817d650f856 SHA256 3a870d065a25b3f5467bc6d9ed34340befab51a3f9e4b7e3792ea0ff4e06046a
+DIST squashfs4.2.tar.gz 133173 RMD160 e23a273c91c1d676b72f68d72610c03c430395ec SHA1 e0944471ff68e215d3fecd464f30ea6ceb635fd7 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
 EBUILD squashfs-tools-3.2_p2-r1.ebuild 1096 RMD160 c92a20d6e39268cd52fd5f822be77218ae53df64 SHA1 87fa5f95ba6a4180c302e08669562d35fc223d90 SHA256 99e0b1a31a62563781066b095d8e7839a827ee5d2fdf5a90fbd67848c85a405a
 EBUILD squashfs-tools-3.4-r1.ebuild 1074 RMD160 f7db1022418c56a1e82f6bb8ca319813bc409478 SHA1 b2f7d9d35d18d4ecdb34d8557d1229f8c48718a6 SHA256 3f61c30cf4bc5391b33a8dfe79c98d6e9513abb49ab3eba8ead236317b8316e4
 EBUILD squashfs-tools-4.0-r1.ebuild 1068 RMD160 73bd761bcb6f55c909c4297cff5cde520e9deedc SHA1 79084cf14fbb6b6bf712bccc32199737c799eac3 SHA256 43ac4d7c3f279911460164ecd0e9e88ded5a3eb1d14d5c257ee7cc950380ce8c
 EBUILD squashfs-tools-4.1-r1.ebuild 1617 RMD160 16e8d503715377af1100dcc93bbaf7ff46874f9e SHA1 cc441d50f31b62a3c1c5fc92529251c363e5b237 SHA256 5ab19f5ecbbb73c06fe25bc67cc2be53ca6f794da45551bbc997b864b736cba6
-MISC ChangeLog 637 RMD160 83631f4aa4bf80ac0916129538a9e16a85384389 SHA1 c0403fd630c27a9d850a40dfdbf7e4f0d7616b15 SHA256 dfb009016ab1979ae41a9596ceadfe268e2804b1d6e37a3f284e218c3e7ec85a
+EBUILD squashfs-tools-4.2.ebuild 1951 RMD160 4db3f58f6da3c15657b36651bd75aec985a3c6e9 SHA1 dc224d9aa3a12aab2f3f42a2983ff570ee47a213 SHA256 f62c3a4dd80b516db47cc287280b938b072546ec525f3c4fb5085cd2a6ea2f71
+MISC ChangeLog 724 RMD160 765567b91f06c51844045ca3afef92996713cc4d SHA1 b667439725cb0516a09997072a890b8de902e438 SHA256 c23251f088042ce4e4480aa965f4e5851d0341c61c730f59ecb15627cf1056e6
 MISC metadata.xml 431 RMD160 c7ccbb800d3ac8606a3edf90fec3a501afab018e SHA1 81f9701f070043f1e505ea804b42d73cf5490dab SHA256 eda5db4e930c106c63cf8402fce9b70c009d73ccd4698620687639c38f75c49c
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
new file mode 100644
index 00000000..0e2f7367
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV}
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+gzip +lzma lzo +progress-redirect xattr"
+
+RDEPEND="
+	gzip? ( sys-libs/zlib )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	!lzma? ( !lzo? ( sys-libs/zlib ) )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_prepare() {
+	use progress-redirect && \
+		epatch "${FILESDIR}/${PN}-4.0-progress-stderr.patch"
+}
+
+use_sed() {
+	local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT"
+	printf '/^#?%s =/%s\n' "${s}" \
+		"$( use $u && echo s:.*:${s} = 1: || echo d )"
+}
+
+src_configure() {
+	tc-export CC
+	local def
+	if [[ -n ${SQUASH_FS_DEFAULT_COMP} ]]; then
+		def=${SQUASH_FS_DEFAULT_COMP}
+	else
+		einfo "You can set the default compression (gzip, xz or lzo) by exporting SQUASH_FS_DEFAULT_COMP"
+		if use gzip; then
+			def="gzip"
+		elif use lzma; then
+			def="xz"
+		elif use lzo; then
+			def="lzo"
+		else
+			die "Please set at least one of the gzip, lzma and lzo USE flags as compression algorithm."
+		fi
+	fi
+
+	einfo "Using ${def} as compression algorithm."
+
+	sed -i -r \
+		-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \
+		-e "$(use_sed gzip)" \
+		-e "$(use_sed lzma XZ)" \
+		-e "$(use_sed lzo)" \
+		-e "$(use_sed xattr)" \
+		Makefile || die
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs || die
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
+}
+
+pkg_postinst() {
+	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
+	use lzma &&
+		ewarn "XZ support requires a 2.6.38 kernel or better"
+}