Version bump.

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

5 files changed, 19 insertions, 91 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 71ee5f36cd80..e9b9acbb3655 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.94 2014/01/21 21:36:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.95 2014/01/23 12:40:10 jer Exp $
+
+*squashfs-tools-4.2_p20140119 (23 Jan 2014)
+
+  23 Jan 2014; Jeroen Roovers <jer@gentoo.org>
+  -squashfs-tools-4.2_p20121216.ebuild, +squashfs-tools-4.2_p20140119.ebuild,
+  -squashfs-tools-4.3_pre20130621-r2.ebuild,
+  -files/squashfs-tools-4.3_pre20130621-xattr.patch:
+  Version bump.
 
 *squashfs-tools-4.3_pre20130621-r2 (21 Jan 2014)
 
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index ba841c0e962a..b7c850fd29ee 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -4,24 +4,21 @@ Hash: SHA256
 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
-AUX squashfs-tools-4.3_pre20130621-xattr.patch 232 SHA256 106d89efa4715552a4e5ab916c4ce2e7228ad9add9908c9f37068aa42bafbf72 SHA512 6a00288ea270f4e20fd531e65233de1d122b519f81043545b7b653b64d96d227a89fa4200613f7579500dd1bc58a6e3b94f986ead38a6d9c32b649ecffd72d61 WHIRLPOOL 93df5e0373a135299eec0775d949d30f236982996cbaa82dca4e982ddcf655ce93427605f6887e21dc5a317dc06021686180ce1bde27d0e692e686be70c28438
-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 squashfs-tools-4.2_p20140119.tar.xz 119496 SHA256 007382c4be734f923b7a0964c378b665d924adfd5537922452c455c0a2d4d20a SHA512 016c79000bb775c3ffb0a8eb9eefe11f9a82a0cd40be44b42c0c16f4184c4113538947d3677956f97313797ed9a7645380d05586afb0f6bd392cb4652e9fbe14 WHIRLPOOL 12ebdbb78053f0cc6863d1801ab964c0460966667a24f0eca39a63d73a5a313291981a39c5b6f539c33f0eb65ff34d7bbc00a06ae256173f9c4177fbfa3aacab
+DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f WHIRLPOOL 14b22cfc16e5c9bc91a5e02b9d4b64589339162d59613b12c2344acbed34690616a7a0254d9a63f839e96ff4b850f30fd7e1e855aecb76423356f4b1d8582129
+DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe WHIRLPOOL 7c113f3a66d0d28310302017e5f317d14bb5576e680a8f94e687193a376db92c54920be7d1121637f860cafa802d665ba419115e976b07029ca1f0c51953972d
 DIST squashfs4.2.tar.gz 133173 SHA256 d9e0195aa922dbb665ed322b9aaa96e04a476ee650f39bbeadb0d00b24022e96 SHA512 4b69c5d3008803347d0ce7628957e3873c9ebd799662b25dfb739afb6a1ce97bdd02b0465ac4d949bc38af2155880ac068209dc638b94e5c86a8011ec3a00de0 WHIRLPOOL c69d403b9775ecebfba02c2ae395b3e5ed8f832caf80417863e5df861b60462b97ac3d10ee027cc96c6f8146450bd8fe8cf715574d41ed47abcc7abc9423ce52
 EBUILD squashfs-tools-3.2_p2.ebuild 1100 SHA256 5ee4a2f3660dc022d59cfe737bd121ddd7aacc237c91f29834faa698c636a4e3 SHA512 fc97b405122bd3292ecd755c548176e2b38ba46137577bb413a6f82e621fa1d47a3059d875ca455ec10fa9653ce162e5825c04a8963393fcd8bd1f35ca436a41 WHIRLPOOL 7ee166966ab45d0a4144e70fa9a884d3318ed43ed4da9561d0e8ea3d07334cb59e132c21decbb2fd39f93ff78628acbc5668be1ea0430818cd2081d3d6947f01
 EBUILD squashfs-tools-3.4.ebuild 1101 SHA256 152e87091c76d2312057319cf1f0250154d93eb68ac7f9082cfe729b32ee447d SHA512 90d76e462ee6b7759943efd22619c82a0da29654a69f875ca8686e419b57bed52af7a77a8e8616b0e3bb92a3f7aa02d39cc7b703b60e4003ff4af6614b314e04 WHIRLPOOL 872bac9f2807c4af5de62c22a679be599aa3ec8ef6e51adbb343971344ebbb0824fcc7e3c44969778b9d92866bc181ef87f23cb7046dd7b0f0ceaf1886f6d12c
 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
