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.

Package-Manager: portage-2.1_rc2

9 files changed, 119 insertions, 9 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/Manifest b/app-admin/testdisk/Manifest
index b850f446b1b6..81932f4f4fe9 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,10 +1,48 @@
-MD5 1c483a4d558771cc952bbe909107de1d ChangeLog 2891
-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 8ad7771dcf24e978d4b1084629fea125 files/digest-testdisk-6.2 69
-MD5 e18eb10540dc80dac5f436b82cd48528 metadata.xml 398
+DIST testdisk-5.2.tar.gz 458451 RMD160 4aacf816849cfc40f5347e06a289a2b60f07ac39 SHA1 82283730437870e143b207b9c50c4b13d7840fab SHA256 b50bf656f9bd37fbeefa3448685adcb65348c2b07b646e718af4d40411bfd50d
+DIST testdisk-5.7.tar.gz 519777 RMD160 aa456d558c07754cbf80fc9f8f8c77d6565346f3 SHA1 307fa77a8bbdf981ebd2012898944aecff6c8bb8 SHA256 86d5df49aaee280dbd5ddc9bf6807c385a74bef3419d15852fdce3686e6ac687
+DIST testdisk-5.9-WIP.tar.gz 555103 RMD160 30633d78da6c47e55154e76fe5b3208dbfd69b8b SHA1 62c3c68ed08c599cb3af731461771b57f25a68fa SHA256 82e6f9eea7fd64edb99c9bf044ee0252436eb98891988de94bbe3048805883ca
+DIST testdisk-6.2-WIP.tar.bz2 522993 RMD160 90324466e896a4e2fac1dfbd722eb239c913f6cb SHA1 eabaeabf85ba99b1b6a5836b62840e21fa53df52 SHA256 097c7cc3c28c9c646c3a2c9cb1fa21301bbd5dec3e48e1f96826a00a2f8393cd
+DIST testdisk-6.3.tar.bz2 539376 RMD160 8a3054acab3cb17d24fac1c2326ef791e1fe2e81 SHA1 c76420450ac11660ee2f60d84055c01023d0660c SHA256 a63cbd3111e9f04653cce212a219653c1f3b732822a1fd7cd536170c825c0170
+EBUILD testdisk-5.2.ebuild 882 RMD160 40b3a61fe685531e4dfe0af14e65d7562362fee3 SHA1 2a9042a4324a1016432b4f6eb738b2401fd660f3 SHA256 5e8a0ba4ce3fc0c81749360c0c666bf84887d4f1c6992c4d8d4f7001b7ecc3a7
 MD5 60fd4cf89afdb8428dee1477dd67c8e9 testdisk-5.2.ebuild 882
+RMD160 40b3a61fe685531e4dfe0af14e65d7562362fee3 testdisk-5.2.ebuild 882
+SHA256 5e8a0ba4ce3fc0c81749360c0c666bf84887d4f1c6992c4d8d4f7001b7ecc3a7 testdisk-5.2.ebuild 882
+EBUILD testdisk-5.7.ebuild 1093 RMD160 19b02abb66ef8035ced13233d4905ac8f7ebc854 SHA1 7641ee25e5a08a284bf60af3c2e55428e8d66229 SHA256 0b5daef5e408a3d628db03adc401e45a89cf9984b8580ec7a31fa4829ec1fef0
 MD5 8a20706de4506c16a11cf363e05a0016 testdisk-5.7.ebuild 1093
+RMD160 19b02abb66ef8035ced13233d4905ac8f7ebc854 testdisk-5.7.ebuild 1093
+SHA256 0b5daef5e408a3d628db03adc401e45a89cf9984b8580ec7a31fa4829ec1fef0 testdisk-5.7.ebuild 1093
+EBUILD testdisk-5.9.ebuild 1131 RMD160 fb772e45091fa0af93f7751db732c66c8ad147cf SHA1 95be88e5b800df0759e62d12d1de967dbcf5fdbb SHA256 6ac98444b03c36788fba74c96c47998dbbd65ea0895443f7bf2e46ff493e22e5
 MD5 e4aa0b948ea9b9fa782622667d360ac9 testdisk-5.9.ebuild 1131
+RMD160 fb772e45091fa0af93f7751db732c66c8ad147cf testdisk-5.9.ebuild 1131
+SHA256 6ac98444b03c36788fba74c96c47998dbbd65ea0895443f7bf2e46ff493e22e5 testdisk-5.9.ebuild 1131
+EBUILD testdisk-6.2.ebuild 1064 RMD160 d6d63680f2863c7f053086b693c7a5b1e5ce3ae7 SHA1 1ae89cd17471a9cafbea1d0ed4267c7eb395ea35 SHA256 bad394983ac94aefd648a407557888a1c41979bcef3e10114f5a660c6e3c3d1a
 MD5 8e0fadaf04e3e90dda99bbb1746bf55e testdisk-6.2.ebuild 1064
