app-admin/testdisk: Fix ntfs3g dependency.

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

3 files changed, 92 insertions, 9 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 30c1c6a93c54..b3ee5464bc60 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.58 2015/04/20 21:21:56 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.59 2015/04/21 03:04:22 nicolasbock Exp $
+
+*testdisk-7.0-r2 (21 Apr 2015)
+
+  21 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> +testdisk-7.0-r2.ebuild:
+  app-admin/testdisk: Fix ntfs3g dependency.
 
 *testdisk-7.0-r1 (20 Apr 2015)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 4734b70db255..80ba857b352d 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -10,17 +10,18 @@ EBUILD testdisk-6.12.ebuild 1856 SHA256 1678f023438962f40fe94ce4d78c55ae90d1bc59
 EBUILD testdisk-6.13.ebuild 1859 SHA256 6f34569634f96ce0d7ee4c487b29d7a31846fa4953fa27f849c6e14286046204 SHA512 228890d41a79ccd67b1b736bdad40bcc1b628e215d54a4b3da32a2d7af76051e6f6e2a504071e4fa79da5c3d143ae941b522c22cb5e782b9b7939988feb3ae5d WHIRLPOOL 50a3c34b6b4391b64ba93766f9b16344fb2a0041939b285a2e3a40b56b721f61b956566c37c3df37cdd4466899081c212a455a492bc94799862deb651dce7922
 EBUILD testdisk-6.14.ebuild 1890 SHA256 75eb3b7738f09ffbc0a26219360577fa7d0a3ac2c2bd5dc451a1a56cb93c381f SHA512 aa2d794b34c325cd287e91a81fc722979435e862a9419a12f9b02535fe7c793a0f5ab169891eb4c4dddd3a93bb7062eac605aa9ec545c18e42bf5789ff813556 WHIRLPOOL 972e721bf7df15aa5811ba0e90f41deaac15beb7a5294bc698b9340479566f3eda9b18a6e9b9af723ed420ae1b6915d27f35f81f3245a1fc72b766e0b9f97170
 EBUILD testdisk-7.0-r1.ebuild 2395 SHA256 9457bfad96389b3cdb609e235dcac332babeab87a79d10c36fd8effa4507bb11 SHA512 4a0b758cfe37fe8228986161934799b61f88f6e0179aced1ddac5c340416c42b686ed397688cff3b0cd22e968fb35ec799f79919280d1f6c91d5783871eeafad WHIRLPOOL cfe03e6b292fc81422e9b6623ab82d3eb105ba7ea35a3e67ecdff26b52eacbbfdb9ab8cd7879039a3c89f96d4b04890b7247496fccc24a6c27ada5777affc8d7
+EBUILD testdisk-7.0-r2.ebuild 2371 SHA256 b2d9eff391a44c68a011ca8d2be744aa20cb5ed6dec132d6e243b81b144d5ace SHA512 f5c11752997fa3e85de65081556da14866bb29ff3dfc8ddb14ca4626b7b700c0ebef2960be8cdf7ab1521c25cd16af2b951dbf246ec8a5821955b98614241b3c WHIRLPOOL 12588eb95415999007062246012d140010631b29eb52ca914ce7b38d1b3145d60a43d67f7f1cca701d604589ce916dd32d252be5813405f2e4b6b6f904cc51ea
 EBUILD testdisk-7.0.ebuild 2350 SHA256 22a1ca43308e1dcb845c0073314a3761766d41b21bb5f95842213737c413e969 SHA512 0588a8f108c2d5e713c0d3260ff6496b8861198fc9be3896264d1426078091b80564bd3347c8118729aaa475aef18468f2bad630eb240df6b0ad4d319907d1f0 WHIRLPOOL 1072b22811d0778a94efab60d51ca277c696e5c1d07900cf15193a26dc218b2acf5c4b70cd8b73217903b8bcf5481bcbd9b2c387f312e480fcca95c24c4dd0f0
