app-admin/testdisk-0.7: Fixed QA issue.

The Makefile.am had a customized install-data-hook which didn't conform to QA.
I added a patch that changes how the data files are installed.

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

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index e2529c16c182e01d28611225bb0a07effa971894..3b34fcf2fd188f880e70e038a75b391a685ceacc 100644 (file)
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.54 2015/04/20 12:41:28 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.55 2015/04/20 17:51:38 nicolasbock Exp $
+
+  20 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org>
+  +files/install-gentoo.patch, testdisk-7.0.ebuild:
+  app-admin/testdisk-0.7: Fixed QA issue.  The Makefile.am had a customized
+  install-data-hook which didn't conform to QA. I added a patch that changes how
+  the data files are installed.
 
 *testdisk-7.0 (20 Apr 2015)
 

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index e5824568ad217c697783a7ba150b8afa3eec1094..8ef7f35214bdce03c7afd3d3cfe0820bb0ecc9da 100644 (file)
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX install-gentoo.patch 623 SHA256 ccf8b14e9fdfe4ce7655b6ebbe3f84d31b8403f3b9cc1cc114a04a5492899079 SHA512 a5ae323e5758ceae7f8f4fffbf2e00705239d9376f428d54b85f51840037d8a9d8ab5f3458baaa5cb50ad6c0d52431ddd0b48626cf99662075813c80bcbc76a0 WHIRLPOOL 1a1a632115f6eac383c404e4e188143429e38666086577071425ea209319f360b650872cfa7319eae4de0aa66916185b272a8c7fe1f102cd8f4dc2bd5ce0c12d
 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
@@ -8,17 +9,17 @@ 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 1883 SHA256 fcd21ddc5ec7c0ac4e8e2afa80ba15d3da8a5040631d4892110af0aac7c4c321 SHA512 456d385eac4afee66806532bb5214671e73cf63c24dda1582a85d89893a0d380b16c1f86e02545b4c6e89aeca2b7807727b7f6b89be9630e5e317aadbe431fa9 WHIRLPOOL 4856370318f9aff659164640cce56381bc8aece31f326cabf156aa6baed0dbe24995a0d17880e51e37c214657d0e208fee57f1bbb497edbb6d8460aeaa80671c
-EBUILD testdisk-7.0.ebuild 1887 SHA256 79cf899380b7542dfe2337ffee9af1a98f46a10662b43a729aa8a9f47f3080a4 SHA512 085ae151dcf69cfa0028182e335b8f2fb253d0b7418276ee7ca2a0c732ebb70ce0b5fc84d824c2d5bea5a1afd3ef80dd10d410ecf2d28b97eaf8e9b8db443d99 WHIRLPOOL 4f6f9a623963682dc1a77479859eb2649defc9f10c2ec58b10ece327a4b6083738f7c4791e5ac25a201853d5c4951b5d4cdb26077d59a0d24eecfed52d202c90
-MISC ChangeLog 9211 SHA256 59cc1ae53d4eb25609a38fc67aff16ed750372e707e0776505699fc3a454b7f0 SHA512 5404e242e7635e54e70a6661f762add7aec4673a401153bc3f920a15ea0ae15cb1e38031e0e6b6e7888186a9c5eb974af65d273046e4499cfdd5fbe1ce0d9d7c WHIRLPOOL c1931cb302c5c9d484868250cdf50e044130323092fe0a61f4381e25b93f2d1041671f252cd3feca07f49ac30f7bd7736b7f87dade56267832c890079ad07cf8
+EBUILD testdisk-7.0.ebuild 2443 SHA256 339620b05ca5687051807c9e949df77d544ed875ea4df11fbffc801e2538346d SHA512 1d699e10f389ea89359320fc93bff934b58c1b5c5e284722416ca79f52b7ac99b7986afd6e22016ab474d214efba3cedc712c60c450af6d31fd9f56ed27abfab WHIRLPOOL f5ce236d129213fe2bb0c68be7167c291d21b28d0613969e91175cbd86947a4869dd1837838c082bfebc654cf8f9e57f83c249e494f22f66f3d380f50f3cb849
+MISC ChangeLog 9506 SHA256 e393282326f78f8c47e6e30dce0ab98f244798d3bc5605624dbb78d7e96a664b SHA512 f43003a2b6190312b7c9e2e635fb890054f14152c9ef98bf1f688ae6092abe92538c9e1d1f7fdde9f0b3e612eb775d82ec755f762095d800416d3a0fb57d52bf WHIRLPOOL 6b1bf4128e7181b4428cf13b396aa94f28fe841e4b689a49f063c00e48a849a44f296241a39314d4468c22b2e86b07472a45bdc5b2a21802a7ac2ca14834db2e
 MISC metadata.xml 474 SHA256 bc6d16fb954f1e5fa111dfe9e33e4f1fc448d514ac6c642ca713f49e61a7d9d2 SHA512 3c7c63fcef512bd7a4e6b88af75569c6a586d16768e588b66287dc773e5ec8d693db4661ce0b1ccf5990e3022bda25f09d8651e7e08a5301b3e8b38936e2a63b WHIRLPOOL be2606f0f5cc4107a2259acfbc622d538c6fcbf9c87a599e6fe61c5daeba5525f84f1c626128ae84b2bab5ef91d4c68fae2d12e4f04aae1c1fb15b4812573e2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVNPP8AAoJEF1ww0n44d9NVwoIANaRSQU0CKeRpXsq6j/+8CWI