-EBUILD squashfs-tools-4.3_pre20130621-r2.ebuild 1489 SHA256 18457487be8a3f190d7cca6505297d25b4eabc1b4331e64ac043ca648290e687 SHA512 304a4cc7128eb422ba4032adc2bb29e4af14863762b2fc77cb17188e8b3f8b77562e43027fe7d672aeb882707950a482563f0a2cc71a2021a1a8152a53f01160 WHIRLPOOL d27d1b7128587c17cdd002ae7f50257feb118e17de0c764431982637e7ab287778b33b3f2caed136e73d92572e8e17fe8dcecdb61c7f85e6e1a3f76af19fd2cf
-MISC ChangeLog 15487 SHA256 7d0d4e5b7991d8678128782221f6ef3c1faa2414aa9201e8ce896ee90fd0a027 SHA512 8e880a9ea253d08a45c66220c52e79594ffa5cd064c83cd2c322c08bc6bb0e4a793c85d69a5698a90f8624a868ffbc666c1043430e0a7d07811025a5080e9b33 WHIRLPOOL 9e77b868195c4002d477926ad70e655932edbee3b394dced4f995a7a3b3ca3cbeabe09b19aef8c8f0d61f65313e928e2f6843348b5452f84a4dd01b07a384ed6
+EBUILD squashfs-tools-4.2_p20140119.ebuild 1414 SHA256 11dea05ccfbf5d162fda27fd66e327426f40ee507526f7c1f75d39aa209ce037 SHA512 ab280eb0f2f5bfd384b55570193e46f6be9d4426280074846c7118486a43e8cd18c45dfccf0924b5d9fbd1404712a866421c87bc787b2fc777d8957bc365e8b7 WHIRLPOOL 0a921f928648a86a6b180d716b642e5af47d424fc90f10ad5104c446903c5b8e64871aaf5f2b35c4ee5e9b3cce729b2b5e002184a773e386586692b5d84372f3
+MISC ChangeLog 15772 SHA256 90c658125f0c353fd7020d4345ea7c640f6dba5aec19ec6bd69e04d65d26c8e9 SHA512 e8ef9ff5e38a5200763fa447d64d70cfa649a6e1ddbb3c9b9ed9482dd377b2085cba7b1ab55aaed85d588a044b17721e33bf841e9c815d100b32afa5a301375d WHIRLPOOL 10d6600cebf320f670c4a2a7e05021ad499e5f23d07fc0b836a01db65c30be647745075eef160568935aa3782d7dfae1db5c746be7f96b4c069ba873540bdc94
 MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLe6FUACgkQVWmRsqeSphM5UgCfdI8udZPpCLc6gWRlsjifssE3
-i1gAmQF5gmQgirRku/aqqvr2SupltLM3
-=Qpve
+iEYEAREIAAYFAlLhDasACgkQVWmRsqeSphMChACbBD/A6GFhnuoP9IBhpqf9vNFh
+/ZQAnij5Dzl5BgMec64zVq4648tCfI3q
+=FQ/a
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch
deleted file mode 100644
index 5d9731a39bb6..000000000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xattr.h
-+++ b/xattr.h
-@@ -124,7 +124,7 @@
- }
- 
- 
--static inline struct xattr_list *get_xattr(int i, unsigned int *count, int)
-+static inline struct xattr_list *get_xattr(int i, unsigned int *count, int j)
- {
- 	return NULL;
- }
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild
deleted file mode 100644
index 6cc7f5b9406b..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2_p20121216.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.2_p20121216.ebuild,v 1.3 2014/01/18 11:37:50 vapier Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs/squashfs${PV/_p*/}.tar.gz
-	http://dev.gentoo.org/~jer/${P}.patch.bz2
-"
-
-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}/squashfs${PV/_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
-	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"
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild
index 0dd437b19fce..56336904ba83 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild
@@ -1,14 +1,13 @@
 # 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-r2.ebuild,v 1.1 2014/01/21 21:36:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2_p20140119.ebuild,v 1.1 2014/01/23 12:40:10 jer 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"
+SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,10 +26,6 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/squashfs-tools"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xattr.patch
-}
-
 src_configure() {
 	# set up make command line variables in EMAKE_SQUASHFS_CONF
 	EMAKE_SQUASHFS_CONF=(