-MISC ChangeLog 10024 SHA256 bb07c51974cb91acc897584a112a935e863a8d80427a7e053a58ff453be704a2 SHA512 4a731e0fc27ae2efff8a34d5c68de24c5c4d13f12083c2ac87ba1ebad5d3974bb9febcdc3833618dc6824a6012ed3951bd7c41ac9301a5e117ca02fce4760fed WHIRLPOOL a76602c0eb87519a6dfcf1c180dccba3c94e850637822904df6c0d25fb16bc05c47dac2fab16ba4896765a32fb2a119a6f3a3a0e034f4e9fd478dfb046b4befb
+MISC ChangeLog 10180 SHA256 c2bf3145830a87245779cb5da5fc066eee28ff272e6b7cea22a3bfa6a82db586 SHA512 71418f5a991d2d4a51d62d4f8ab024bba17e0f9394d29e3315d56568aa7f373002ef965b1704260cf14b9f3dae0a1d81d3aa73168882b447be60d0dcd9860f17 WHIRLPOOL be5226d3c5110c79eb172a9b7c596f78a0df7f5e379e0aa69aeb868f9028a063591d0a9ed24d6e9213468564a6672cc5e07d741e5997f8d96a5e5ae3d98fb939
 MISC metadata.xml 474 SHA256 bc6d16fb954f1e5fa111dfe9e33e4f1fc448d514ac6c642ca713f49e61a7d9d2 SHA512 3c7c63fcef512bd7a4e6b88af75569c6a586d16768e588b66287dc773e5ec8d693db4661ce0b1ccf5990e3022bda25f09d8651e7e08a5301b3e8b38936e2a63b WHIRLPOOL be2606f0f5cc4107a2259acfbc622d538c6fcbf9c87a599e6fe61c5daeba5525f84f1c626128ae84b2bab5ef91d4c68fae2d12e4f04aae1c1fb15b4812573e2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVNW34AAoJEF1ww0n44d9NMBEH/31GhpHmjQh1SFf5VqjFdGlv
-TNvOl7Jrxn9IgCgsSwkUMS8YxeuoAYqjKBqe6PT2tB8MUve/OWH0/T7KvNlfB6Le
-5DlAkKI24FKX1G+fiE4h6x9VOyKNCS7a7ExR+SPqiw6hcR3seW7KKyd7CO1A9aCv
-Pfo9RcAnYMAv9lN09Ta9hMlrcvfxtYOJmLHaUYDnJ5hMLo1OJVXp4HILyz8rKcwl
-f8uOS9+1aydpRpY0oRMeV6/L0FLaK14bPt10fNgjvN/P7EuEBBudzGIgffmrA25I
-ddnDX7hAQ84SPDBb1AVkdsqgtPxklu54tTtHHwKKRh5A42UwLDVCzrUBuYae2tI=
-=z+0f
+iQEcBAEBCAAGBQJVNb45AAoJEF1ww0n44d9NCggH/1xXJ8sxv0ZUbu5st/L2iSO4
+IYEF3c5dQPI7kReB5MVV9+mprIMQiYmCv/kk0p4gzewRjgBKtWxrvFFTY4aZWgMC
+aFH44u8JohNnf+LSRiRWuP6eKxyEegZoXESa5pRyjex2M3chJ5bwKbmPF4Lb70Gt
+JjgD/WROozrxsS1hORbiRTe9FBMhluJ0eI0xmUdUh+Fc5cS8uyp34kQaFy6B16az
+IPoYeSRvixP3gWEB4Z/D28L+KTwclERx+aHiF2YPAZ0+7VK00J86EP/zfV6Hv8/5
+VhfZPkAev73nW/3JTnxvvPYF5tLarD11whUFpKzyJZVZfyeT0u4nIlsO0Fhnl2I=
+=UULg
 -----END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/testdisk-7.0-r2.ebuild b/app-admin/testdisk/testdisk-7.0-r2.ebuild
new file mode 100644
index 000000000000..57d84c5f1759
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0-r2.ebuild
@@ -0,0 +1,77 @@
+# 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-r2.ebuild,v 1.1 2015/04/21 03:04:22 nicolasbock Exp $
+
+EAPI=5
+
+inherit autotools-utils 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="
+		static? (
+			sys-apps/util-linux[static-libs]
+			>=sys-libs/ncurses-5.2[static-libs]
+			jpeg? ( virtual/jpeg:*[static-libs] )
+			ntfs? ( sys-fs/ntfs3g[static-libs] )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+			>=sys-fs/e2fsprogs-1.35[static-libs]
+			sys-libs/zlib[static-libs]
+			)
+		!static? (
+			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} )"
+
+PATCHES=( "${FILESDIR}/install-gentoo.patch" )
+DOCS=( )
+AUTOTOOLS_AUTORECONF=1
+BUILD_DIR="${S}"
+
+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 --without-ntfs3g"
+	use jpeg || myconf+=" --without-jpeg"
+
+	econf \
+		--docdir "${ROOT}/usr/share/doc/${P}" \
+		--disable-qt \
+		--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
+}