app-admin/testdisk: Version bump.

See Bug 547080.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAC91CA52

3 files changed, 77 insertions, 7 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index ef9ee0e1d975..e2529c16c182 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/testdisk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.53 2014/12/30 19:51:44 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.54 2015/04/20 12:41:28 nicolasbock Exp $
+
+*testdisk-7.0 (20 Apr 2015)
+
+  20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> +testdisk-7.0.ebuild:
+  app-admin/testdisk: Version bump.  See Bug 547080.
 
   30 Dec 2014; Markus Meier <maekke@gentoo.org> testdisk-6.14.ebuild:
   add ~arm, bug #531444
@@ -248,4 +253,3 @@
   24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> testdisk-5.2.ebuild:
   Initial ebuild submitted by Sebastian B. Otaegui <sotaegui@itba.edu.ar>, bug
   #47278.
-
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index b4494adb02a7..e5824568ad21 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -4,15 +4,21 @@ Hash: SHA256
 DIST testdisk-6.12.tar.bz2 554633 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16 SHA512 5cd17d1ad851515dcd1f3ef5dfb7435aff2f89e2b0467e84552809d203688a47731e23a602dc10355861414eb2d8c6b9edd48225ccc6229ab59810803a59da4c WHIRLPOOL f667fa6e61990cd6c6532301e461fc1cdcd9303a96566cc501dc1945fd9328b234b8c3f5a760a839a9d4b026da29d03c3189fa9afc58b7f7efa6e96b15008a49
 DIST testdisk-6.13.tar.bz2 560696 SHA256 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220 SHA512 30889b8afed5b0fac93ce028e8c95bfa3e14b72d39cc4f86659edcce0b8820c5ce0c2b7e1d09f23f0da977b5d1cb275551069a87b109d05538e63e9b76200442 WHIRLPOOL b9bcf93df5b42a26b4206969ee968122f194338a28c6a500e540e3cafec2ae84d0734624c58b3581fc9ac71f2ea1038f2997e3f91278d6eed18abf786cd31200
 DIST testdisk-6.14.tar.bz2 620077 SHA256 a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c SHA512 f479c7863e1a39bf747a0b73b37eba1016e4762373b9b68747fed6141aa8faa7703c89dddc975df18904759292cd7d333ca0619eacb3c1eea76790a917e95774 WHIRLPOOL def7c9506747c68e5fb786ab0725c8ca2e15ccd53fc7f336d77f72067a6a6094c716c57ec3652a8386bf176b40e2fb1504925c6734bc3037799a4bbef3c8e67d
+DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
 EBUILD testdisk-6.12.ebuild 1856 SHA256 1678f023438962f40fe94ce4d78c55ae90d1bc59efddc909390f98dfbd3df9f9 SHA512 b59e8ffc7d054e1a02d4773a689682e5219e82f411ee3423d5dad633b922eb41d60117627b5335f7b544cb1f3af5bb2c78de32376535f8cb56cbbcc4d46ecace WHIRLPOOL ef7e3243f5790cb4df36c693de96c3112cc05022db0fddf47340782bdfc456a70a80cd90b4b846dc3d7e72e26fb544b4b2176c5ea65ea31b14e6afcb6820c516
 EBUILD testdisk-6.13.ebuild 1859 SHA256 6f34569634f96ce0d7ee4c487b29d7a31846fa4953fa27f849c6e14286046204 SHA512 228890d41a79ccd67b1b736bdad40bcc1b628e215d54a4b3da32a2d7af76051e6f6e2a504071e4fa79da5c3d143ae941b522c22cb5e782b9b7939988feb3ae5d WHIRLPOOL 50a3c34b6b4391b64ba93766f9b16344fb2a0041939b285a2e3a40b56b721f61b956566c37c3df37cdd4466899081c212a455a492bc94799862deb651dce7922
 EBUILD testdisk-6.14.ebuild 1883 SHA256 fcd21ddc5ec7c0ac4e8e2afa80ba15d3da8a5040631d4892110af0aac7c4c321 SHA512 456d385eac4afee66806532bb5214671e73cf63c24dda1582a85d89893a0d380b16c1f86e02545b4c6e89aeca2b7807727b7f6b89be9630e5e317aadbe431fa9 WHIRLPOOL 4856370318f9aff659164640cce56381bc8aece31f326cabf156aa6baed0dbe24995a0d17880e51e37c214657d0e208fee57f1bbb497edbb6d8460aeaa80671c
