Slot older versions of squashfs-tools as the filesystem format is not backwards compatible and sometimes we need to easily create older filesystem versions.

(Portage version: 2.2_rc55/cvs/Linux x86_64)

5 files changed, 27 insertions, 92 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 51faeaa00e9d..37c72b1c5494 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/squashfs-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.66 2009/07/18 20:18:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.67 2009/12/07 22:57:21 vapier Exp $
+
+  07 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  -squashfs-tools-3.1_p2.ebuild, squashfs-tools-3.2_p2.ebuild,
+  -squashfs-tools-3.3.ebuild, squashfs-tools-3.4.ebuild:
+  Slot older versions of squashfs-tools as the filesystem format is not
+  backwards compatible and sometimes we need to easily create older
+  filesystem versions.
 
   18 Jul 2009; Joseph Jezak <josejx@gentoo.org> squashfs-tools-4.0.ebuild:
   Marked ppc stable for bug #273131.
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild
deleted file mode 100644
index e3d7c923bf19..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v 1.12 2008/10/15 03:05:19 jer Exp $
-
-inherit toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-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=""
-
-RDEPEND="sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${PV/_p/-r}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:-O2:$(CFLAGS):' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.1
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
index c215298c3790..63bd479e87cd 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.5 2008/10/27 06:04:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.6 2009/12/07 22:57:21 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://squashfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="3.0" # squashfs filesystem version
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
@@ -21,7 +21,11 @@ S=${WORKDIR}/squashfs${PV/_p/-r}/squashfs-tools
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i 's:-O2:$(CFLAGS):' Makefile
+	sed -i \
+		-e 's:-O2:$(CFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
+		Makefile
+	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
 }
 
 src_compile() {
@@ -29,7 +33,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin mksquashfs unsquashfs || die
+	newbin mksquashfs mksquashfs-${SLOT} || die
+	newbin unsquashfs unsquashfs-${SLOT} || die
 	cd ..
 	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
 }
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild
deleted file mode 100644
index 4cc5cc03b2cf..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v 1.6 2008/10/27 06:04:42 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-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=""
-
-RDEPEND="sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${PV/_p/-r}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:-O2:$(CFLAGS):' Makefile
-	epatch "${FILESDIR}"/squashfs-tools-3.3-posix.patch || die patching failed
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.3
-}
-
-pkg_postinst() {
-	ewarn "This version of mksquashfs requires a 2.6.24 kernel or better."
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
index 5da6d6ace800..d65a0ea0c24e 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.2 2008/10/15 03:05:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.3 2009/12/07 22:57:21 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -10,8 +10,8 @@ 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"
+SLOT="3.1" # squashfs filesystem version
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
@@ -23,20 +23,18 @@ src_unpack() {
 	cd "${S}"
 	sed -i \
 		-e 's:-O2:$(CFLAGS):' \
-		-e 's:$(CC):$(CC) $(LDFLAGS):' \
+		-e '/-lz/s:$: $(LDFLAGS):' \
 		Makefile || die "sed failed"
+	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	dobin mksquashfs unsquashfs || die
+	newbin mksquashfs mksquashfs-${SLOT} || die
+	newbin unsquashfs unsquashfs-${SLOT} || die
 	cd ..
 	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
 }
-
-pkg_postinst() {
-	ewarn "This version of mksquashfs requires a 2.6.24 kernel or better."
-}