app-admin/testdisk: Fix doc installation path.

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

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 3edb9d399138acdac40ff9994b0a503bec2dce05..30c1c6a93c544c9ecc336e2f2f053fe2724ee28c 100644 (file)
--- 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.57 2015/04/20 19:59:01 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.58 2015/04/20 21:21:56 nicolasbock Exp $
+
+*testdisk-7.0-r1 (20 Apr 2015)
+
+  20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> +testdisk-7.0-r1.ebuild:
+  app-admin/testdisk: Fix doc installation path.
 
   20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> files/install-gentoo.patch,
   testdisk-6.14.ebuild, testdisk-7.0.ebuild:

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 406efeb6e8564a3206a69f13079299707e49669d..4734b70db25521df57142839b70dcda7932b7f53 100644 (file)
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -9,17 +9,18 @@ DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c2
 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 1890 SHA256 75eb3b7738f09ffbc0a26219360577fa7d0a3ac2c2bd5dc451a1a56cb93c381f SHA512 aa2d794b34c325cd287e91a81fc722979435e862a9419a12f9b02535fe7c793a0f5ab169891eb4c4dddd3a93bb7062eac605aa9ec545c18e42bf5789ff813556 WHIRLPOOL 972e721bf7df15aa5811ba0e90f41deaac15beb7a5294bc698b9340479566f3eda9b18a6e9b9af723ed420ae1b6915d27f35f81f3245a1fc72b766e0b9f97170
+EBUILD testdisk-7.0-r1.ebuild 2395 SHA256 9457bfad96389b3cdb609e235dcac332babeab87a79d10c36fd8effa4507bb11 SHA512 4a0b758cfe37fe8228986161934799b61f88f6e0179aced1ddac5c340416c42b686ed397688cff3b0cd22e968fb35ec799f79919280d1f6c91d5783871eeafad WHIRLPOOL cfe03e6b292fc81422e9b6623ab82d3eb105ba7ea35a3e67ecdff26b52eacbbfdb9ab8cd7879039a3c89f96d4b04890b7247496fccc24a6c27ada5777affc8d7
 EBUILD testdisk-7.0.ebuild 2350 SHA256 22a1ca43308e1dcb845c0073314a3761766d41b21bb5f95842213737c413e969 SHA512 0588a8f108c2d5e713c0d3260ff6496b8861198fc9be3896264d1426078091b80564bd3347c8118729aaa475aef18468f2bad630eb240df6b0ad4d319907d1f0 WHIRLPOOL 1072b22811d0778a94efab60d51ca277c696e5c1d07900cf15193a26dc218b2acf5c4b70cd8b73217903b8bcf5481bcbd9b2c387f312e480fcca95c24c4dd0f0
-MISC ChangeLog 9864 SHA256 78ba6cad3bd90ecc225f8906bdf96d73e0f9f2d7982ebd751975e95e8d35c47d SHA512 29e93b8fc0925980731702bdb1ce359171cc82b7c364948fd91ce29534bede141d1cd12bced1ee27335c731b0ef3e63f5c068728a720cf6868394c5f85323b08 WHIRLPOOL 5aa8d9ed4099f01cadade4aef98909b14ad6e00275de8a4641c7a8adbc934e072ddae7e98f9e6598d5b68763b5545d677d463d2a14c8faedba8d1416852c1fc1
+MISC ChangeLog 10024 SHA256 bb07c51974cb91acc897584a112a935e863a8d80427a7e053a58ff453be704a2 SHA512 4a731e0fc27ae2efff8a34d5c68de24c5c4d13f12083c2ac87ba1ebad5d3974bb9febcdc3833618dc6824a6012ed3951bd7c41ac9301a5e117ca02fce4760fed WHIRLPOOL a76602c0eb87519a6dfcf1c180dccba3c94e850637822904df6c0d25fb16bc05c47dac2fab16ba4896765a32fb2a119a6f3a3a0e034f4e9fd478dfb046b4befb
 MISC metadata.xml 474 SHA256 bc6d16fb954f1e5fa111dfe9e33e4f1fc448d514ac6c642ca713f49e61a7d9d2 SHA512 3c7c63fcef512bd7a4e6b88af75569c6a586d16768e588b66287dc773e5ec8d693db4661ce0b1ccf5990e3022bda25f09d8651e7e08a5301b3e8b38936e2a63b WHIRLPOOL be2606f0f5cc4107a2259acfbc622d538c6fcbf9c87a599e6fe61c5daeba5525f84f1c626128ae84b2bab5ef91d4c68fae2d12e4f04aae1c1fb15b4812573e2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVNVqIAAoJEF1ww0n44d9N9wUH/3xibgq889H2GgMxSTItx3UK
-kRwrgTkoZICL+PG6gfIoC7Q2km1CO+aAyGbnUq1lUOWcSuXnI8RHHFQ0oaK3PGcb
-LQ0l4LRNKRmICtIEsM7ed61RGi4r2aompmHa/o9BeKQNA4fMd5toDhOKiU4KoPTJ
-4MZPI8oNcoX2OcrDRnFy1DlkcQzcnhDN6pBQPrR3dY1uGU56XLsevEE2jaHj7Pno
-+V175sFYYFv5jty1242dNl1XASMT/tOn/4Zt9Fw8MIEqqkqolFOJd47y1598KKpN
-kpTsPK00iHsqD5xDim2r9OecHfF3XLDq7OMEq90P/tCZx+w1wIDJpYtZfQKAsNw=
-=yh4u
+iQEcBAEBCAAGBQJVNW34AAoJEF1ww0n44d9NMBEH/31GhpHmjQh1SFf5VqjFdGlv
+TNvOl7Jrxn9IgCgsSwkUMS8YxeuoAYqjKBqe6PT2tB8MUve/OWH0/T7KvNlfB6Le
+5DlAkKI24FKX1G+fiE4h6x9VOyKNCS7a7ExR+SPqiw6hcR3seW7KKyd7CO1A9aCv
+Pfo9RcAnYMAv9lN09Ta9hMlrcvfxtYOJmLHaUYDnJ5hMLo1OJVXp4HILyz8rKcwl
+f8uOS9+1aydpRpY0oRMeV6/L0FLaK14bPt10fNgjvN/P7EuEBBudzGIgffmrA25I
+ddnDX7hAQ84SPDBb1AVkdsqgtPxklu54tTtHHwKKRh5A42UwLDVCzrUBuYae2tI=
+=z+0f
 -----END PGP SIGNATURE-----

diff --git a/app-admin/testdisk/testdisk-7.0-r1.ebuild b/app-admin/testdisk/testdisk-7.0-r1.ebuild
new file mode 100644 (file)
index 0000000..3dd66af
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0-r1.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-r1.ebuild,v 1.1 2015/04/20 21:21:56 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-2013.1.13[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-2013.1.13 )
+                       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
+}