+RMD160 d6d63680f2863c7f053086b693c7a5b1e5ce3ae7 testdisk-6.2.ebuild 1064
+SHA256 bad394983ac94aefd648a407557888a1c41979bcef3e10114f5a660c6e3c3d1a testdisk-6.2.ebuild 1064
+EBUILD testdisk-6.3.ebuild 1991 RMD160 84e8b37871e6168a9e8fb8d6450ef7ed6057f7a2 SHA1 bc3735858a6858b5b11b3e5eb00df7140186be0d SHA256 83c69c85e1939eaf9aa83248fa75f58e8233bda62ce297156cba969c5fd74893
+MD5 20f9e2a7a79f8035f7a6985c81ed1e01 testdisk-6.3.ebuild 1991
+RMD160 84e8b37871e6168a9e8fb8d6450ef7ed6057f7a2 testdisk-6.3.ebuild 1991
+SHA256 83c69c85e1939eaf9aa83248fa75f58e8233bda62ce297156cba969c5fd74893 testdisk-6.3.ebuild 1991
+MISC ChangeLog 3166 RMD160 fed3c3b3940dcfb772925e713c6839a37178e8b7 SHA1 5043c0be97418c1b30630878038b6864912c7a3a SHA256 5dc0fc5514e30c13d339cbfbe2e0ed132382d511fed78d3da7a4d50f86e096be
+MD5 960d9916d9df1e648ba8377cb1a381dc ChangeLog 3166
+RMD160 fed3c3b3940dcfb772925e713c6839a37178e8b7 ChangeLog 3166
+SHA256 5dc0fc5514e30c13d339cbfbe2e0ed132382d511fed78d3da7a4d50f86e096be ChangeLog 3166
+MISC metadata.xml 360 RMD160 cc0769b1e13eb4e05cb623d2038868db9c584071 SHA1 f801aa06c3afae41a788d2879bb13630977dbdf8 SHA256 684ee960cce53eab6a91c363fcc3c714723803199232fa67342a770b4dac5266
+MD5 2eda01aeb2ca3b2cc3d79a970018fdf8 metadata.xml 360
+RMD160 cc0769b1e13eb4e05cb623d2038868db9c584071 metadata.xml 360
+SHA256 684ee960cce53eab6a91c363fcc3c714723803199232fa67342a770b4dac5266 metadata.xml 360
+MD5 2455037474ead8ffe6eea9b089a9aa22 files/digest-testdisk-5.2 238
+RMD160 68e6871e8de946e4902daa950ccd97dfd324a80b files/digest-testdisk-5.2 238
+SHA256 f7dc869b17f93a6b6ecb9a5cc57a158f7d433d16d0373dc914d87e174e0077c1 files/digest-testdisk-5.2 238
+MD5 73321e0f26f5cc005cd6c40c045aca5f files/digest-testdisk-5.7 238
+RMD160 30758cf60a51e154028b07c16f0eab63d687e44d files/digest-testdisk-5.7 238
+SHA256 c0a74a56ae240a5fb9225425fd89f7afd722a2b1c39482b207c08373dce3be95 files/digest-testdisk-5.7 238
+MD5 65bf91f1223f59a9919bfe1a0226565e files/digest-testdisk-5.9 250
+RMD160 265ac2ed1b7b515f81abb772e7f9d772b7b21116 files/digest-testdisk-5.9 250
+SHA256 ecd57fea0ae7d3d3464b157b35344f236ab0a4bf32b8f29bdea890876c978494 files/digest-testdisk-5.9 250
+MD5 43ca84d289c97dd1075c3b349cf765bf files/digest-testdisk-6.2 253
+RMD160 e84041a55b550a3877b1b321a6b7bc536d81f330 files/digest-testdisk-6.2 253
+SHA256 0c86feee5ad94127b4e6e24919925103cc492b6d671bf373dffc44bad6aa6a74 files/digest-testdisk-6.2 253
+MD5 c635e2d82766e685ae937000b5bacb88 files/digest-testdisk-6.3 241
+RMD160 c1ea6ba54bff69ccedb4a8dda6c4640e45b34db3 files/digest-testdisk-6.3 241
+SHA256 1f36cb2b1667de618f38d7287c6ab0ff168026a6e5c5970ace357b13adc26c2f files/digest-testdisk-6.3 241
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}
+}
+