sys-fs/squashfs-tools: Version bump, following Fedora, #479904

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 87 insertions, 21 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index f0264018ea1e..d89adea989c1 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.90 2014/01/18 11:37:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.91 2014/01/21 10:25:49 jlec Exp $
+
+*squashfs-tools-4.3_pre20130621 (21 Jan 2014)
+
+  21 Jan 2014; Justin Lecher <jlec@gentoo.org>
+  +squashfs-tools-4.3_pre20130621.ebuild, metadata.xml:
+  Version bump, following Fedora, #479904
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> squashfs-tools-4.2-r1.ebuild,
   squashfs-tools-4.2.ebuild, squashfs-tools-4.2_p20121216.ebuild:
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d8176ebbc7b3..ed6588f2a067 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX squashfs-tools-3.3-posix.patch 1596 SHA256 9e75c5d8aec9c36dd4096347cd258d957903d1c8f6bec36d98654bb42f868ed8 SHA512 6f934c3b20ada2ba689cc791fe5d1eaa570050653049604c50f712df7455aab228e93e3e378740f1d8f67e273dc9f6ebd8784004bd3a6806c3ee675f8efb2630 WHIRLPOOL 957bc352bcb49eb10d8c4ab730a000f2502a5209c75988959415536767d1976a5a6667a81dec2742e6a7927fb31486224f375f47d408b11b888d1a678725490b
 AUX squashfs-tools-4.0-progress-bar.patch 1178 SHA256 c9dcfb9fda91f55bc379e5d55c2fa3f5b869b54a3dd25c80df17157dca6781fa SHA512 9024dfbc8b7a617739af3844fdb7566432c44b43db6650b53a81703e2e6c72711a3551ba0886a25d1aa53074f038db5b9d27140e82e8972e12c1ddedc5eb46d9 WHIRLPOOL 31e7d2f8d8d5353556466ce3d9da4cc958717b9b1b62db92eae03dcd354c5a2a0d6dac77dab63dc3e97b8f87283a6dc0c9d282f323f77481439a665cceb4d966
 AUX squashfs-tools-4.0-read-ret.patch 846 SHA256 ca968e8a2b4d59c1745a2ec1c076b988d675655abd47297bb83a076dfb7fc555 SHA512 5d619bbdebfe5162493bf6866de59cf828e2817a46ba9004527f37be8ac30bcc6f9a86264aeaa83d8649652b765805e1a9350955c817129d2addbe74e05305d2 WHIRLPOOL df3a43b40ade09c0552e26389eb2f0546ddb91749103f6b83fe097a896e4a387a1dfbaff8c4cbe099b5ee59d0c0f7f74ed08917644e737fea49d5f3859ce34a0
 DIST squashfs-tools-4.2_p20121216.patch.bz2 36444 SHA256 1c5b9e1e6662e9c4fa08aaa990263003f1bf32d5a5656a341ed4d642a0c01fe5 SHA512 e5d9df92631ac58228673d76e7ec062aaff9af61574aff0d29d4c30cf025239685fac045b5ea60dbfb7a68e822dc075e1eae6f3c3ed40a522c5955999f652994 WHIRLPOOL c5ef44d0ee2becdfeb76767b7bc230be68b75454db632257b2d93f7a247e169173ddfd03f66404caf51b66abbddb6bb9e3cfce80c3f873ac8d4ed625e27b620f
+DIST squashfs-tools-4.3_pre20130621.tar.xz 115988 SHA256 aa734ba5d4558e91f21233ad375ab43635fda319b3bd033f1556ecf27cbd503a SHA512 14f91bc512c01b459f764866ac0f5f26e6aea85ebc90e6d86141fa0078264f13bfdf4a2d0e054d0ea028278c14a38affea9342aa01d22bc5e688ace0a8127139 WHIRLPOOL a5f0ee4aa681128ace588f2ef0b2883cd0cb67f724f8930aec1a9ecd03f08c5cc721c6bee03b912c3bf7a403ba424f968ce4d0c0678da4d292212cc3347bd7ce
 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
