Add old LZMA support back by Wicher Minnaard (bug #412575).

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

4 files changed, 70 insertions, 7 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 1f3b1143e7ec..ac2b4b78d719 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.84 2012/03/25 16:01:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.85 2012/04/19 01:59:06 jer Exp $
+
+*squashfs-tools-4.2-r1 (19 Apr 2012)
+
+  19 Apr 2012; Jeroen Roovers <jer@gentoo.org> +squashfs-tools-4.2-r1.ebuild,
+  metadata.xml:
+  Add old LZMA support back by Wicher Minnaard (bug #412575).
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> squashfs-tools-4.2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #400937
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 1941b49dd96a..60cf424f1399 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -15,13 +15,14 @@ EBUILD squashfs-tools-4.0-r1.ebuild 1219 RMD160 88d90da3ffeae9cb6c146ce009de4cd8
 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
+EBUILD squashfs-tools-4.2-r1.ebuild 1459 RMD160 530ecac13392356da3d3f8df5b91cb7921227100 SHA1 e9b0ef5c9c04943340e3666b28d745a7e0c9cef6 SHA256 d7106ba31f523cad0bf06c8c1470fed610253d83866ba73f14d6a7635d701645
 EBUILD squashfs-tools-4.2.ebuild 1392 RMD160 60913bae587cef08a83a27195d483ab4c6a4afcf SHA1 b92f9fe801f729dc670eea35893cb2473f4bc3db SHA256 488cae0eda2e7bd8f99446acdd128e2f11c7b8014875a88d730460fa1c00312c
-MISC ChangeLog 13594 RMD160 01293835c35132b47239f98d320d75e2e3a9c83c SHA1 3515e419d78d893281c2121130d4aa6dc71e2da3 SHA256 0bdfb6b1d6d0b753d67b7ce2eb419b720c264bc1eaff6fbf569fb8439032d1bf
-MISC metadata.xml 264 RMD160 28be31cf8eb86568a6d67a1862e5e9f72d17581a SHA1 315bf6ca8a5f88eff498063c7e203c3d187c69c2 SHA256 89f131635accd08198082c1160471132f279e1a83180c4ebc8ee42eca3f69134
+MISC ChangeLog 13785 RMD160 951f838fe61dd4299f94fdf1f9d33135f06bcdec SHA1 9a64fd3702847599258baedb08252b3a6d2fc47e SHA256 5ed4012aeef092d6042564e7d3dda54c76d5a77f9b83c7ce107374d9d807b062
+MISC metadata.xml 284 RMD160 99adad00b2ae9d2123ed2b4b97dec71c3308e18c SHA1 59786a2a1e4b018882404147cb4203ec245f380f SHA256 a1f9f9e9ca6f7e047a7c84f8aac4585eada59fc157df5b0dde9dc0a938e4c836
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9vQWsACgkQuQc30/atMkBhqgCcCKIf7fcoUYyUDaui9Jn6wutX
-O7UAnAgDS0LMF9IwjnSXz6UqpWbUxmK+
-=80Sw
+iEYEARECAAYFAk+PcXAACgkQVWmRsqeSphOSJwCggJjoCghztSimJhOWYHE4pzFb
+wx4AmwX6GUCTulVS1xZFl1Lj2oHc2uX7
+=HOhi
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 4fa39b668ac7..4bdd2fd59401 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>livecd</herd>
 <use>
-<flag name="xz">Enable support for XZ compression using <pkg>app-arch/xz-utils</pkg></flag>
+<flag name="xz">Enable support for XZ (&quot;LZMA2&quot;) compression using <pkg>app-arch/xz-utils</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
new file mode 100644
index 000000000000..83ba557f834e
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/04/19 01:59:06 jer Exp $
+
+EAPI=4
+
+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="+xz lzma lzo xattr"
+
+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${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
+	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"
+}