version bump. QA stop installing INSTALL, COPYING. x86 stable on testdisk-5.7

(Portage version: 2.0.51.22-r2)

6 files changed, 35 insertions, 17 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 2e505609171d..16cadee40e4a 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.13 2005/08/16 19:30:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.14 2005/09/04 03:05:44 dragonheart Exp $
+
+*testdisk-5.9 (04 Sep 2005)
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> -testdisk-5.6.ebuild,
+  testdisk-5.7.ebuild, +testdisk-5.9.ebuild:
+  version bump. QA stop installing INSTALL, COPYING. x86 stable on testdisk-5.7
+  old version cleanout.
 
   16 Aug 2005; Simon Stelling <blubb@gentoo.org> testdisk-5.7.ebuild:
   added ~amd64 keyword
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 6065b5c90e93..944aaf24a4f6 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,8 +1,10 @@
 MD5 3bc5ba74a99c392471cca86eb9e48992 ChangeLog 1961
-MD5 e18eb10540dc80dac5f436b82cd48528 metadata.xml 398
 MD5 369c60dd9fa5ca9e59fcafa701b78038 testdisk-5.2.ebuild 886
-MD5 11066fb1f2ec7765b6901b4c516d0f21 testdisk-5.7.ebuild 1018
+MD5 d7651a782b21cfd764166d1210c95664 testdisk-5.9.ebuild 1144
+MD5 e18eb10540dc80dac5f436b82cd48528 metadata.xml 398
 MD5 fd5d2716e87ec07b3ed10ad791c03fd1 testdisk-5.6.ebuild 869
+MD5 4fabe7279a61177b41cbc6c66398ebfd testdisk-5.7.ebuild 1086
 MD5 c20ec4c0b429ad420cd79fa49b334e24 files/digest-testdisk-5.2 64
-MD5 38ac24202d2e5ac3b576956cca428e4e files/digest-testdisk-5.7 64
+MD5 c590941db124e10085899f3724557022 files/digest-testdisk-5.9 68
 MD5 4f353df18ee5ea31402682ab6df29f39 files/digest-testdisk-5.6 64
+MD5 38ac24202d2e5ac3b576956cca428e4e files/digest-testdisk-5.7 64
diff --git a/app-admin/testdisk/files/digest-testdisk-5.6 b/app-admin/testdisk/files/digest-testdisk-5.6
deleted file mode 100644
index 1bdf97edee67..000000000000
--- a/app-admin/testdisk/files/digest-testdisk-5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a304bddfd9e22ed32d6ba34ab6686aa0 testdisk-5.6.tar.gz 503776
diff --git a/app-admin/testdisk/files/digest-testdisk-5.9 b/app-admin/testdisk/files/digest-testdisk-5.9
new file mode 100644
index 000000000000..c4c5bd565479
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-5.9
@@ -0,0 +1 @@
+MD5 2cfde909c7857c73a95a54a82faedd79 testdisk-5.9-WIP.tar.gz 555103
diff --git a/app-admin/testdisk/testdisk-5.7.ebuild b/app-admin/testdisk/testdisk-5.7.ebuild
index 72a626da19d6..f6224a289b0f 100644
--- a/app-admin/testdisk/testdisk-5.7.ebuild
+++ b/app-admin/testdisk/testdisk-5.7.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/app-admin/testdisk/testdisk-5.7.ebuild,v 1.3 2005/08/16 19:30:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.7.ebuild,v 1.4 2005/09/04 03:05:44 dragonheart Exp $
 
 DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
 HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
@@ -30,6 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
+	rm ${D}/usr/share/doc/${PF}/COPYING ${D}/usr/share/doc/${PF}/INSTALL
 }
 
diff --git a/app-admin/testdisk/testdisk-5.6.ebuild b/app-admin/testdisk/testdisk-5.9.ebuild
index a2ee7f7ecf6b..a7507a656f35 100644
--- a/app-admin/testdisk/testdisk-5.6.ebuild
+++ b/app-admin/testdisk/testdisk-5.9.ebuild
@@ -1,22 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.6.ebuild,v 1.2 2005/04/30 02:05:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.9.ebuild,v 1.1 2005/09/04 03:05:44 dragonheart Exp $
+
+
+MY_P=${P}-WIP
 
 DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
 HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
+SRC_URI="http://www.cgsecurity.org/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="static"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static reiserfs ntfs"
 DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/e2fsprogs-1.35
-	>=sys-fs/progsreiserfs-0.3.1_rc8"
+	ntfs? ( >=sys-fs/ntfsprogs-1.9.4 )
+	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	>=sys-fs/e2fsprogs-1.35"
+RDEPEND="!static? ( ${DEPEND} )"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	econf || die
-	if use static;
+	econf $(use_with ntfs) $(use_with reiserfs) || die
+	if use static
 	then
 		emake smallstatic || die
 	else
@@ -25,6 +31,8 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
+	mv ${D}/usr/share/doc/${MY_P} ${D}/usr/share/doc/${PF}
+	rm ${D}/usr/share/doc/${PF}/COPYING ${D}/usr/share/doc/${PF}/INSTALL
 }