Die sooner (and explain why) when no compression USE flag is set (bug #352861). Fix USE=-lzma case (it tried to fix xz_SUPPORT in the Makefile instead of XZ_SUPPORT, so it would always link against liblzma or die if not found).

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

3 files changed, 84 insertions, 13 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index da5cbe9ecbfc..344bafc49f7c 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/squashfs-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.72 2010/11/14 13:49:59 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.73 2011/01/31 02:53:19 jer Exp $
+
+*squashfs-tools-4.1-r1 (31 Jan 2011)
+
+  31 Jan 2011; Jeroen Roovers <jer@gentoo.org> +squashfs-tools-4.1-r1.ebuild:
+  Die sooner (and explain why) when no compression USE flag is set (bug
+  #352861). Fix USE=-lzma case (it tried to fix xz_SUPPORT in the Makefile
+  instead of XZ_SUPPORT, so it would always link against liblzma or die if not
+  found).
 
   14 Nov 2010; Justin Lecher <jlec@gentoo.org> squashfs-tools-3.2_p2.ebuild,
   squashfs-tools-3.4.ebuild, squashfs-tools-4.0.ebuild,
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index f1e1b46016fa..776b66e18b82 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,6 +1,3 @@
------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
@@ -12,13 +9,7 @@ EBUILD squashfs-tools-3.2_p2.ebuild 1100 RMD160 68a6754754a510fbe05ff8ebcbd41f1e
 EBUILD squashfs-tools-3.4.ebuild 1100 RMD160 394015c25289442004106b4d8dcce1ca3ab63fb3 SHA1 18101e1c987f4dfa805916eeb3c25306a5ca9c00 SHA256 f4b0b1d75cdfdacfce27508a42b5bdfc66cca2cd0dc8a419373b55a9bd1424ab
 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 11927 RMD160 9700ddd5c585b543c8ed2937e4d2154c5420c4e6 SHA1 66642483b1bc4f5304172dc1b4d97ce06f9252d6 SHA256 11bb0e4a2fc0a85d6c46b111260569d5a407782f3b9fe9da89e8a4ee7349527f
+MISC ChangeLog 12279 RMD160 88d869f45654564fd59622f71208d35205a3bbf5 SHA1 bd6f199d316aba87e4d2daa91d0a844bf724f709 SHA256 4021726393db568d9adad80d3b40f3d4ed6b2a6094a9a899d4384cb1d4bc8046
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzf6QwACgkQgAnW8HDreRbIZwCfaMm0MdslW1r2WtK+QXrL/anM
-PiEAmgNROwPE7qPsFqCn7puaoP3/9hrJ
-=qGPt
------END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild
new file mode 100644
index 000000000000..7525627cba4f
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.1-r1.ebuild,v 1.1 2011/01/31 02:53:19 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+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
+
+src_prepare() {
+	sed -i \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e '/^LIBS =/s:$: $(LDFLAGS):' \
+		Makefile || die
+}
+
+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 use gzip; then def="gzip"
+		einfo "enabling gzip"
+	elif use lzma; then def="lzma"
+		einfo "enabling lzma"
+	elif use lzo; then def="lzo"
+		einfo "enabling lzo"
+	else
+		die "Please set at least one of the gzip, lzma and lzo USE flags as compression algorithm."
+	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"
+}