@@ -13,22 +14,23 @@ EBUILD squashfs-tools-3.4.ebuild 1101 SHA256 152e87091c76d2312057319cf1f0250154d
 EBUILD squashfs-tools-4.2-r1.ebuild 1469 SHA256 07a7963e89e3785c164f276e42fe5e01e94c7dc255ae34427a9bd7bc7124d452 SHA512 cbd8c215301e0d063f5dcf3049242fd7f2f2c79df17efca71e377dec57605ed21381edcd944474ff21c9da13bcf748242a141947151ffc4b15fb3c142b14671b WHIRLPOOL 297658a6eec918b03040f9a785c9f3f6d1d09484d1328510591c73cb38005469da8ed53b93749be466cf3a70e14a8e29a71576ac03f17c909b23eacc4c9f50c0
 EBUILD squashfs-tools-4.2.ebuild 1396 SHA256 7fed23bab94b6b41c70a7ccb5ab57d22eb8fad9ebe191bade48a292eee2b5d5e SHA512 d2a857c4c7cc04268a906f77afbd82d5f13f4faf42a3a574352a9ee403e8716277499d0fb29bf2caeaa782f5352ad4acbb8bd29ddcb10747f705f61c1a83ba78 WHIRLPOOL c37f0cf29938e081bf01e3badc6a5e41f29af77e6ef33c955af14c54f9c53e187a4ddad22f46782ae86da7feaa166999109546d42cf59ab010ee5a846af31634
 EBUILD squashfs-tools-4.2_p20121216.ebuild 1586 SHA256 e162fcd2728de82f8eb3ec2a52e9c7b00786e07df4e6a982bf964cedfd147458 SHA512 c2b0e229effc88af10319d5179ffe81d2949ed4397513d510fb54611bd7472838e02935b6f53956b51cb3d4f320ea9539be991f9abf530cecac629326330e9ab WHIRLPOOL bd6bb9f5aa282ed8774ff7a9731adc596f8c6b6546b4f62b34f0b5e5a0772ad786159b30e92d83f0a743eb4d56f66ba9791b052682c82a2f520c8bf64fbf163a
