Version Bump

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

3 files changed, 93 insertions, 2 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index b915eb94f7dd..da959cfb7ed0 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/squashfs-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.74 2011/02/06 11:03:19 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.75 2011/03/15 20:47:11 jlec Exp $
+
+*squashfs-tools-4.2 (15 Mar 2011)
+
+  15 Mar 2011; Justin Lecher <jlec@gentoo.org> +squashfs-tools-4.2.ebuild:
+  Version Bump
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> squashfs-tools-3.4.ebuild:
   Drop to ~mips
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 1927423cf798..d3a6d6b9844c 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squashfs-tools-3.3-posix.patch 1596 RMD160 46ea11e6aa28e8c2bc1e2c1835a8af954f6012c3 SHA1 2a56a393efe06a44e9677cd3b40f0d2318236f73 SHA256 9e75c5d8aec9c36dd4096347cd258d957903d1c8f6bec36d98654bb42f868ed8
 AUX squashfs-tools-4.0-progress-bar.patch 1178 RMD160 030db9e54dbf5e893605e5f903d865111ee2af37 SHA1 d5191a51dedf667c3bb5567e0d5640e87fcf2e74 SHA256 c9dcfb9fda91f55bc379e5d55c2fa3f5b869b54a3dd25c80df17157dca6781fa
 AUX squashfs-tools-4.0-read-ret.patch 846 RMD160 e7ae99f8c9184ef3d875a24726cd6159e735ebfc SHA1 2a0e68fa1689417e2574ff0723638d6fdd8aff11 SHA256 ca968e8a2b4d59c1745a2ec1c076b988d675655abd47297bb83a076dfb7fc555
@@ -5,11 +8,20 @@ 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 122763 RMD160 2b5e36866cfac1239deeaf6de77317c7321734af SHA1 c1c0bf64feceebe05919deea241c6053edc7d630 SHA256 7d0de409220df563ad8b21e6fbf7074ca95d45980524311cbf591c99d650d6a2
+DIST squashfs4.2.tar.gz 133173 RMD160 e23a273c91c1d676b72f68d72610c03c430395ec SHA1 e0944471ff68e215d3fecd464f30ea6ceb635fd7 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96
 EBUILD squashfs-tools-3.2_p2.ebuild 1100 RMD160 68a6754754a510fbe05ff8ebcbd41f1e18585a58 SHA1 8b75289069cebd904c1d23f9bdab721eabe9e24f SHA256 5ee4a2f3660dc022d59cfe737bd121ddd7aacc237c91f29834faa698c636a4e3
 EBUILD squashfs-tools-3.4.ebuild 1101 RMD160 efd8335e8ca681a7e375eef0c6d8b688f6d4c5b2 SHA1 9f7797c56a4e6f9f38d9dae025e702fbcd6f6ee0 SHA256 152e87091c76d2312057319cf1f0250154d93eb68ac7f9082cfe729b32ee447d
 EBUILD squashfs-tools-4.0-r1.ebuild 1219 RMD160 88d90da3ffeae9cb6c146ce009de4cd890fbb4ea SHA1 b79cd2e8acd5b51f5bfdc6429db5634752dffac8 SHA256 f1838d495b69398c43cced62ebe89eace39bf2ac869e29b11e11f64b42a3d096
 EBUILD squashfs-tools-4.0.ebuild 1094 RMD160 e4a506f104199ef083a7e8c320a8364b6b07b26b SHA1 d30bb5e1003d0649a21e43d2d501dfb925aa1334 SHA256 378220ac25e92f58bf8dc5e1929939bd7dcae3407d0d3c568f46cd5433aeb50e
 EBUILD squashfs-tools-4.1-r1.ebuild 1860 RMD160 8a36ed9017db69968e2a4f42db4eefe4d12f3101 SHA1 62302a35f0be1879060374b889ab7a254c1e6a44 SHA256 81f6a6c7bfd8743dc4b1e3a6b8aed621361e3951254b2f0671afb434c8cd635a
 EBUILD squashfs-tools-4.1.ebuild 1587 RMD160 c85ad53eed53e6d74f7146633620455242744e8f SHA1 5cc5c3ae6dec6bdfc3d79d785f9873c4e9565ce6 SHA256 1a1c65954afcc51d7a1290cca11c90850ddbca2e01cc70bd5b7009ba3545fe2d
-MISC ChangeLog 12371 RMD160 a28637b58a572d6ed55f989714a399afd6ad019b SHA1 594673f00a53ccaf1cd146f72d171fcfd0886f6a SHA256 2d205cfcdf79e429b9b18965f214686f4ba98bec786f1191bc07c68f0d959db0
+EBUILD squashfs-tools-4.2.ebuild 1938 RMD160 d58973b966d65f6349e673bbbbfb8d5691e9627e SHA1 9b145171d64470f9a1f8794bab6e4643cf49a408 SHA256 967e6b4c7e99a950e85d5df56097980869ac54ae9bf043aa4b78091a76b7a2c2
+MISC ChangeLog 12497 RMD160 9f0c7459d079f3016e73231c3fd828c7e6e4e74e SHA1 c38feb4558acb77359ed0c4387adb632281023b7 SHA256 22485fe6f48dc15ed7f05be83ad7d46ebbcfe384749e163ab96b08ff87da80ba
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1/0FsACgkQgAnW8HDreRZFKgCfZpaccdlCFpB/UU/eSJrzgdYV
+lbMAnRk5Z80e9frnz9injfJEEaHK2vjz
+=+w1/
+-----END PGP SIGNATURE-----
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 000000000000..adf1d86ec991
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/03/15 20:47:11 jlec Exp $
+
+EAPI="2"
+
+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 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
+
+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"
+}