Bug #152380, version bump, thanks to upstream for filing it to remind us. 6.5 is a candidate for stable in 30 days.

Package-Manager: portage-2.1.2_rc1

5 files changed, 84 insertions, 20 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index f930121f892c..b3fb3862b462 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.19 2006/06/28 09:19:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.20 2006/10/30 00:48:08 robbat2 Exp $
+
+*testdisk-6.5 (30 Oct 2006)
+
+  30 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  +testdisk-6.5.ebuild:
+  Bug #152380, version bump, thanks to upstream for filing it to remind us.
+  6.5 is a candidate for stable in 30 days.
 
 *testdisk-6.4 (28 Jun 2006)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index fecce88cc173..63a526a68712 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,12 +1,10 @@
------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
+DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef
 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
@@ -31,14 +29,18 @@ EBUILD testdisk-6.4.ebuild 1984 RMD160 4743d03afd64945cd2606cbd33046e2870476b2f
 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
-SHA256 684ee960cce53eab6a91c363fcc3c714723803199232fa67342a770b4dac5266 metadata.xml 360
+EBUILD testdisk-6.5.ebuild 1980 RMD160 b3edba6803629b272e57041ce9d48a21649d371b SHA1 79cd205261129ce1b81c062c756f81a6a548ee66 SHA256 4eb09d8bdecdbaf1bd8802b85b120fdee1f01c04ad0c7680cb8d56756c77a34d
+MD5 f67b9d1ed0cbd1e92fffdc01def9571e testdisk-6.5.ebuild 1980
+RMD160 b3edba6803629b272e57041ce9d48a21649d371b testdisk-6.5.ebuild 1980
+SHA256 4eb09d8bdecdbaf1bd8802b85b120fdee1f01c04ad0c7680cb8d56756c77a34d testdisk-6.5.ebuild 1980
+MISC ChangeLog 3637 RMD160 294688e1f36a3c749924f3a66b6cb325dc88846e SHA1 6bbf563f57039d6a01525ca5b0ccbfc6feaf35b1 SHA256 42b08cae86fb1fa3a61c11228e06da87e5b46a4138eb0e7d9276fd68e11ed8e5
+MD5 038149142e5a7d4bf344e91751350b2a ChangeLog 3637
+RMD160 294688e1f36a3c749924f3a66b6cb325dc88846e ChangeLog 3637
+SHA256 42b08cae86fb1fa3a61c11228e06da87e5b46a4138eb0e7d9276fd68e11ed8e5 ChangeLog 3637
+MISC metadata.xml 402 RMD160 ae12e298d38a98431fccbee713620c8597e17f92 SHA1 d956360229d061564cf325428514f34615a2a6bf SHA256 93adc4693a6a520fbe525cb241c9e3cd55a8e8a8550386e8382fdd7e04422e74
+MD5 823f2a5e2ad7ce2c2ff737251a9d399f metadata.xml 402
+RMD160 ae12e298d38a98431fccbee713620c8597e17f92 metadata.xml 402
+SHA256 93adc4693a6a520fbe525cb241c9e3cd55a8e8a8550386e8382fdd7e04422e74 metadata.xml 402
 MD5 2455037474ead8ffe6eea9b089a9aa22 files/digest-testdisk-5.2 238
 RMD160 68e6871e8de946e4902daa950ccd97dfd324a80b files/digest-testdisk-5.2 238
 SHA256 f7dc869b17f93a6b6ecb9a5cc57a158f7d433d16d0373dc914d87e174e0077c1 files/digest-testdisk-5.2 238
@@ -57,10 +59,6 @@ SHA256 1f36cb2b1667de618f38d7287c6ab0ff168026a6e5c5970ace357b13adc26c2f files/di
 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-----
+MD5 e2e22d762e7b4f79f71faccdd6a41139 files/digest-testdisk-6.5 241
+RMD160 a4462364a0685fd7eb63db36cfc45bce6f59905c files/digest-testdisk-6.5 241
+SHA256 7d1f186b59055335cccbe0dfad9fcde947f358035edb1caa53b786b5fe920b7a files/digest-testdisk-6.5 241
diff --git a/app-admin/testdisk/files/digest-testdisk-6.5 b/app-admin/testdisk/files/digest-testdisk-6.5
new file mode 100644
index 000000000000..84dbd0331dd2
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-6.5
@@ -0,0 +1,3 @@
+MD5 58cb6ebd95d524775720646a7bb79354 testdisk-6.5.tar.bz2 628884
+RMD160 df1778147b8b19719b90240b74674c3f438a9cac testdisk-6.5.tar.bz2 628884
+SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef testdisk-6.5.tar.bz2 628884
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index fca2e32c6a5f..358d6026356f 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -7,6 +7,7 @@
     </maintainer>
     <maintainer>
         <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
+		<name>Robin H. Johnson</name>
+		<description>Primary maintainer</description>
     </maintainer>
 </pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-6.5.ebuild b/app-admin/testdisk/testdisk-6.5.ebuild
new file mode 100644
index 000000000000..fcd9215dc9d2
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.5.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.5.ebuild,v 1.1 2006/10/30 00:48:08 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/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}
+}
+