app-admin/testdisk: Various QA fixes.

* Fix isntallation location of DOCS.
* Fix missing slot dependencies.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)

4 files changed, 28 insertions, 16 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 2b37c4bac6b7..3edb9d399138 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.56 2015/04/20 18:39:48 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.57 2015/04/20 19:59:01 nicolasbock Exp $
+
+  20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> files/install-gentoo.patch,
+  testdisk-6.14.ebuild, testdisk-7.0.ebuild:
+  app-admin/testdisk: Various QA fixes.  * Fix isntallation location of DOCS. *
+  Fix missing slot dependencies.
 
   20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> testdisk-7.0.ebuild:
   app-admin/testdisk-7.0: Re-enable ext2fs
diff --git a/app-admin/testdisk/files/install-gentoo.patch b/app-admin/testdisk/files/install-gentoo.patch
index dae43e0ac91c..08a3944e68cc 100644
--- a/app-admin/testdisk/files/install-gentoo.patch
+++ b/app-admin/testdisk/files/install-gentoo.patch
@@ -1,10 +1,21 @@
 --- Makefile.am-original	2015-04-20 11:31:03.000000000 -0600
-+++ Makefile.am	2015-04-20 11:34:10.000000000 -0600
-@@ -24,9 +24,9 @@
++++ Makefile.am	2015-04-20 13:27:01.000000000 -0600
+@@ -1,9 +1,8 @@
+ SUBDIRS = icons man src
+ 
+-EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \
++EXTRA_DIST = compile.sh \
+ 	progsreiserfs-journal.patch progsreiserfs-file-read.patch \
+ 	darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \
+-	documentation.html \
+ 	dos/readme.txt \
+ 	linux/testdisk.spec.in \
+ 	linux/qphotorec.desktop \
+@@ -24,9 +23,9 @@
  
  AUTOMAKE_OPTIONS = gnits
  
-+data_DATA =  AUTHORS ChangeLog NEWS README THANKS documentation.html
++dist_doc_DATA =  AUTHORS COPYING ChangeLog NEWS INFO INSTALL README THANKS documentation.html
 +
  install-data-hook:
 -	$(mkinstalldirs) $(DESTDIR)$(docdir)
diff --git a/app-admin/testdisk/testdisk-6.14.ebuild b/app-admin/testdisk/testdisk-6.14.ebuild
index 24fb3db207c3..e0905ebe8cf0 100644
--- a/app-admin/testdisk/testdisk-6.14.ebuild
+++ b/app-admin/testdisk/testdisk-6.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-6.14.ebuild,v 1.2 2014/12/30 19:51:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.3 2015/04/20 19:59:01 nicolasbock Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ IUSE="jpeg ntfs reiserfs static"
 DEPEND="
 		sys-apps/util-linux
 		>=sys-libs/ncurses-5.2
-		jpeg? ( virtual/jpeg )
+		jpeg? ( virtual/jpeg:* )
 		ntfs? ( sys-fs/ntfs3g )
 		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
 		>=sys-fs/e2fsprogs-1.35
diff --git a/app-admin/testdisk/testdisk-7.0.ebuild b/app-admin/testdisk/testdisk-7.0.ebuild
index 62be6b73dd75..e6eeeb2dc8c5 100644
--- a/app-admin/testdisk/testdisk-7.0.ebuild
+++ b/app-admin/testdisk/testdisk-7.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2015/04/20 18:39:48 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.4 2015/04/20 19:59:01 nicolasbock Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ DEPEND="
 		static? (
 			sys-apps/util-linux[static-libs]
 			>=sys-libs/ncurses-5.2[static-libs]
-			jpeg? ( virtual/jpeg[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]
@@ -30,7 +30,7 @@ DEPEND="
 		!static? (
 			sys-apps/util-linux
 			>=sys-libs/ncurses-5.2
-			jpeg? ( virtual/jpeg )
+			jpeg? ( virtual/jpeg:* )
 			ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
 			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
 			>=sys-fs/e2fsprogs-1.35
@@ -38,14 +38,11 @@ DEPEND="
 			)"
 RDEPEND="!static? ( ${DEPEND} )"
 
+PATCHES=( "${FILESDIR}/install-gentoo.patch" )
+DOCS=( )
 AUTOTOOLS_AUTORECONF=1
 BUILD_DIR="${S}"
 
-src_prepare() {
-	epatch "${FILESDIR}/install-gentoo.patch"
-	autotools-utils_src_prepare
-}
-
 src_configure() {
 	local myconf
 
@@ -61,7 +58,6 @@ src_configure() {
 	use jpeg || myconf+=" --without-jpeg"
 
 	econf \
-		--docdir="${ED}/usr/share/doc/${PF}" \
 		--disable-qt \
 		--without-ewf \
 		--enable-sudo \