app-admin/testdisk: Various QA fixes.

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

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 2b37c4bac6b7345c35292ff83ddac519870d51aa..3edb9d399138acdac40ff9994b0a503bec2dce05 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.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/Manifest b/app-admin/testdisk/Manifest
index c732fbb68797122224c030e2c1ebd559a012e06e..406efeb6e8564a3206a69f13079299707e49669d 100644 (file)
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,11 +1,25 @@
-AUX install-gentoo.patch 623 SHA256 ccf8b14e9fdfe4ce7655b6ebbe3f84d31b8403f3b9cc1cc114a04a5492899079 SHA512 a5ae323e5758ceae7f8f4fffbf2e00705239d9376f428d54b85f51840037d8a9d8ab5f3458baaa5cb50ad6c0d52431ddd0b48626cf99662075813c80bcbc76a0 WHIRLPOOL 1a1a632115f6eac383c404e4e188143429e38666086577071425ea209319f360b650872cfa7319eae4de0aa66916185b272a8c7fe1f102cd8f4dc2bd5ce0c12d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX install-gentoo.patch 1024 SHA256 6032a16605ffea598823460d080eb9ec698b43ca7d527c49f96675c2865d6bb7 SHA512 29d625132b196a9d9231719be5d262ed871e502cb7a35544ad179a41c6481ba6a4da3a0017776c9c05c4275ceffa296f47c0b3ec7d385211e43ba96287ea7c34 WHIRLPOOL eea463da698ebda3dbedf271f9e729627e6f2066dc36b9470077db83de4494c18fbd05a3f281b9a113148689440554c7e31e3bbf5a37c4866324f9536b21e88f
 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
-EBUILD testdisk-7.0.ebuild 2422 SHA256 ba3406568c03d54f74bf274db26de32db7bf2cd5d6420dacaa24bdb8765a9e2f SHA512 295ce7db2dc4259fd3af4d17a9726cc795965d7785a6c220024cd8e56c2c49607a37746c57bf80402e9bda106e6523403c9b1c1a60b2ce5e960b110a9a15f6f5 WHIRLPOOL 4836a94e151cae0bc023dd01a2587ee0f5935f9710360ff3c2dcfeeea2090b24561501b83081eca513538bd1df45c864c09e4372ff00a8ecf4a0093abbfd7d94
-MISC ChangeLog 9624 SHA256 5bf0f5a4e19ef1d3221945f1a9dd2f38d82d7c749ae236fe2c9cd60d1f8b54a8 SHA512 eb1795ef222a434c9f8f0b71a219582589412da0de9cff1e8086aa8079651c442842be89a34fd12cd0a9bb08ea57c91c69addefd7b3bfe79a4902374083ffdf3 WHIRLPOOL 8855f6799a44daea81e7145d98f81d1399a00dece5b5985e4a6c6963349530ff87ed94efeeedcc0b13276fc53cbf2ca83dd6c59bb7d3f17ac34d07f983792f99
+EBUILD testdisk-6.14.ebuild 1890 SHA256 75eb3b7738f09ffbc0a26219360577fa7d0a3ac2c2bd5dc451a1a56cb93c381f SHA512 aa2d794b34c325cd287e91a81fc722979435e862a9419a12f9b02535fe7c793a0f5ab169891eb4c4dddd3a93bb7062eac605aa9ec545c18e42bf5789ff813556 WHIRLPOOL 972e721bf7df15aa5811ba0e90f41deaac15beb7a5294bc698b9340479566f3eda9b18a6e9b9af723ed420ae1b6915d27f35f81f3245a1fc72b766e0b9f97170
+EBUILD testdisk-7.0.ebuild 2350 SHA256 22a1ca43308e1dcb845c0073314a3761766d41b21bb5f95842213737c413e969 SHA512 0588a8f108c2d5e713c0d3260ff6496b8861198fc9be3896264d1426078091b80564bd3347c8118729aaa475aef18468f2bad630eb240df6b0ad4d319907d1f0 WHIRLPOOL 1072b22811d0778a94efab60d51ca277c696e5c1d07900cf15193a26dc218b2acf5c4b70cd8b73217903b8bcf5481bcbd9b2c387f312e480fcca95c24c4dd0f0
+MISC ChangeLog 9864 SHA256 78ba6cad3bd90ecc225f8906bdf96d73e0f9f2d7982ebd751975e95e8d35c47d SHA512 29e93b8fc0925980731702bdb1ce359171cc82b7c364948fd91ce29534bede141d1cd12bced1ee27335c731b0ef3e63f5c068728a720cf6868394c5f85323b08 WHIRLPOOL 5aa8d9ed4099f01cadade4aef98909b14ad6e00275de8a4641c7a8adbc934e072ddae7e98f9e6598d5b68763b5545d677d463d2a14c8faedba8d1416852c1fc1
 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
+-----END PGP SIGNATURE-----

diff --git a/app-admin/testdisk/files/install-gentoo.patch b/app-admin/testdisk/files/install-gentoo.patch
index dae43e0ac91c8474ec828b09d59d682d40453f7b..08a3944e68cc14f9b59d8b5d6486c469c3c60c75 100644 (file)
--- 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 24fb3db207c38fa9078240517d09fe32be8c737c..e0905ebe8cf05c47a9c74ca258d51c4bee3e5df7 100644 (file)
--- 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 62be6b73dd7533fd8c82c49f4d19f0ddc2f71242..e6eeeb2dc8c5f34c894789451d591034d9101422 100644 (file)
--- 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 \