-mlFRDkKiT3Yy8jOhzjrIaPMSDHBqxkxfMWzkhIeZ6X0aRvuNI9y3+/uJUF/m6Fbl
-KUw9kD8VGl4+11AOIw0Kiq0Fqtr5cta7vtxpOFLnE7/A2dI1PJVu7xMvCW3sGPEs
-AtclhsNA44JOU1CO8HMPJHJJRAyCDxCX3X76HcQUWIqiMezvt1zkSfP+zs+R4TWX
-ophGHogOMbpSVp0DbEFjz3kZsrxkvTq4wjHey+Wvz9z6V+OX0itEayrU6GgjS4fO
-lU3B+x0RGOlolewiy1dsGv5wlcjGEO5phB0BUMxl+y6Njf/C9gVEYmQDes96794=
-=d+X+
+iQEcBAEBCAAGBQJVNTytAAoJEF1ww0n44d9NpLIH/jUveSBEQ3iwwi7EXWUN1h0C
+uMoVSIixbdwBodu1ivJUt3TcYCccvhXCrWg431oVuMy330ZkZjFSfzfRn3K9RYxS
+0mCF/Ghvxvg7mlupBHiLRIxtsCqzwcyev+/4smLj/ZDQTGA5l2AbFzlVNu1nLXhu
+c8JSOr28aPiTFrHGbItrJ+DlxAALRZ3I1v1VU6O6ICdpbgtqB27B2pKtcjlRtpfN
+0k2IaoatDvFVQXsX/qMgEGM4IYAkKg4wgiDjT04FLUp1HVRdQ7KpAaKdVu1tkm1j
+APQkLT2Rk9J9GZwkOlCTQcka/OY+X4H/qmRF/s1Kil4o6+aCYK/ZFx98OvgsXu8=
+=P+e1
 -----END PGP SIGNATURE-----

diff --git a/app-admin/testdisk/files/install-gentoo.patch b/app-admin/testdisk/files/install-gentoo.patch
new file mode 100644 (file)
index 0000000..dae43e0
--- /dev/null
+++ b/app-admin/testdisk/files/install-gentoo.patch
@@ -0,0 +1,14 @@
+--- 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 @@
+ 
+ AUTOMAKE_OPTIONS = gnits
+ 
++data_DATA =  AUTHORS ChangeLog NEWS README THANKS documentation.html
++
+ install-data-hook:
+-      $(mkinstalldirs) $(DESTDIR)$(docdir)
+-      $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir)
+ if USEQT
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/applications
+       $(INSTALL_DATA) $(top_srcdir)/linux/qphotorec.desktop $(DESTDIR)$(datadir)/applications

diff --git a/app-admin/testdisk/testdisk-7.0.ebuild b/app-admin/testdisk/testdisk-7.0.ebuild
index 7df5efd5503c177fd0fc5ed48270334bcd24ba22..d2756f6e495014d30caa7d5057d8f2ec4b39c5f1 100644 (file)
--- a/app-admin/testdisk/testdisk-7.0.ebuild
+++ b/app-admin/testdisk/testdisk-7.0.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.2 2015/04/20 17:51:38 nicolasbock Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic
+inherit autotools-utils eutils flag-o-matic
 
 DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
@@ -18,15 +18,34 @@ 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"
+               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} )"
 
+AUTOTOOLS_AUTORECONF=1
+BUILD_DIR="${S}"
+
+src_prepare() {
+       epatch "${FILESDIR}/install-gentoo.patch"
+       autotools-utils_src_prepare
+}
+
 src_configure() {
        local myconf
 
@@ -38,12 +57,14 @@ src_configure() {
        # functionality.
        # The following variation must be used.
        use reiserfs || myconf+=" --without-reiserfs"
-       use ntfs || myconf+=" --without-ntfs"
+       use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
        use jpeg || myconf+=" --without-jpeg"
 
        econf \
                --docdir="${ED}/usr/share/doc/${PF}" \
+               --disable-qt \
                --without-ewf \
+               --without-ext2fs \
                --enable-sudo \
                ${myconf}