Bump squashfs-tools

4 files changed, 97 insertions, 0 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 15a5f2db..52859cee 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2011; Martin Väth <martin@mvath.de>
+  Bump 4.2_p20121216 from tree; update patch
+
   21 Sep 2012; Martin Väth <martin@mvath.de>
   Bump to EAPI=5
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index f8ac6294..9b3d7ee3 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,4 @@
+DIST squashfs-tools-4.2_p20121216.patch.bz2 36444 SHA256 1c5b9e1e6662e9c4fa08aaa990263003f1bf32d5a5656a341ed4d642a0c01fe5 SHA512 e5d9df92631ac58228673d76e7ec062aaff9af61574aff0d29d4c30cf025239685fac045b5ea60dbfb7a68e822dc075e1eae6f3c3ed40a522c5955999f652994 WHIRLPOOL c5ef44d0ee2becdfeb76767b7bc230be68b75454db632257b2d93f7a247e169173ddfd03f66404caf51b66abbddb6bb9e3cfce80c3f873ac8d4ed625e27b620f
 DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
 DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339
 DIST squashfs4.2.tar.gz 133173 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96 SHA512 4b69c5d3008803347d0ce7628957e3873c9ebd799662b25dfb739afb6a1ce97bdd02b0465ac4d949bc38af2155880ac068209dc638b94e5c86a8011ec3a00de0 WHIRLPOOL c69d403b9775ecebfba02c2ae395b3e5ed8f832caf80417863e5df861b60462b97ac3d10ee027cc96c6f8146450bd8fe8cf715574d41ed47abcc7abc9423ce52
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
new file mode 100644
index 00000000..09d53d68
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
@@ -0,0 +1,29 @@
+--- progressbar.bak/progressbar.c
++++ progressbar.bak/progressbar.c
+@@ -119,19 +119,19 @@
+ 		previous = current;
+ 	}
+ 
+-	printf("\r[");
++	fprintf(stderr, "\r[");
+ 
+ 	while (hashes --)
+-		putchar('=');
++		putc('=', stderr);
+ 
+-	putchar(rotate_list[rotate]);
++	putc(rotate_list[rotate], stderr);
+ 
+ 	while(spaces --)
+-		putchar(' ');
++		putc(' ', stderr);
+ 
+-	printf("] %*lld/%*lld", max_digits, current, max_digits, max);
+-	printf(" %3lld%%", current * 100 / max);
+-	fflush(stdout);
++	fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max);
++	fprintf(stderr, " %3lld%%", current * 100 / max);
++	fflush(stderr);
+ }
+ 
+ 
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild
new file mode 100644
index 00000000..b387278a
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/squashfs/squashfs/squashfs${PV/_p*/}.tar.gz
+	http://dev.gentoo.org/~jer/${P}.patch.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="lzma lzo +progress-redirect xattr +xz"
+
+RDEPEND="
+	sys-libs/zlib
+	xz? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	lzma? ( app-arch/xz-utils )
+	!xz? ( !lzo? ( sys-libs/zlib ) )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/squashfs${PV/_p*/}/squashfs-tools"
+
+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_prepare() {
+	epatch "${WORKDIR}"/${P}.patch
+	use progress-redirect && \
+		epatch "${FILESDIR}/${PN}-4.2_p20121216-progress-stderr.patch"
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC
+	sed -i -r \
+		-e "$(use_sed xz XZ)" \
+		-e "$(use_sed lzo)" \
+		-e "$(use_sed xattr)" \
+		-e "$(use_sed lzma LZMA_XZ)" \
+		Makefile || die
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd .. || die
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.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"
+}