Bump squashfs-tools, squashmount. Use mksquashfs -quiet patch

17 files changed, 80 insertions, 417 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index c77269fc..6bea736b 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2014; Martin Väth <martin@mvath.de>:
+  Bump 4.3. Use patch for quiet, unconditionally, instead of progress-stderr.
+  Remove older ebuilds
+
   04 May 2014; Martin Väth <martin@mvath.de>:
   Bump 4.2_p20140119 from tree; update patch; filter -fno-common
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 5768bc55..3b184315 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,4 +1 @@
-DIST squashfs-tools-4.2_p20140119.tar.xz 119496 SHA256 007382c4be734f923b7a0964c378b665d924adfd5537922452c455c0a2d4d20a SHA512 016c79000bb775c3ffb0a8eb9eefe11f9a82a0cd40be44b42c0c16f4184c4113538947d3677956f97313797ed9a7645380d05586afb0f6bd392cb4652e9fbe14 WHIRLPOOL 12ebdbb78053f0cc6863d1801ab964c0460966667a24f0eca39a63d73a5a313291981a39c5b6f539c33f0eb65ff34d7bbc00a06ae256173f9c4177fbfa3aacab
-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
+DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch
deleted file mode 100644
index 0392ba24..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -1832,17 +1832,17 @@
- 	if(!progress || columns - used < 0)
- 		return;
- 
--	printf("\r[");
-+	fprintf(stderr, "\r[");
- 
- 	while (hashes --)
--		putchar('=');
-+		putc('=', 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/files/squashfs-tools-3.4-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch
deleted file mode 100644
index 422d7c2b..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -2254,26 +2254,26 @@
- 	int spaces = columns - used - hashes;
- 
- 	if(current > max) {
--		printf("%lld %lld\n", current, max);
-+		fprintf(stderr, "%lld %lld\n", current, max);
- 		return;
- 	}
- 
- 	if(columns - used < 0)
- 		return;
- 
--	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/files/squashfs-tools-4.0-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch
deleted file mode 100644
index 832a17e2..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 1/squashfs-tools/mksquashfs.c
-+++ 1/squashfs-tools/mksquashfs.c
-@@ -2570,19 +2570,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/files/squashfs-tools-4.2_p20121216-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
deleted file mode 100644
index dd0c2279..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20121216-progress-stderr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 1/progressbar.c
-+++ 1/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/files/squashfs-tools-4.2_p20140119-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch
deleted file mode 100644
index 5ab05bda..00000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.2_p20140119-progress-stderr.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- progressbar.c.bak/progressbar.c.bak
-+++ progressbar.c.bak/progressbar.c
-@@ -56,8 +56,8 @@
- {
- 	struct winsize winsize;
- 
--	if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
--		if(isatty(STDOUT_FILENO))
-+	if(ioctl(2, TIOCGWINSZ, &winsize) == -1) {
-+		if(isatty(STDERR_FILENO))
- 			ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 "
- 				"columns\n");
- 		columns = 80;
-@@ -108,7 +108,7 @@
- 		return;
- 
- 	if(tty == -1)
--		tty = isatty(STDOUT_FILENO);
-+		tty = isatty(STDERR_FILENO);
- 	if(!tty) {
- 		static long long previous = -1;
- 
-@@ -122,19 +122,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);
- }
- 
- 
-@@ -180,8 +180,8 @@
- 	struct itimerval itimerval;
- 	struct winsize winsize;
- 
--	if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
--		if(isatty(STDOUT_FILENO))
-+	if(ioctl(2, TIOCGWINSZ, &winsize) == -1) {
-+		if(isatty(STDERR_FILENO))
- 			ERROR("TIOCGWINSZ ioctl failed, defaulting to 80 "
- 				"columns\n");
- 		columns = 80;
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
new file mode 100644
index 00000000..c4fe57de
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
@@ -0,0 +1,56 @@
+--- 1/squashfs-tools/mksquashfs.c
++++ 1/squashfs-tools/mksquashfs.c
+@@ -78,6 +78,7 @@
+ #include "process_fragments.h"
+ 
+ int delete = FALSE;
++int quiet = FALSE;
+ int fd;
+ struct squashfs_super_block sBlk;
+ 
+@@ -4169,7 +4170,7 @@
+ 
+ 	main_thread = pthread_self();
+ 
+-	printf("Parallel mksquashfs: Using %d processor%s\n", processors,
++	quiet || printf("Parallel mksquashfs: Using %d processor%s\n", processors,
+ 			processors == 1 ? "" : "s");
+ 
+ 	/* Restore the signal mask for the main thread */
+@@ -4687,6 +4688,9 @@
+ 	total_bytes += total_inode_bytes + total_directory_bytes +
+ 		sizeof(struct squashfs_super_block) + total_xattr_bytes;
+ 
++	if(quiet)
++		return;
++
+ 	printf("\n%sSquashfs %d.%d filesystem, %s compressed, data block size"
+ 		" %d\n", exportable ? "Exportable " : "", SQUASHFS_MAJOR,
+ 		SQUASHFS_MINOR, comp->name, block_size);
+@@ -5259,6 +5263,9 @@
+ 		else if(strcmp(argv[i], "-noappend") == 0)
+ 			delete = TRUE;
+ 
++		else if(strcmp(argv[i], "-quiet") == 0)
++			quiet = TRUE;
++
+ 		else if(strcmp(argv[i], "-keep-as-directory") == 0)
+ 			keep_as_directory = TRUE;
+ 
+@@ -5351,6 +5358,7 @@
+ 				"using recovery file <name>\n");
+ 			ERROR("-no-recovery\t\tdon't generate a recovery "
+ 				"file\n");
++			ERROR("-quiet\t\t\tno verbose output\n");
+ 			ERROR("-info\t\t\tprint files written to filesystem\n");
+ 			ERROR("-no-progress\t\tdon't display the progress "
+ 				"bar\n");
+@@ -5541,7 +5549,7 @@
+ 		void *comp_data = compressor_dump_options(comp, block_size,
+ 			&size);
+ 
+-		printf("Creating %d.%d filesystem on %s, block size %d.\n",
++		quiet || printf("Creating %d.%d filesystem on %s, block size %d.\n",
+ 			SQUASHFS_MAJOR, SQUASHFS_MINOR, argv[source + 1], block_size);
+ 
+ 		/*
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 9b164e24..1e576aae 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>livecd</herd>
-	<maintainer>
-		<email>martin@mvath.de</email>
-		<name>Martin Väth</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="progress-redirect">Redirect printing of progress bar to stderr. This gives a nicer output if used from scripts like sys-fs/squash_dir</flag>
-	</use>
+  <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-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
deleted file mode 100644
index 4f6f78c4..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-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="3.0" # squashfs filesystem version
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+progress-redirect"
-
-RDEPEND="sys-libs/zlib"
-
-S="${WORKDIR}/squashfs${MY_PV}/squashfs-tools"
-
-src_prepare() {
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die "sed failed"
-	use progress-redirect && \
-		epatch "${FILESDIR}/${PN}-3.3-progress-stderr.patch"
-	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT} || die
-	newbin unsquashfs unsquashfs-${SLOT} || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
deleted file mode 100644
index 9b0acda2..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-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="3.1" # squashfs filesystem version
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="+progress-redirect"
-
-RDEPEND="sys-libs/zlib"
-
-S="${WORKDIR}/squashfs${MY_PV}/squashfs-tools"
-
-src_prepare() {
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die "sed failed"
-	use progress-redirect && \
-		epatch "${FILESDIR}/${P}-progress-stderr.patch"
-	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT} || die
-	newbin unsquashfs unsquashfs-${SLOT} || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
deleted file mode 100644
index 7723ce91..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-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 ~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 )
-	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"
-	epatch_user
-}
-
-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
-	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"
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index 1dbb2726..a992d0f6 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -5,14 +5,14 @@
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+DESCRIPTION="Tool for creating compressed filesystem type squashfs. Patched to support -quiet"
 HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86"
-IUSE="+xz lzma lz4 lzo xattr +progress-redirect"
+IUSE="+xz lzma lz4 lzo xattr"
 
 RDEPEND="
 	sys-libs/zlib
@@ -25,11 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}/squashfs-tools"
+S="${WORKDIR}/squashfs${PV}/${PN}"
 
 src_prepare() {
-	use progress-redirect && \
-		epatch "${FILESDIR}/${P}-progress-stderr.patch"
+	epatch "${FILESDIR}/${P}-quiet.patch"
 	epatch_user
 }
 
@@ -53,6 +52,7 @@ src_compile() {
 
 src_install() {
 	dobin mksquashfs unsquashfs
+	dodoc ../README
 }
 
 pkg_postinst() {
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
index 8d835515..3363d3d8 100644
--- a/sys-fs/squashmount/ChangeLog
+++ b/sys-fs/squashmount/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squashmount-6.1 (08 Jun 2014)
+
+  08 Jun 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Note that $squash_verbose meaning changed!
+  It is recommended to use squashmount with -quiet patch from mv overlay
+
 *squashmount-6.0a (21 May 2014)
 
   21 May 2014; Martin Väth <martin@mvath.de>:
diff --git a/sys-fs/squashmount/Manifest b/sys-fs/squashmount/Manifest
index 4f602284..f9248479 100644
--- a/sys-fs/squashmount/Manifest
+++ b/sys-fs/squashmount/Manifest
@@ -1,2 +1 @@
-DIST squashmount-6.0.tar.gz 40089 SHA256 33167386a86ca6eabeee46a3bc06ec1c9f64305afd978378c36ab2b24c2a3220 SHA512 ef09f674d8dd84563e6911248e40187c80082705f0b6b3638c1e8c513df9bf822778d811a26dd7d4ab61c28202f8f606e4c4f295231e95becaf9c15bfaeda99f WHIRLPOOL 53d6410daaa990347c052e0194fa26d9799b2b55481357df783cf66236bf694122b2ef1e8b5b027cc6274cb4065ffa3f0d5537d82e7d7a5a3d9ac0b5828811e2
-DIST squashmount-6.0a.tar.gz 40133 SHA256 a7dbdaa23240f77719f6fe9704c1b8dd6692680ac137c00f1ec5006b722e118c SHA512 96a610c6aae2f40a2bdf71ba0e781ba12785a696401ea895a3b8a0a801c20aee267bae8782e1902d5fbd0bd5d4b6901ed86166ff3fe40c9c7047e3dce6264bc8 WHIRLPOOL 0a828d36499823e0edc4d3c9ebe87d25d5b6c2e3cd8e679d5033dae4cb75903763e466b2e7dbc6d8ba32370a46f78a6c856385150888d7c602a8d0b50d38828c
+DIST squashmount-6.1.tar.gz 40467 SHA256 232aa983661ef06fe9f5a7baa0879ab72f8ca41855422662815943978d72c8d5 SHA512 89ddb95fc9e56ed65f3ed528c9d059eeae061c59e8c4288874f2e5413976a8bb2074ce9d314360dc1a783b6d522eda705109fd8c3ac9ae82b438cb773d5f3684 WHIRLPOOL 4e2fa412de7bc932e53864968cb5b0f78c4c0a175ded5204dd69c27ae2061e586c72a8ba908fafcd99eb955e2809a47fc3b44af5594b7903487edaf4d05ea49e
diff --git a/sys-fs/squashmount/squashmount-6.0.ebuild b/sys-fs/squashmount/squashmount-6.0.ebuild
deleted file mode 100644
index e6424f30..00000000
--- a/sys-fs/squashmount/squashmount-6.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-RESTRICT="mirror"
-inherit eutils readme.gentoo systemd vcs-snapshot
-
-DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
-HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
-SRC_URI="https://github.com/vaeth/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=app-shells/runtitle-2.3
-	dev-lang/perl
-	|| ( dev-perl/File-Which sys-apps/which )
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	sys-fs/squashfs-tools
-	!<sys-fs/unionfs-fuse-0.25"
-DEPEND=""
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="Please adapt /etc/squashmount.pl to your needs.
-It is recommended to put into your zshrc the line:
-alias squashmount='noglob squashmount'"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-		-- bin/* || die
-	epatch_user
-}
-
-src_install() {
-	dobin bin/*
-	dodoc README ChangeLog compress.txt
-	doinitd openrc/init.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc
-	doins etc/*
-	insinto /usr/lib/tmpfiles.d
-	doins tmpfiles.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "improved output" 'sys-fs/squashfs-tools[progress-redirect]'
-	optfeature "status bar support" 'app-shells/runtitle'
-	optfeature "improved compatibility and security" 'dev-perl/File-Which'
-	optfeature "colored output" '>=dev-lang/perl-5.14' 'perl-core/Term-ANSIColor'
-	optfeature "using ? or ?? attributes" '>=dev-lang/perl-5.12' 'virtual/perl-IO-Compress'
-	case " ${REPLACING_VERSIONS}" in
-	' '[0-9][0-9]*|' '[3-9]*|' '2.[0-9][0-9]*|' '2.[7-9]*)
-		:;;
-	*)
-		FORCE_PRINT_ELOG="true";;
-	esac
-	readme.gentoo_pkg_postinst
-}
diff --git a/sys-fs/squashmount/squashmount-6.0a.ebuild b/sys-fs/squashmount/squashmount-6.1.ebuild
index ed9d9899..a20304c2 100644
--- a/sys-fs/squashmount/squashmount-6.0a.ebuild
+++ b/sys-fs/squashmount/squashmount-6.1.ebuild
@@ -28,6 +28,7 @@ DEPEND=""
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="Please adapt /etc/squashmount.pl to your needs.
+For improved output use squasfs-tools from the mv overlay.
 It is recommended to put into your zshrc the line:
 alias squashmount='noglob squashmount'"
 
@@ -53,7 +54,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "improved output" 'sys-fs/squashfs-tools[progress-redirect]'
 	optfeature "status bar support" 'app-shells/runtitle'
 	optfeature "improved compatibility and security" 'dev-perl/File-Which'
 	optfeature "colored output" '>=dev-lang/perl-5.14' 'perl-core/Term-ANSIColor'