version bump thanks to upstream notification service. Cheers Christophe

Package-Manager: portage-2.1.2.7

5 files changed, 98 insertions, 15 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 4d5d83da910e..bff26315498e 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.23 2007/02/18 20:22:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.24 2007/06/27 08:57:24 dragonheart Exp $
+
+*testdisk-6.7 (27 Jun 2007)
+
+  27 Jun 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/testdisk-6.7-constdef.patch, +testdisk-6.7.ebuild:
+  version bump thanks to upstream notification service. Cheers Christophe
 
 *testdisk-6.6 (18 Feb 2007)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 8be6db942e97..3c0bf311eb89 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,8 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX testdisk-6.7-constdef.patch 495 RMD160 3e5a1b3442e7391a9077d3946d0c05652a853da1 SHA1 75b054f27354bf58e4451304e077c02c78fc9c2a SHA256 2a65bfb91bcf4d57ae5b80683e9b860f7b9c822b14f5276cc0b2a9f342634bd4
+MD5 e68708a290248cfbb8378a308fb46f43 files/testdisk-6.7-constdef.patch 495
+RMD160 3e5a1b3442e7391a9077d3946d0c05652a853da1 files/testdisk-6.7-constdef.patch 495
+SHA256 2a65bfb91bcf4d57ae5b80683e9b860f7b9c822b14f5276cc0b2a9f342634bd4 files/testdisk-6.7-constdef.patch 495
 DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef
 DIST testdisk-6.6.tar.bz2 826142 RMD160 94856001d5ab63f305c29a075cadc1c1137f52da SHA1 8661a0f7b1ec80953d57260deb164795668ec467 SHA256 d0528f0e80748165b805f1a323e4042d9850c8a42f3d6da8a31e578223966536
+DIST testdisk-6.7.tar.bz2 762396 RMD160 5514ad8ef2dec793cc130916a4e6e62426d6bb24 SHA1 85cc60b2a7d194ea2a47cd2061ab8425cb96466a SHA256 dd3acc1f17414e37f8e6ef71736f17cb69b98d5f84863973753edc19bc644bc8
 EBUILD testdisk-6.5.ebuild 1981 RMD160 ca62baadaa1c9da9d14659541fa921975ce5c4d7 SHA1 39ca7aa31dcbb4603cb0cc8535291184a1137822 SHA256 075cff064a1ab23a84ab1e41fe041bb13e8d6462b3e2cf837b8321d1c4c82db6
 MD5 e8f124318482086fa699600b98e19029 testdisk-6.5.ebuild 1981
 RMD160 ca62baadaa1c9da9d14659541fa921975ce5c4d7 testdisk-6.5.ebuild 1981
@@ -11,10 +13,14 @@ EBUILD testdisk-6.6.ebuild 2000 RMD160 477103a4b3ccd8822010ed647a4b0403336b717b
 MD5 c113f729862563b857f4bcc50fb93c79 testdisk-6.6.ebuild 2000
 RMD160 477103a4b3ccd8822010ed647a4b0403336b717b testdisk-6.6.ebuild 2000
 SHA256 9487e054a5118c0ffbc6a4a58b28deb4e29e09965a05b422a0c5850e11efe687 testdisk-6.6.ebuild 2000
-MISC ChangeLog 4169 RMD160 2cfcc4b01f3985e1d534179721755ed6d6c012c9 SHA1 902063b9acf69821176ad0c565aa84094d6a0d2f SHA256 3ad0b8f440bd393cc81786592f3ec6c8daaa0f397932a3288722bac96c12c01f
-MD5 8cc740de4b9e40a3aec74adb8acbd48e ChangeLog 4169
-RMD160 2cfcc4b01f3985e1d534179721755ed6d6c012c9 ChangeLog 4169
-SHA256 3ad0b8f440bd393cc81786592f3ec6c8daaa0f397932a3288722bac96c12c01f ChangeLog 4169
+EBUILD testdisk-6.7.ebuild 2088 RMD160 c5cc311c678ca09e81762e5936ebbba610109244 SHA1 bcb5374d89423353d30105fd1768a069a30ad7b0 SHA256 14a078e2caa089d12a2be35ab8fa8382392058b9c3fb8a035a17cc4c15d1c2e7
+MD5 853f988c89f62e54c3433558bd250f9b testdisk-6.7.ebuild 2088
+RMD160 c5cc311c678ca09e81762e5936ebbba610109244 testdisk-6.7.ebuild 2088
+SHA256 14a078e2caa089d12a2be35ab8fa8382392058b9c3fb8a035a17cc4c15d1c2e7 testdisk-6.7.ebuild 2088
+MISC ChangeLog 4386 RMD160 3882bbd7eb4832e0b7a4397f6237361ac487b1d7 SHA1 152d630b2f8f23fb8c937d7c25bc21fdb30f7fa0 SHA256 08152626d7e0399482f94d802abdc2f2fef5894bf1ffa95e1a333e6c63fbd325
+MD5 341e5ae328867573d542d13133f97fb0 ChangeLog 4386
+RMD160 3882bbd7eb4832e0b7a4397f6237361ac487b1d7 ChangeLog 4386
+SHA256 08152626d7e0399482f94d802abdc2f2fef5894bf1ffa95e1a333e6c63fbd325 ChangeLog 4386
 MISC metadata.xml 402 RMD160 ae12e298d38a98431fccbee713620c8597e17f92 SHA1 d956360229d061564cf325428514f34615a2a6bf SHA256 93adc4693a6a520fbe525cb241c9e3cd55a8e8a8550386e8382fdd7e04422e74
 MD5 823f2a5e2ad7ce2c2ff737251a9d399f metadata.xml 402
 RMD160 ae12e298d38a98431fccbee713620c8597e17f92 metadata.xml 402
