Marking stable and closing bug #82568.

Package-Manager: portage-2.0.51-r15

6 files changed, 15 insertions, 83 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 0e48cd0ff8c4..bd85a2fdb807 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.18 2005/01/29 14:38:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.19 2005/02/23 15:36:29 wolf31o2 Exp $
+
+*squashfs-tools-2.1_p2-r1 (23 Feb 2005)
+
+  23 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -squashfs-tools-2.0_p2.ebuild, +squashfs-tools-2.1_p2-r1.ebuild,
+  -squashfs-tools-2.1_p2.ebuild:
+  Marking stable and closing bug #82568.
 
   29 Jan 2005; Markus Rothe <corsair@gentoo.org> squashfs-tools-2.1_p2.ebuild:
   Stable on ppc64
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index b1e9dd0b66dd..b1fad8f31c69 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,6 +1,4 @@
-MD5 a33de6052529b9c910c0325c12926eb4 ChangeLog 3278
+MD5 0308f0b077117b43fc09005f746ba53f ChangeLog 3516
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
-MD5 2cb300f922e6b676b054c73c65fd1387 squashfs-tools-2.1_p2.ebuild 1903
-MD5 2f940ea2ed9b045a170ab714519ea458 squashfs-tools-2.0_p2.ebuild 1865
-MD5 79b98e5d18ebd17486dca6802a1ac7d4 files/digest-squashfs-tools-2.1_p2 66
-MD5 86ce054d32ff035a76b26bbf0bd90fb2 files/digest-squashfs-tools-2.0_p2 66
+MD5 2fbefe514f09c28201b7f7fb04877975 squashfs-tools-2.1_p2-r1.ebuild 1926
+MD5 79b98e5d18ebd17486dca6802a1ac7d4 files/digest-squashfs-tools-2.1_p2-r1 66
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
deleted file mode 100644
index 634c239a8833..000000000000
--- a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.0_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b7fcaab8e634ae2385984885c731082 squashfs2.0-r2.tar.gz 168340
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-r1
index 1d5b27d7d7b7..1d5b27d7d7b7 100644
--- a/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.1_p2
+++ b/sys-fs/squashfs-tools/files/digest-squashfs-tools-2.1_p2-r1
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
deleted file mode 100644
index b8d866fa8e13..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-2.0_p2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 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.4 2005/01/06 21:00:49 kloeri 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
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2-r1.ebuild
index 1e41dbb4c3ec..3bc5bea5f79d 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-2.1_p2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-2.1_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3 2005/01/29 14:38:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-2.1_p2-r1.ebuild,v 1.1 2005/02/23 15:36:29 wolf31o2 Exp $
 
 inherit toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
@@ -69,5 +69,6 @@ src_test() {
 src_install() {
 	dobin mksquashfs || die
 	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES README-2.0 README-AMD64
+	dodoc README ACKNOWLEDGEMENTS CHANGES README-2.{0,1} README-AMD64 \
+		PERFORMANCE.README
 }