-MISC ChangeLog 14552 SHA256 b6f3489a780f8e7cd2dee82e20a9a8fb49bbca73b0612feb0a2fd7cc286425ff SHA512 e503448c50bb9512b5617b33e1ebb155bc3bc8e465fab0ab9aeb464490b4dbed137fd3a290de0b9b78cc4defbfe70aa84192f89042273e0705c7d404c5920a7e WHIRLPOOL 5dca4efd1de4651c1741c46a41bbd410cb8757bc9628cc6c82266810c53ebc8d37a63efd3d2f6ff7045079433c59c000927c6a31ddf347e510997cd0d32f30d7
-MISC metadata.xml 279 SHA256 633025af589c2fc297e429b2aafea644134268b2ffdfcf0ea43e00ed98d56e85 SHA512 4f451db9aea7e8228bcd309e2f6ad95f74b3a0bfeb9ed5a8a23621e883a839ecec26b9655644e974b091d81c12935429c63cfbabb59b5e1ba438f974e11363ef WHIRLPOOL 94e0d90869a020908691076f57f9d841a3834cac4c799cca871867624e09afb932f644482b351d3711d3eb07400b3f3d4260280a92d43241c724df6c7430b0db
+EBUILD squashfs-tools-4.3_pre20130621.ebuild 1458 SHA256 9dde48030c07cd23c9061bac7d1d2df4bdf68b629e3d2b89812b77de364eb970 SHA512 7048316f28fb047102e22dfd034295497761081d4107c41160be093a34d2ac8682257af6965d1091cd59e2748a4eee7b05627daa0c26b73a1e0f7867c6b66e57 WHIRLPOOL 723745cd3d349d654ca3cad1a5f774b7d1f40570a88fabe02707bc2fdf08b44bbfbf6263a756416d23a6f464bfdf4cbdc1e47bbb6541642d32c0800e917c2858
+MISC ChangeLog 14743 SHA256 bb969bae947e1ab43d7ab12ab09304a8e5a640aeb5b4ac98b5030040a219753f SHA512 57ec11f88c7b2162e7819b664c44f16a6f00dbef291dafa3e434d1ed9d13c52777ee2fda4893e7059dc59027b282a12ae3ab8d9f563106feeba435072c043be9 WHIRLPOOL faf3bfddb0f3c9c7cd760308c15767b52b43cbec6cf9a4af89c911185c05a1f6b684971532f7e5aee173508983a0914e371cf425893e74e73b25501b3ea607af
+MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2meQAAoJEPGu1DbS6WIAbEcP/0eEkZ7DPlXkVNTDCuv5jRfq
-6BexMjaKuUzBGj4xFYOTcIgf4Tl5t0Mb3ID4SrmC9m8qV1FuHr1zEQzYIEvnDLT2
-GkPYh6V2NPc/tcoZrKC1NE659wJSJqvor2myA6+K0ekIXTwoAh98g6NbsgEAuC9f
-bgwdORd/7cDBSTUPM1TnRXhpipRK8XJtK4oy+WsIEDLiWIZkZz1njeoryps52oq5
-DUkOeSkeANTZH5svuXLFfRo6I90Jvoay8wPaD3arDcNosKMywsoVt+Mto6fADD5J
-rA5xoDt2IJQYf4UWsPKXijlinvsPotTik+tQ3tCRy5Sf6eN7e1dD7u5jwbpbEUGj
-Yl4H1YbaC2EQBkv4c08KDWsvZHal9/nBt39gV+J6D9FZs8nYjkZ/0iqJR7gjz0Jf
-Qdf1g8RdA60t1hoTL8tWM9KNisR2/vQR0stZd0nplx8BJeH0hn1ndClrW7+h8Y7v
-ErOz9bsxV/6mEcTP//gHxpr3TX+P5+iCeh7WlAD3KW1x8MpUh42ZndWcVHI6O1zJ
-GIk7haaMChKMseHfCG9zFWcbdfhWGDOsFcZpKIJP5cLFSx9KvMBV2X3omtHiQrEp
-j8yFStQJeWljpYqKamBNPeUtVPhTUFXLnCB3TE0Eya2kiLZWQYBuGN8APWs79ixi
-9LHPh0IN2ialp6U+nK0X
-=gkPF
+iQIcBAEBCgAGBQJS3ksuAAoJELnU8jG9FVirfrgP/i/eWj7kG5M9ol+Hpz2Q+GWD
+eZdeB4CbOAX34xRhTE98MGO7dBS9q7lW1oPoOjAB5U+COIuUOUFZkP48ixFhPCwk
+r8WkWvuoJanZnrCgeEadAoEC7MbPwWGnZffnGCO2pbXMR/8Le/hcQ2Qs1Pu7XZ6o
+4HriY9iHkL0Q27TOrxp53rZ56M7w8sE/pN5WB5rCcD+gWraB4YYD3WiwE8bmaiIa
+JQL5e6y3R0HmjePaOjlTc6eQGpMCNdlv9B6BXGrU1njXZJ7DW4+aG9bkP/GP5Fez
+rwTos6ukQtFhM5BwrUUv2NSEMvZh5r+TfxakVARyvkL8yE4ha8VDrNDYWJhKrvvM
+GaZriNj0E7iog/sN3EUg/WXuaAeCvkXHSNVQymfaet7t+l/SY0gVjRDB42S0xNQ8
+sS+abmq/e6Kf2BYVHGudsB2JTtkUrbd/rfrOUolVtsqcKVkVGXp9PmXuS1BfNFQG
+5HVhwU06tfCIt7LO3o/3Raot80F2LiRxlP+uAsTyTZ9UJxRnBBif78mxmxiIt1oc
+IdiPYhf6GVV7IIJjZaN+v/5mFiddC3QOI6Wa041hiDAh4VlCx4Ias6AdA5VULYuH
+V7aeiQbiHqyYcVR4Z1k9Caxhu+30XMQkWmcs8qRwpoPpUiBFzGTvz/2sZZt1XyB6
+/lgF6RRCtWIpQWD1DuMM
+=ifK0
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 8a76920d75bf..e1c66a45635b 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>livecd</herd>
-	<use>
-		<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-	</use>
+  <herd>livecd</herd>
+  <use>
+    <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild
new file mode 100644
index 000000000000..0a3419514566
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 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.3_pre20130621.ebuild,v 1.1 2014/01/21 10:25:49 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~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}/${P}/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_prepare() {
+	epatch "${WORKDIR}"/${P}.patch
+}
+
+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
+	dodoc ../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"
+}