@@ -25,10 +31,6 @@ SHA256 7d1f186b59055335cccbe0dfad9fcde947f358035edb1caa53b786b5fe920b7a files/di
 MD5 638886550dba8439dc895e866e6a3971 files/digest-testdisk-6.6 241
 RMD160 81415506162fe3c0d477f6442710d553c0eeb61b files/digest-testdisk-6.6 241
 SHA256 5b751c1d5361119c9b0b050be95ac267b56d7692c4cdf9b1d840bdf3462a6dc9 files/digest-testdisk-6.6 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF2LW0mdTrptrqvGERAg9gAJoC3F6pU7L6TybtY8ZisG//T26HpgCeJ08h
-AK1EHyMSK0PXmUggCgUNMmA=
-=b8xa
------END PGP SIGNATURE-----
+MD5 5dbeb6b712cae3f19ee58682c8c5b137 files/digest-testdisk-6.7 241
+RMD160 9d56a4a9a19d711d3444dbbfaf5f5ccbb75ca41d files/digest-testdisk-6.7 241
+SHA256 d75a297e6c7bbf87a5e8bccf7be901b1600cfe7ad8bc3f6977e950ae3d182465 files/digest-testdisk-6.7 241
diff --git a/app-admin/testdisk/files/digest-testdisk-6.7 b/app-admin/testdisk/files/digest-testdisk-6.7
new file mode 100644
index 000000000000..8ac9bbde575b
--- /dev/null
+++ b/app-admin/testdisk/files/digest-testdisk-6.7
@@ -0,0 +1,3 @@
+MD5 cf5f633dbbeadfff0c38d39e1fa56b5e testdisk-6.7.tar.bz2 762396
+RMD160 5514ad8ef2dec793cc130916a4e6e62426d6bb24 testdisk-6.7.tar.bz2 762396
+SHA256 dd3acc1f17414e37f8e6ef71736f17cb69b98d5f84863973753edc19bc644bc8 testdisk-6.7.tar.bz2 762396
diff --git a/app-admin/testdisk/files/testdisk-6.7-constdef.patch b/app-admin/testdisk/files/testdisk-6.7-constdef.patch
new file mode 100644
index 000000000000..a527314892c8
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-6.7-constdef.patch
@@ -0,0 +1,11 @@
+--- testdisk-6.7/src/ntfsp.c.orig	2007-06-27 18:38:59.000000000 +1000
++++ testdisk-6.7/src/ntfsp.c	2007-06-27 18:48:21.000000000 +1000
+@@ -101,7 +101,7 @@
+     }
+     for(lcn=0;lcn<no_of_cluster;lcn++)
+     {
+-      static long long bmplcn = -sizeof_buffer - 1;	/* Which bit of $Bitmap is in the buffer */
++      static long long bmplcn = -512 - 1;	/* Which bit of $Bitmap is in the buffer */
+       int byte, bit;
+       if ((lcn < bmplcn) || (lcn >= (bmplcn + (sizeof_buffer << 3))))
+       {
diff --git a/app-admin/testdisk/testdisk-6.7.ebuild b/app-admin/testdisk/testdisk-6.7.ebuild
new file mode 100644
index 000000000000..a3365d6129c9
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.7.ebuild,v 1.1 2007/06/27 08:57:24 dragonheart Exp $
+
+inherit eutils
+
+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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-constdef.patch
+}
+
+src_compile() {
+	local myconf="--without-ewf"
+	# --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}
+}
+