Bug #128489, version bump. Also fix broken NTFS and reiserfs support - this last actually worked in the 5.7 ebuild, and has been broken badly since.

(Portage version: 2.1_rc2)

8 files changed, 75 insertions, 3 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index e8ab4deb5925..b7ab0f45ae30 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.17 2005/11/11 22:43:09 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.18 2006/05/25 05:50:06 robbat2 Exp $
+
+*testdisk-6.3 (25 May 2006)
+
+  25 May 2006; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  +testdisk-6.3.ebuild:
+  Bug #128489, version bump. Also fix broken NTFS and reiserfs support - this
+  last actually worked in the 5.7 ebuild, and has been broken badly since.
 
   11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> testdisk-5.9.ebuild:
   Stable on ppc.
diff --git a/app-admin/testdisk/files/digest-testdisk-5.2 b/app-admin/testdisk/files/digest-testdisk-5.2
index 75a3873f7c67..493eaf7dbf4c 100644
--- a/app-admin/testdisk/files/digest-testdisk-5.2
+++ b/app-admin/testdisk/files/digest-testdisk-5.2
@@ -1 +1,3 @@
 MD5 f31ee06d2040e1d610a5891b57a86f65 testdisk-5.2.tar.gz 458451
+RMD160 4aacf816849cfc40f5347e06a289a2b60f07ac39 testdisk-5.2.tar.gz 458451
+SHA256 b50bf656f9bd37fbeefa3448685adcb65348c2b07b646e718af4d40411bfd50d testdisk-5.2.tar.gz 458451
diff --git a/app-admin/testdisk/files/digest-testdisk-5.7 b/app-admin/testdisk/files/digest-testdisk-5.7
index d190f5e0d69c..b936f16bc58a 100644
--- a/app-admin/testdisk/files/digest-testdisk-5.7
+++ b/app-admin/testdisk/files/digest-testdisk-5.7
@@ -1 +1,3 @@
 MD5 86b5472fcbf4a1f1aa36aefec4e5f4ac testdisk-5.7.tar.gz 519777
+RMD160 aa456d558c07754cbf80fc9f8f8c77d6565346f3 testdisk-5.7.tar.gz 519777
+SHA256 86d5df49aaee280dbd5ddc9bf6807c385a74bef3419d15852fdce3686e6ac687 testdisk-5.7.tar.gz 519777
diff --git a/app-admin/testdisk/files/digest-testdisk-5.9 b/app-admin/testdisk/files/digest-testdisk-5.9
index c4c5bd565479..ed028128eaf8 100644
--- a/app-admin/testdisk/files/digest-testdisk-5.9
+++ b/app-admin/testdisk/files/digest-testdisk-5.9
@@ -1 +1,3 @@
 MD5 2cfde909c7857c73a95a54a82faedd79 testdisk-5.9-WIP.tar.gz 555103
+RMD160 30633d78da6c47e55154e76fe5b3208dbfd69b8b testdisk-5.9-WIP.tar.gz 555103
+SHA256 82e6f9eea7fd64edb99c9bf044ee0252436eb98891988de94bbe3048805883ca testdisk-5.9-WIP.tar.gz 555103
diff --git a/app-admin/testdisk/files/digest-testdisk-6.2 b/app-admin/testdisk/files/digest-testdisk-6.2
index 2602adfa4f92..7d86731f96ed 100644
--- a/app-admin/testdisk/files/digest-testdisk-6.2
+++ b/app-admin/testdisk/files/digest-testdisk-6.2
@@ -1 +1,3 @@
 MD5 61e175ee6a70cd9ad9ed43c09dedc609 testdisk-6.2-WIP.tar.bz2 522993
+RMD160 90324466e896a4e2fac1dfbd722eb239c913f6cb testdisk-6.2-WIP.tar.bz2 522993
+SHA256 097c7cc3c28c9c646c3a2c9cb1fa21301bbd5dec3e48e1f96826a00a2f8393cd testdisk-6.2-WIP.tar.bz2 522993
diff --git a/app-admin/testdisk/files/digest-testdisk-6.3 b/app-admin/testdisk/files/digest-testdisk-6.3
new file mode 100644
index 000000000000..853be5144819
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-6.3
@@ -0,0 +1,3 @@
+MD5 e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 539376
+RMD160 8a3054acab3cb17d24fac1c2326ef791e1fe2e81 testdisk-6.3.tar.bz2 539376
+SHA256 a63cbd3111e9f04653cce212a219653c1f3b732822a1fd7cd536170c825c0170 testdisk-6.3.tar.bz2 539376
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 91186c326a59..fca2e32c6a5f 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -4,7 +4,6 @@
     <herd>forensics</herd>
     <maintainer>
         <email>forensics@gentoo.org</email>
-        <name>Robin H. Johnson</name>
     </maintainer>
     <maintainer>
         <email>robbat2@gentoo.org</email>
diff --git a/app-admin/testdisk/testdisk-6.3.ebuild b/app-admin/testdisk/testdisk-6.3.ebuild
new file mode 100644
index 000000000000..92d77ad942ed
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.3.ebuild,v 1.1 2006/05/25 05:50:06 robbat2 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"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static reiserfs ntfs jpeg"
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND=">=sys-libs/ncurses-5.2
+		jpeg? ( media-libs/jpeg )
+	  	ntfs? ( >=sys-fs/ntfsprogs-1.9.4 )
+	  	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	  	>=sys-fs/e2fsprogs-1.35"
+RDEPEND="!static? ( ${DEPEND} )"
+
+src_compile() {
+	local myconf
+	# --with-foo are broken, any use of --with/--without disable the
+	# functionality.
+	# The following variation must be used.
+	use reiserfs || myconf="${myconf} --without-reiserfs"
+	use ntfs || myconf="${myconf} --without-ntfs"
+	use jpeg || myconf="${myconf} --without-jpeg"
+
+	econf ${myconf} || die
+
+	# perform safety checks for NTFS and REISERFS
+	if useq ntfs && egrep -q 'undef HAVE_LIBNTFS\>' ${S}/config.h ; then
+		die "Failed to find NTFS library."
+	fi
+	if useq reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' ${S}/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if useq jpeg && egrep -q 'undef HAVE_LIBJPEG\>' ${S}/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+
+	# this is static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	[ "$PF" != "$P" ] && mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
+}
+