Version bump. better descriptions added. old versions removed. addeedreiserfs USE flag to include/exclude a reiserfs libs as per bug #84514

(Portage version: 2.0.51.20-r5)

9 files changed, 30 insertions, 61 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 6866c5724cf7..9b9c8bce8b6a 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,15 @@
 # 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.9 2005/03/02 08:30:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.10 2005/04/30 02:05:43 dragonheart Exp $
+
+*testdisk-5.7 (30 Apr 2005)
+
+  30 Apr 2005; Daniel Black <dragonheart@gentoo.org> testdisk-5.2.ebuild,
+  -testdisk-5.3.ebuild, -testdisk-5.5.ebuild, testdisk-5.6.ebuild,
+  +testdisk-5.7.ebuild:
+  Version bump. better descriptions added. old versions removed. added
+  reiserfs USE flag to include/exclude a reiserfs libs as per bug
+  #84514 by Alexey Maximov <amax@mail.ru>.
 
 *testdisk-5.6 (02 Mar 2005)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index ba6881c8862f..da6901d2f2b8 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cb834051313b104105ec1b68b8fa35f0 ChangeLog 1296
-MD5 9686c8002b3424dcdf6593002043f3a5 testdisk-5.2.ebuild 846
-MD5 a5818ffbec80e52fcf6d5f3931cbdc74 testdisk-5.3.ebuild 852
+MD5 0ef05be585399cf0eba17008097babf1 ChangeLog 1607
+MD5 56918a1525d1bda76a15b2ef61e5a788 testdisk-5.2.ebuild 887
 MD5 e18eb10540dc80dac5f436b82cd48528 metadata.xml 398
-MD5 e441337bd103cb8235ded2d18548fed0 testdisk-5.5.ebuild 828
-MD5 42675d5e3d1c83dc0db64ac4a68d2f6e testdisk-5.6.ebuild 828
+MD5 9262c966b233b0c59fb6f53c69ee447b testdisk-5.6.ebuild 869
+MD5 608e3b5f61748e2556650b0dc323ef3e testdisk-5.7.ebuild 1017
 MD5 c20ec4c0b429ad420cd79fa49b334e24 files/digest-testdisk-5.2 64
-MD5 ae3fa6940aea5b018c3377fbcdae2981 files/digest-testdisk-5.3 64
-MD5 2bc23dc07ae34d8c00f3f33a0be0968e files/digest-testdisk-5.5 64
 MD5 4f353df18ee5ea31402682ab6df29f39 files/digest-testdisk-5.6 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCJXmemdTrptrqvGERAmlDAJ4yuuBjRxTNG8/J99qNu2ByTVdw6QCfTUjN
-rtN6R/uuENiot1yzArHCfDw=
-=6pF0
------END PGP SIGNATURE-----
+MD5 38ac24202d2e5ac3b576956cca428e4e files/digest-testdisk-5.7 64
diff --git a/app-admin/testdisk/files/digest-testdisk-5.3 b/app-admin/testdisk/files/digest-testdisk-5.3
deleted file mode 100644
index 9c806d16a0f1..000000000000
--- a/app-admin/testdisk/files/digest-testdisk-5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63437803dcfe67f3e2ab434c33446723 testdisk-5.3.tar.gz 460690
diff --git a/app-admin/testdisk/files/digest-testdisk-5.5 b/app-admin/testdisk/files/digest-testdisk-5.5
deleted file mode 100644
index 1f26b9663443..000000000000
--- a/app-admin/testdisk/files/digest-testdisk-5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5fd577cce872bb3933e4dc0e30d79d6 testdisk-5.5.tar.gz 487558
diff --git a/app-admin/testdisk/files/digest-testdisk-5.7 b/app-admin/testdisk/files/digest-testdisk-5.7
new file mode 100644
index 000000000000..d190f5e0d69c
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-5.7
@@ -0,0 +1 @@
+MD5 86b5472fcbf4a1f1aa36aefec4e5f4ac testdisk-5.7.tar.gz 519777
diff --git a/app-admin/testdisk/testdisk-5.2.ebuild b/app-admin/testdisk/testdisk-5.2.ebuild
index 84e299ec4b6e..e42eadc8d5c1 100644
--- a/app-admin/testdisk/testdisk-5.2.ebuild
+++ b/app-admin/testdisk/testdisk-5.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2.ebuild,v 1.4 2005/01/01 11:31:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.2.ebuild,v 1.5 2005/04/30 02:05:43 dragonheart Exp $
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others"
+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"
 LICENSE="GPL-2"
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 DEPEND=">=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/reiserfsprogs-3.6.13
 	>=sys-fs/e2fsprogs-1.35"
 
 src_compile() {
diff --git a/app-admin/testdisk/testdisk-5.3.ebuild b/app-admin/testdisk/testdisk-5.3.ebuild
deleted file mode 100644
index fd740d2d99b3..000000000000
--- a/app-admin/testdisk/testdisk-5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.3.ebuild,v 1.3 2005/01/01 11:31:34 eradicator Exp $
-
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others"
-HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND=">=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/reiserfsprogs-3.6.13
-	>=sys-fs/e2fsprogs-1.35"
-
-src_compile() {
-	econf || die
-	emake || die
-	mv src/testdisk src/testdisk.dynamic
-	emake smallstatic || die
-	mv src/testdisk src/testdisk.static
-	cp src/testdisk.dynamic src/testdisk
-}
-
-src_install() {
-	einstall || die
-	dosbin src/testdisk.static
-}
-
diff --git a/app-admin/testdisk/testdisk-5.6.ebuild b/app-admin/testdisk/testdisk-5.6.ebuild
index 720d8425e461..a2ee7f7ecf6b 100644
--- a/app-admin/testdisk/testdisk-5.6.ebuild
+++ b/app-admin/testdisk/testdisk-5.6.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2005/03/02 08:30:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.6.ebuild,v 1.2 2005/04/30 02:05:43 dragonheart Exp $
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others"
+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"
 LICENSE="GPL-2"
@@ -11,7 +11,6 @@ KEYWORDS="~x86 ~ppc"
 IUSE="static"
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/reiserfsprogs-3.6.13
 	>=sys-fs/e2fsprogs-1.35
 	>=sys-fs/progsreiserfs-0.3.1_rc8"
 
diff --git a/app-admin/testdisk/testdisk-5.5.ebuild b/app-admin/testdisk/testdisk-5.7.ebuild
index 91bdac74785f..ce202241d22b 100644
--- a/app-admin/testdisk/testdisk-5.5.ebuild
+++ b/app-admin/testdisk/testdisk-5.7.ebuild
@@ -1,22 +1,26 @@
 # 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.5.ebuild,v 1.2 2005/03/02 08:30:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.7.ebuild,v 1.1 2005/04/30 02:05:43 dragonheart Exp $
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others"
+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"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="static"
+IUSE="static reiserfs"
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/reiserfsprogs-3.6.13
-	>=sys-fs/e2fsprogs-1.35
-	>=sys-fs/progsreiserfs-0.3.1_rc8"
+	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	>=sys-fs/e2fsprogs-1.35"
 
 src_compile() {
 	econf || die
+	if ! use reiserfs;
+	then
+		sed -i -e "s/.*REISERFS.*//g" config.h
+		sed -i -e "s/\-lreiserfs//g"  Makefile src/Makefile
+	fi
 	if use static;
 	then
 		emake smallstatic || die