version bump thanks to Christophe Grenier bug #137515. Cleaned old version and fixed HOMEPAGE too

Package-Manager: portage-2.1

5 files changed, 94 insertions, 11 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index b7ab0f45ae30..f930121f892c 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/testdisk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.19 2006/06/28 09:19:26 dragonheart Exp $
+
+*testdisk-6.4 (28 Jun 2006)
+
+  28 Jun 2006; Daniel Black <dragonheart@gentoo.org> testdisk-6.3.ebuild,
+  +testdisk-6.4.ebuild:
+  version bump thanks to Christophe Grenier bug #137515. Cleaned old version
+  and fixed HOMEPAGE too
 
 *testdisk-6.3 (25 May 2006)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 81932f4f4fe9..fecce88cc173 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+DIST testdisk-6.4.tar.bz2 569310 RMD160 c55983f026294154a5725599897cb8337b79d881 SHA1 35287eedc9b8f357a0ba3b668a54dda2084e70ed SHA256 c587b1129b95143fa83dab3780f0f9182f931a0bb67e9347f9cb976a8b4fc05d
 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
@@ -19,14 +23,18 @@ EBUILD testdisk-6.2.ebuild 1064 RMD160 d6d63680f2863c7f053086b693c7a5b1e5ce3ae7
 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
+EBUILD testdisk-6.3.ebuild 1984 RMD160 b5c5b7e382b7926787fc25a6d04593e858c2d486 SHA1 b55d81d0f43191953809752052b65006038a95ca SHA256 a7ad2bbe28ea008325d1887bdae66a26edcd070d764f39579c46b9c2d825aeba
+MD5 cc0377a61021956bb152e54d0353322f testdisk-6.3.ebuild 1984
+RMD160 b5c5b7e382b7926787fc25a6d04593e858c2d486 testdisk-6.3.ebuild 1984
+SHA256 a7ad2bbe28ea008325d1887bdae66a26edcd070d764f39579c46b9c2d825aeba testdisk-6.3.ebuild 1984
+EBUILD testdisk-6.4.ebuild 1984 RMD160 4743d03afd64945cd2606cbd33046e2870476b2f SHA1 70dac2eaed183ff6a0e91d359fb5c4bc6647fd47 SHA256 8a16872ec2e1dd1ebd0c3af80b2240775fc8e2bb3f3109fdcf779a47df84bdaf
+MD5 388bae98cd33b2c31f4cb26de2186d0d testdisk-6.4.ebuild 1984
+RMD160 4743d03afd64945cd2606cbd33046e2870476b2f testdisk-6.4.ebuild 1984
+SHA256 8a16872ec2e1dd1ebd0c3af80b2240775fc8e2bb3f3109fdcf779a47df84bdaf testdisk-6.4.ebuild 1984
+MISC ChangeLog 3400 RMD160 b70469f32211be376ba337826dd5ca9bda55a543 SHA1 6528e273267f0b4ecff2e50a52304c9dbcd10132 SHA256 75f12c8e41436f32f38d6a30419a79a89295ef35b0eec7fdaae83e7978aa2995
+MD5 37241c4399135633e82139e070659160 ChangeLog 3400
+RMD160 b70469f32211be376ba337826dd5ca9bda55a543 ChangeLog 3400
+SHA256 75f12c8e41436f32f38d6a30419a79a89295ef35b0eec7fdaae83e7978aa2995 ChangeLog 3400
 MISC metadata.xml 360 RMD160 cc0769b1e13eb4e05cb623d2038868db9c584071 SHA1 f801aa06c3afae41a788d2879bb13630977dbdf8 SHA256 684ee960cce53eab6a91c363fcc3c714723803199232fa67342a770b4dac5266
 MD5 2eda01aeb2ca3b2cc3d79a970018fdf8 metadata.xml 360
 RMD160 cc0769b1e13eb4e05cb623d2038868db9c584071 metadata.xml 360
@@ -46,3 +54,13 @@ SHA256 0c86feee5ad94127b4e6e24919925103cc492b6d671bf373dffc44bad6aa6a74 files/di
 MD5 c635e2d82766e685ae937000b5bacb88 files/digest-testdisk-6.3 241
 RMD160 c1ea6ba54bff69ccedb4a8dda6c4640e45b34db3 files/digest-testdisk-6.3 241
 SHA256 1f36cb2b1667de618f38d7287c6ab0ff168026a6e5c5970ace357b13adc26c2f files/digest-testdisk-6.3 241
+MD5 f879b96316e7cba78adc0fd0be05e93f files/digest-testdisk-6.4 241
+RMD160 3e493add713c05b26e17888bdcdc056297df1173 files/digest-testdisk-6.4 241
+SHA256 0121c3dc40267b453c15ab26fed218a28259706f7dd7738c961cb895c8fe7622 files/digest-testdisk-6.4 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEokoumdTrptrqvGERAgpzAKCG48Qay3+h4wLcmxYiupfjtb3KPgCfVzfp
+U3VrCnefsj2fqMcxor1sQTM=
+=6u4l
+-----END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/files/digest-testdisk-6.4 b/app-admin/testdisk/files/digest-testdisk-6.4
new file mode 100644
index 000000000000..1841d5973252
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-6.4
@@ -0,0 +1,3 @@
+MD5 188c2216c76f2fe4db8eae1ea033188a testdisk-6.4.tar.bz2 569310
+RMD160 c55983f026294154a5725599897cb8337b79d881 testdisk-6.4.tar.bz2 569310
+SHA256 c587b1129b95143fa83dab3780f0f9182f931a0bb67e9347f9cb976a8b4fc05d testdisk-6.4.tar.bz2 569310
diff --git a/app-admin/testdisk/testdisk-6.3.ebuild b/app-admin/testdisk/testdisk-6.3.ebuild
index 92d77ad942ed..e774b8c59b4c 100644
--- a/app-admin/testdisk/testdisk-6.3.ebuild
+++ b/app-admin/testdisk/testdisk-6.3.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.3.ebuild,v 1.2 2006/06/28 09:19:26 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"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
 SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/testdisk/testdisk-6.4.ebuild b/app-admin/testdisk/testdisk-6.4.ebuild
new file mode 100644
index 000000000000..486b736c6f94
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.4.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.4.ebuild,v 1.1 2006/06/28 09:19:26 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/wiki/TestDisk"
+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}
+}
+