Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 11 insertions, 80 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/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=(