-MISC ChangeLog 9049 SHA256 d4c235f06679aa1a4db09b83db1a533c31d14e4fc3302e49e4ff2d7e4f9f76ab SHA512 5a20cd6ffe28c988a5a043ffd1282be96c7ad44da50418db42b30c5c1f28d499a9b407f56c86d108f2c06b5b2393f71c1b97aa1dbd582fb9acb7c92cb2fb963a WHIRLPOOL b28dcac83433ba7dab234146d357545cd7b4ebe1a75004f7ba7351b9dbf324df1856c1697fcfa6676da608f9900c195dacbe466e4f5c122172d215826bc810ff
+EBUILD testdisk-7.0.ebuild 1887 SHA256 79cf899380b7542dfe2337ffee9af1a98f46a10662b43a729aa8a9f47f3080a4 SHA512 085ae151dcf69cfa0028182e335b8f2fb253d0b7418276ee7ca2a0c732ebb70ce0b5fc84d824c2d5bea5a1afd3ef80dd10d410ecf2d28b97eaf8e9b8db443d99 WHIRLPOOL 4f6f9a623963682dc1a77479859eb2649defc9f10c2ec58b10ece327a4b6083738f7c4791e5ac25a201853d5c4951b5d4cdb26077d59a0d24eecfed52d202c90
+MISC ChangeLog 9211 SHA256 59cc1ae53d4eb25609a38fc67aff16ed750372e707e0776505699fc3a454b7f0 SHA512 5404e242e7635e54e70a6661f762add7aec4673a401153bc3f920a15ea0ae15cb1e38031e0e6b6e7888186a9c5eb974af65d273046e4499cfdd5fbe1ce0d9d7c WHIRLPOOL c1931cb302c5c9d484868250cdf50e044130323092fe0a61f4381e25b93f2d1041671f252cd3feca07f49ac30f7bd7736b7f87dade56267832c890079ad07cf8
 MISC metadata.xml 474 SHA256 bc6d16fb954f1e5fa111dfe9e33e4f1fc448d514ac6c642ca713f49e61a7d9d2 SHA512 3c7c63fcef512bd7a4e6b88af75569c6a586d16768e588b66287dc773e5ec8d693db4661ce0b1ccf5990e3022bda25f09d8651e7e08a5301b3e8b38936e2a63b WHIRLPOOL be2606f0f5cc4107a2259acfbc622d538c6fcbf9c87a599e6fe61c5daeba5525f84f1c626128ae84b2bab5ef91d4c68fae2d12e4f04aae1c1fb15b4812573e2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSjAlEACgkQkKaRLQcq0GLbUwCggUyOv3NvnnfA32s/jlv+gx2v
-gxAAnAypXG2pEG/eMXxbYkrl1sVPrnpG
-=cuhV
+iQEcBAEBCAAGBQJVNPP8AAoJEF1ww0n44d9NVwoIANaRSQU0CKeRpXsq6j/+8CWI
+mlFRDkKiT3Yy8jOhzjrIaPMSDHBqxkxfMWzkhIeZ6X0aRvuNI9y3+/uJUF/m6Fbl
+KUw9kD8VGl4+11AOIw0Kiq0Fqtr5cta7vtxpOFLnE7/A2dI1PJVu7xMvCW3sGPEs
+AtclhsNA44JOU1CO8HMPJHJJRAyCDxCX3X76HcQUWIqiMezvt1zkSfP+zs+R4TWX
+ophGHogOMbpSVp0DbEFjz3kZsrxkvTq4wjHey+Wvz9z6V+OX0itEayrU6GgjS4fO
+lU3B+x0RGOlolewiy1dsGv5wlcjGEO5phB0BUMxl+y6Njf/C9gVEYmQDes96794=
+=d+X+
 -----END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/testdisk-7.0.ebuild b/app-admin/testdisk/testdisk-7.0.ebuild
new file mode 100644
index 000000000000..7df5efd5503c
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.1 2015/04/20 12:41:28 nicolasbock Exp $
+
+EAPI=5
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="jpeg ntfs reiserfs static"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+		sys-apps/util-linux
+		>=sys-libs/ncurses-5.2
+		jpeg? ( virtual/jpeg )
+		ntfs? ( sys-fs/ntfs3g )
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+		>=sys-fs/e2fsprogs-1.35
+		sys-libs/zlib"
+RDEPEND="!static? ( ${DEPEND} )"
+
+src_configure() {
+	local myconf
+
+	# 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
+
+	# --with-foo are broken, any use of --with/--without disable the
+	# functionality.
+	# The following variation must be used.
+	use reiserfs || myconf+=" --without-reiserfs"
+	use ntfs || myconf+=" --without-ntfs"
+	use jpeg || myconf+=" --without-jpeg"
+
+	econf \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		--without-ewf \
+		--enable-sudo \
+		${myconf}
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}