version bump

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64

3 files changed, 68 insertions, 12 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index c23789f2667f..55d1a852258d 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.33 2008/07/17 21:35:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.34 2008/07/19 14:36:35 dragonheart Exp $
+
+*testdisk-6.10 (19 Jul 2008)
+
+  19 Jul 2008; Daniel Black <dragonheart@gentoo.org> +testdisk-6.10.ebuild:
+  version bump
 
   17 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index b90e1f5e7a91..542d0d517041 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX testdisk-6.8-jpeg.patch 906 RMD160 f7bd8d37075b56e9ecaf9d1229ac7158e903c903 SHA1 be62fb01f9e5f362175d504e128e9119f267e71f SHA256 d65b14f780b07d0f84cad44fd25d8f82ebf9b45ea0229b19c721cbdf53d7e1a8
+DIST testdisk-6.10.tar.bz2 1474157 RMD160 4280290ad49de525c59e92983256c7694541d622 SHA1 21104146148ab98ba2a5a757398336a2345eca36 SHA256 539e7ec274126a827dfa4df751d71d15e03cf66c3fa73aac8f552d486c779593
 DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef
 DIST testdisk-6.8-ntfsprogs2.patch.bz2 8751 RMD160 465a4b34f2f6f9f114c98011c07f15b7b8ab26fb SHA1 2405aaaed4bce405600046adf6e83dec6c4126a9 SHA256 6e30a089825b5271499be816de4b907bf62f790655c9c34bec49ddd9699d182a
 DIST testdisk-6.8.tar.bz2 768698 RMD160 e9fd360e126cbce21c3a17711ea02dc33206cceb SHA1 7e461905fcd275edf019a87ac18bcb4401a2b379 SHA256 390a8c9d537105b8839e7dec60873b59c0a971f31be539c331f29be8d98cd833
 DIST testdisk-6.9.tar.bz2 1310209 RMD160 c355633b198874f51454c8ec118166d6c5ee032b SHA1 bd15e5db5123a984807ac98a5520acd61a36deb7 SHA256 f859ba849c8cd2967943045a9079d883c06d144a484b50270f2e2e1836c4d7cc
+EBUILD testdisk-6.10.ebuild 2040 RMD160 3df60a2758f2be2000496b82c94f56b4285dd983 SHA1 c2b204027ff19fc136d430916a687c3855ef896f SHA256 4f9f89a529ed1e92a2b3f86dfebcbcb1c57ed0cf37adf4bb60720a14e446e5c3
 EBUILD testdisk-6.5.ebuild 1884 RMD160 c46783e1a4bec218740583ccfa59ac8dacbd459c SHA1 c420cbc0c874a0902a0a8ad772632144a12580fd SHA256 333ff0be16200c147ba9d09293e2b2be36da139b6dece1305a2ef87ccbb3fed4
 EBUILD testdisk-6.8-r1.ebuild 2094 RMD160 24b1e082b7bb9387b913ccb114df1cac16245194 SHA1 49ca9cbb933624304cbb76973d113d6c3395b45a SHA256 96740ae642f63cfe0dc61f2a31930a5fe8a310d5806a6c8d4bcf8e8daa58dbd0
 EBUILD testdisk-6.9.ebuild 1945 RMD160 b7966bc9cfe2af9fa98237c781b2015191e036f7 SHA1 9f83eabcdc5d6eeac6bb214a151c8c58a1240944 SHA256 ad68dc057d01b7899885b96ccec7076c32775031addd834d3a1c682b2725b536
-MISC ChangeLog 5863 RMD160 b3a936f240e0d24cbe98025ec0a6b098abc80977 SHA1 6b8d3f0c633ed8382ed63fcf295f3eddac4e4e9a SHA256 38b1b897032fe9c75536bd295badf1aedeccd8470a5316d1e33b66fe031991b4
+MISC ChangeLog 5990 RMD160 70784f7c4aaa9d028296bd06d0c575fdf9ce5f92 SHA1 b8f375d72f149783b78428521d6d11e6bd9ba3b1 SHA256 1b276f143f439f5b28eac8442ed51af342e95f3ba504ba2cf1da2a413a117592
 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh/u0IACgkQoeSe8B0zEfyzeACeLDuSS9kHAGPOK1MW9LMl7BJh
-D4QAoIjlYgb05WqOVCVODxiGJt5Tdu1J
-=9XVO
------END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/testdisk-6.10.ebuild b/app-admin/testdisk/testdisk-6.10.ebuild
new file mode 100644
index 000000000000..debb1c37d9f5
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.10.ebuild,v 1.1 2008/07/19 14:36:35 dragonheart Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+#SRC_URI="http://www.cgsecurity.org/${P}-WIP.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-2.0.0 )
+	  	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	  	>=sys-fs/e2fsprogs-1.35
+		sys-libs/zlib"
+RDEPEND="!static? ( ${DEPEND} )"
+
+#S=${WORKDIR}/${P}-WIP
+
+src_compile() {
+	local myconf="--without-ewf --enable-sudo"
+	# --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"
+
+	# 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
+
+	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
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	[ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF}
+}