version bumped as per bug #54103. src_test routine added

4 files changed, 92 insertions, 9 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 6def7128f72b..b3f618c848e9 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2004/09/05 08:26:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.12 2004/09/07 05:19:03 dragonheart Exp $
+
+*squashfs-tools-2.0_p2 (07 Sep 2004)
+
+  07 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +squashfs-tools-2.0_p2.ebuild:
+  version bumped as per bug #54103. Thanks Thomas Weidner <3.14159@gmx.net> for
+  initial testing. src_test routine added
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4c9d3eb8fdeb..978c0d833ced 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
+MD5 f0bcb66446a0cee4d862b22d28d49f76 ChangeLog 2499
 MD5 dc62eecaeab96215017957f6ab1625e2 squashfs-tools-1.3.ebuild 811
-MD5 dc110761aaacce58ef0b66f47266b09e squashfs-tools-2.0.ebuild 818
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 MD5 92296552e44012e3744bb5da32931fa7 squashfs-tools-2.0_alpha.ebuild 860
-MD5 81328e7908e1fa29cf5d77e5e549d57a ChangeLog 2249
+MD5 dc110761aaacce58ef0b66f47266b09e squashfs-tools-2.0.ebuild 818
+MD5 7033c89e1cd5da236941517233533b11 squashfs-tools-2.0_p2.ebuild 1887
 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 904e2540d89ef36e9816f7f2a035f996 files/digest-squashfs-tools-2.0 63
+MD5 86ce054d32ff035a76b26bbf0bd90fb2 files/digest-squashfs-tools-2.0_p2 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBOs2wI1lqEGTUzyQRAh4oAKDDA0JUNNyrBPdPKmk1+0jdyqB1+ACcDn7s
-ptYJ0WM/43o/RkmYKTMRBfE=
-=C1vX
+iD8DBQFBPUXnmdTrptrqvGERAqpmAJwLbV2qpxPs+d1Mzg4eT3A0o8MaEQCfVl89
+AhuqoIibFRREGHU52VueVqE=
+=ZVbi
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_p2 b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_p2
new file mode 100644
index 000000000000..634c239a8833
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_p2
@@ -0,0 +1 @@
+MD5 0b7fcaab8e634ae2385984885c731082 squashfs2.0-r2.tar.gz 168340
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
new file mode 100644
index 000000000000..21f00b3e5d11
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.0_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.0_p2.ebuild,v 1.1 2004/09/07 05:19:03 dragonheart 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 ~ppc64"
+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
+}