Version bumped to 2.1_p2 and closing bug #74509.

11 files changed, 89 insertions, 115 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 8bf1a79468c7..b40a56433bb8 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/squashfs-tools
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.15 2004/10/04 21:39:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.16 2004/12/15 19:40:59 wolf31o2 Exp $
+
+*squashfs-tools-2.1_p2 (15 Dec 2004)
+
+  15 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -squashfs-tools-1.3.ebuild, -squashfs-tools-2.0.ebuild,
+  -squashfs-tools-2.0_alpha.ebuild, squashfs-tools-2.0_p2.ebuild,
+  +squashfs-tools-2.1_p2.ebuild:
+  Version bumped to 2.1_p2 and closing bug #74509.
 
   24 Sep 2004; Tom Gall <tgall@gentoo.org> squashfs-tools-2.0.ebuild:
   stable on ppc64
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 3103125d05d9..d8f3e2a3c4be 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,10 +1,6 @@
+MD5 ba5dab4104c6aa8a855ce8ee59d7ba6f squashfs-tools-2.1_p2.ebuild 1877
+MD5 b00bf438a67cc741581c1839ac6330ff squashfs-tools-2.0_p2.ebuild 1868
+MD5 6b6650144e9d2eeb13ffbb371841177e ChangeLog 3076
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 dc62eecaeab96215017957f6ab1625e2 squashfs-tools-1.3.ebuild 811
-MD5 5e2e88c194a7875ce69f23fa6ab7ad9f squashfs-tools-2.0.ebuild 788
-MD5 92296552e44012e3744bb5da32931fa7 squashfs-tools-2.0_alpha.ebuild 860
-MD5 1651d71ba7130e996e2ee5b4020c8452 squashfs-tools-2.0_p2.ebuild 1883
-MD5 dca9668c40843961ae829f8ed2d6b798 ChangeLog 2775
-MD5 fee0a11be0b39d332785d9a85127fb49 files/digest-squashfs-tools-1.3 64
-MD5 904e2540d89ef36e9816f7f2a035f996 files/digest-squashfs-tools-2.0 63
-MD5 6f131952e2ae3dd6c6c9735557d35fc3 files/digest-squashfs-tools-2.0_alpha 69
 MD5 86ce054d32ff035a76b26bbf0bd90fb2 files/digest-squashfs-tools-2.0_p2 66
+MD5 79b98e5d18ebd17486dca6802a1ac7d4 files/digest-squashfs-tools-2.1_p2 66
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-1.3 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-1.3
deleted file mode 100644
index 90f5aa6e11ca..000000000000
--- a/sys-fs/squashfs-tools/files/digest-squashfs-tools-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 650fd9a7b152bcfb7464276d3da296a9 squashfs1.3r3.tar.gz 89468
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0
deleted file mode 100644
index ff7176bbbd92..000000000000
--- a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 969f616d6a3df04f0cec59fd306d14e9 squashfs2.0.tar.gz 153926
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_alpha b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_alpha
deleted file mode 100644
index e91910d3581a..000000000000
--- a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1729912704a299285be7b63988fe23b3 squashfs2.0-ALPHA.tar.gz 136174
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.1_p2 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.1_p2
new file mode 100644
index 000000000000..1d5b27d7d7b7
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.1_p2
@@ -0,0 +1 @@
+MD5 ffa24eff13b2ca51ed6990d15237e4c1 squashfs2.1-r2.tar.gz 195686
diff --git a/sys-fs/squashfs-tools/squashfs-tools-1.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-1.3.ebuild
deleted file mode 100644
index f5b180a0edab..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-1.3.ebuild,v 1.4 2004/09/03 19:16:59 pvdabeel Exp $
-
-MY_PV="1.3r3"
-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="x86 ppc ~sparc ~mips ~alpha arm hppa amd64 ~ia64 ~ppc64 s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin mksquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.0.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.0.ebuild
deleted file mode 100644
index e70887fc99ef..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.0.ebuild,v 1.8 2004/10/04 21:39:11 pvdabeel Exp $
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${PV}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin mksquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.0_alpha.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.0_alpha.ebuild
deleted file mode 100644
index 9f3c22becec6..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-2.0_alpha.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.0_alpha.ebuild,v 1.3 2004/07/01 21:50:52 eradicator Exp $
-
-MY_PV=${PV/_alpha/-ALPHA}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-libs/zlib"
-
-S=${WORKDIR}/squashfs${PV/_alpha}/squashfs-tools
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin mksquashfs || die
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
index b6d324da1cea..6b43efd04c14 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild,v 1.2 2004/09/07 13:43:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild,v 1.3 2004/12/15 19:40:59 wolf31o2 Exp $
 
 
 MY_PV=${PV/_p/-r}
@@ -9,7 +9,7 @@ HOMEPAGE="http://squashfs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~ppc64"
+KEYWORDS="x86 ppc sparc ~mips ~alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
new file mode 100644
index 000000000000..9ceb26527fba
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild,v 1.1 2004/12/15 19:40:59 wolf31o2 Exp $
+
+
+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="~x86 ~ppc sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE=""
+
+DEPEND="virtual/libc
+	sys-libs/zlib
+	>=sys-apps/sed-4"
+
+RDEPEND="virtual/libc
+	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 || die
+}
+
+src_test() {
+	./mksquashfs *.c *.h ${T}/squashfs && einfo "sucessfully created filesystem" \
+		|| die "failed to create filesystem"
+	if ! fgrep -q squashfs ${ROOT}/proc/filesystems;
+	then
+		modprobe squashfs || ewarn "no squashfs modules - test not completed"
+		touch ${T}/modprobe
+		fgrep -q squashfs ${ROOT}/proc/filesystems || \
+			ewarn "no squashfs failsystem available in this kernel - tests not completed"
+	fi
+
+	if hasq userpriv ${FEATURES};
+	then
+		ewarn "FEATURES userpriv hinders testing. Restricts the ability to mount filesystems."
+		ewarn "Further testing skipped"
+	else
+		if fgrep -q squashfs ${ROOT}/proc/filesystems;
+		then
+			mkdir ${T}/squashfs_dir
+			mount -n -o loop,ro ${T}/squashfs ${T}/squashfs_dir -t squashfs || die  "mount failed"
+
+			diff squashfs_fs.h ${T}/squashfs_dir/squashfs_fs.h && einfo "test suceeded" \
+				|| die "test failed"
+		fi
+		umount ${T}/squashfs_dir
+	fi
+
+	# clean up
+
+	if [ -f ${T}/modprobe ];
+	then
+		rmmod squashfs
+	fi
+}
+
+src_install() {
+	dobin mksquashfs || die
+	cd ..
+	dodoc README ACKNOWLEDGEMENTS CHANGES README-2.0 README-AMD64
+}