Version bump.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 70 insertions, 6 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index b05a977da65b..4e7689dbddba 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2010/09/20 02:03:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.70 2010/09/20 02:54:19 vapier Exp $
+
+*squashfs-tools-4.1 (20 Sep 2010)
+
+  20 Sep 2010; Mike Frysinger <vapier@gentoo.org> +squashfs-tools-4.1.ebuild,
+  metadata.xml:
+  Version bump.
 
 *squashfs-tools-4.0-r1 (20 Sep 2010)
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 5dfaf0bd7b91..90b2dafe74f9 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -7,16 +7,18 @@ AUX squashfs-tools-4.0-read-ret.patch 846 RMD160 e7ae99f8c9184ef3d875a24726cd615
 DIST squashfs3.2-r2.tar.gz 314764 RMD160 6f21ad0ee90e4b5c6ad2b0b92c96d24af8e19531 SHA1 e38c16c09435291b2c97aa0a321c29da442ff686 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
 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
 EBUILD squashfs-tools-3.2_p2.ebuild 1095 RMD160 183da75ffb969db6643876ac210b3da24fcd5862 SHA1 c7b8541bc6ee289483e15a0e2c3c19124286311f SHA256 d15c128da2c5cdc64a4376e468cf5f04289c7d9408b4c04fbb9a434d2e865bcb
 EBUILD squashfs-tools-3.4.ebuild 1095 RMD160 e08fe76143ca1af554806eb8eb3cd3f55021b651 SHA1 34b3e4eebf02b912f4dc7fa894239093037e2603 SHA256 5b66ce00377cd0d4e0cd1628de4cc9e1340e80685d41d6f36166e1f258cb3237
 EBUILD squashfs-tools-4.0-r1.ebuild 1214 RMD160 b5651766c212798115cfbf4081b48e451916e065 SHA1 53c0fd207d2000d180f7f53776aafa639554cc53 SHA256 d8cea6efce7725cfec993dbc5eae1669b289f4b5fd85fd7f12fcdada0f828773
 EBUILD squashfs-tools-4.0.ebuild 1089 RMD160 a80aba63e0cd09dc748ddcfa5211e3051f643397 SHA1 a3fa0234c2d8cc463ff6b49bcdf3607ffab0339b SHA256 8dbc239955176e66eac70075d0e581c0407bfea5b6ed2b4fe0c7e6a81ec78faf
-MISC ChangeLog 11357 RMD160 afcb2ba7c3a03f94639070925ccb21ee6fb8d100 SHA1 4926b8437893f33c8157db23ba83a3e3bedb906c SHA256 bdf2534763a278667c5bc80dcd1d9efe254ba7764536223f325777edc5e006ae
-MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
+EBUILD squashfs-tools-4.1.ebuild 1519 RMD160 c8a0b82c94fcba38d410e0b598d5aa7de0bd9d39 SHA1 59e2cd35f18c1705f7053ecc4be98cd8780edf81 SHA256 598acc54c2ea5bdcb32af19c5c52b529379a361393061ea2c67867d33afe740c
+MISC ChangeLog 11503 RMD160 1b0bf572ed6f0b774c8f683fd06fe3628ff46c95 SHA1 716bc227cc39a288cd5425ce81f7fcbb6ab7dd67 SHA256 a029f91b1d40dd46c4943a15c2f83e63624299112371f3b0565e2d8d74c043bc
+MISC metadata.xml 223 RMD160 43b2b47bbb77575000db614e24a9432af94c34e5 SHA1 9794744a810f817a5abb31e781cc50d727eed5e5 SHA256 81637528b0885afa17c3579bc78faaeb1f0e4c79f9414f0ded76a5954b5d6978
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyWwOkACgkQTwhj9JtAlp7H2QEAvu8pJBc0xf4SAYXVedrTgDA7
-ikihyBl3JIa4I2pg8JcBALbGdh3iRY5RCoAgRJh61vnMtkf6HPEyNM0JjBTJKgtP
-=hn5e
+iF4EAREIAAYFAkyWzMwACgkQTwhj9JtAlp4e3gD+LC9z48F7lLLGX0gqP+reWmgR
+y4KSwAWNXn0xp1SuLzoBAMVlBy27g+Jwd5oiysRiBtjG6bRAUCoEhpJDvldbw+RN
+=XzC9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 88653ddd7172..fc4813cbc08b 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>livecd</herd>
+<use>
+ <flag name="lzma">Support LZMA compression</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild
new file mode 100644
index 000000000000..8f0b59c9ff09
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 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.ebuild,v 1.1 2010/09/20 02:54:19 vapier 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 ) )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
+
+src_prepare() {
+	sed -i \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e '/^LIBS =/s:$: $(LDFLAGS):' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	local def=`usev gzip || usev lzma || usev lzo || echo gzip`
+	sed -i -r \
+		-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \
+		-e "/^#?GZIP_SUPPORT =/`use gzip && echo s:.*:GZIP_SUPPORT=1: || echo d`" \
+		-e "/^#?XZ_SUPPORT =/`use lzma && echo s:.*:XZ_SUPPORT=1: || echo d`" \
+		-e "/^#?LZO_SUPPORT =/`use lzo && echo s:.*:LZO_SUPPORT=1 :|| echo d`" \
+		Makefile || die
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs || die
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README
+}
+
+pkg_postinst() {
+	ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
+}