app-admin/testdisk: Add qt4 USE flag to build GUI.

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

4 files changed, 26 insertions, 16 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index b3ee5464bc60..59bac5d41727 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.59 2015/04/21 03:04:22 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.60 2015/04/21 16:27:26 nicolasbock Exp $
+
+  21 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml,
+  testdisk-7.0-r2.ebuild:
+  app-admin/testdisk: Add qt4 USE flag to build GUI.
 
 *testdisk-7.0-r2 (21 Apr 2015)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 80ba857b352d..a650bdcf03f5 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -10,18 +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-r2.ebuild 2588 SHA256 0187000193acb0bef640c99ef68b75a36ea7e9fabc34de1ea531b40c9582e95d SHA512 f26e55e686cb5724f3eacc0be7a218abc319335bc8048518aabe0736c2ad184feae8f8595c121db23ec4baa3991734ad9e1c22b0b0ff5d8dd7ac132e36983fd4 WHIRLPOOL dc182a34a8d33b448baefba35d0759bb8c192d4bbe709e9d9192d2c14741698e5e0542bc73d0f8ec92ec95197e8e4150ebdf75fcb7d963684afd8e9b4f96b863
 EBUILD testdisk-7.0.ebuild 2350 SHA256 22a1ca43308e1dcb845c0073314a3761766d41b21bb5f95842213737c413e969 SHA512 0588a8f108c2d5e713c0d3260ff6496b8861198fc9be3896264d1426078091b80564bd3347c8118729aaa475aef18468f2bad630eb240df6b0ad4d319907d1f0 WHIRLPOOL 1072b22811d0778a94efab60d51ca277c696e5c1d07900cf15193a26dc218b2acf5c4b70cd8b73217903b8bcf5481bcbd9b2c387f312e480fcca95c24c4dd0f0
-MISC ChangeLog 10180 SHA256 c2bf3145830a87245779cb5da5fc066eee28ff272e6b7cea22a3bfa6a82db586 SHA512 71418f5a991d2d4a51d62d4f8ab024bba17e0f9394d29e3315d56568aa7f373002ef965b1704260cf14b9f3dae0a1d81d3aa73168882b447be60d0dcd9860f17 WHIRLPOOL be5226d3c5110c79eb172a9b7c596f78a0df7f5e379e0aa69aeb868f9028a063591d0a9ed24d6e9213468564a6672cc5e07d741e5997f8d96a5e5ae3d98fb939
-MISC metadata.xml 474 SHA256 bc6d16fb954f1e5fa111dfe9e33e4f1fc448d514ac6c642ca713f49e61a7d9d2 SHA512 3c7c63fcef512bd7a4e6b88af75569c6a586d16768e588b66287dc773e5ec8d693db4661ce0b1ccf5990e3022bda25f09d8651e7e08a5301b3e8b38936e2a63b WHIRLPOOL be2606f0f5cc4107a2259acfbc622d538c6fcbf9c87a599e6fe61c5daeba5525f84f1c626128ae84b2bab5ef91d4c68fae2d12e4f04aae1c1fb15b4812573e2a
+MISC ChangeLog 10327 SHA256 af3931d5b6443806e17b9192b51f69eb5dda28f4cd312d1d54c5a2e3d40ae801 SHA512 0e5941870e77b472c96c81624acdfd1c3b51314463033c22759b06ec5c2dbb15dbb72be836c273d47ebd936a687cdbe229db19ef7fb3f9a15fdd86f0e769c2f3 WHIRLPOOL e46df091f31e130e493d5ea7999ecd6944c81e9c281b3989b7813b03e90da2f5641bfc5b129944fa2edc871336bba1c90be75085532d8a37478ff48b7b578bbb
+MISC metadata.xml 520 SHA256 06d3db5ad56f6172aa575a8d803e45a7ccf3360939667c9e5fa01a118bf26b67 SHA512 fa280984149bb868e5aba6e830d7b00fb1d8aab38de614c8bf365e18d2052828f4eb250934f321d95c11d585d3cc08bed184b600214c2233b16d06a771f64eaf WHIRLPOOL 4bc042ab9557ed2d5fca52567a719e83d67003dbf855a99874e0dc42b45bf1ab9266de0d7dd79886ae7d8d6d650b61f1028e74b1dce7949330cc7e7765ab0993
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVNb45AAoJEF1ww0n44d9NCggH/1xXJ8sxv0ZUbu5st/L2iSO4
-IYEF3c5dQPI7kReB5MVV9+mprIMQiYmCv/kk0p4gzewRjgBKtWxrvFFTY4aZWgMC
-aFH44u8JohNnf+LSRiRWuP6eKxyEegZoXESa5pRyjex2M3chJ5bwKbmPF4Lb70Gt
-JjgD/WROozrxsS1hORbiRTe9FBMhluJ0eI0xmUdUh+Fc5cS8uyp34kQaFy6B16az
-IPoYeSRvixP3gWEB4Z/D28L+KTwclERx+aHiF2YPAZ0+7VK00J86EP/zfV6Hv8/5
-VhfZPkAev73nW/3JTnxvvPYF5tLarD11whUFpKzyJZVZfyeT0u4nIlsO0Fhnl2I=
-=UULg
+iQEcBAEBCAAGBQJVNnpxAAoJEF1ww0n44d9NvB8H/32haosRbUdug0Ft/NDNbvHi
+lQBRDfKHuWsdkA5YCEU/ZT4p1hEWKRMgbnrkZPi4xPOrElA5rmXX/Mhy4GQfbsdF
+QDqEr48SXIENqWF57c+irKTUgQIki+bLP2rNz7wkxEPc3WBAwRnNvGePsSsHO3zB
+5IJC0fSvdhPfSdEZU1sy9esdVE42vd6rfjqhhYFLDbgd7O8/ZdwviU3v78rfbMQX
+8YpwGDLYuW1ohP9jwcLsEzsiH7wGmsT/93W0wJus6Kb65Urn2H0B/KooQw+MRPcB
+50CwhDYffahNw4WQcqNiPfNEPaTIzl1flo3b0qwfJdJyQUWk9q5x3Jq6IbUA2EI=
+=dTrl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index f6bce173ef26..bcd5bf7763ec 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -9,6 +9,7 @@
     </maintainer>
 	<use>
 		<flag name='ntfs'>Include the ability to read NTFS filesystems</flag>
-		<flag name='reiserfs'>include reiserfs reading ability</flag>
+		<flag name='reiserfs'>Include reiserfs reading ability</flag>
+		<flag name='ewf'>Include ewf library</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-7.0-r2.ebuild b/app-admin/testdisk/testdisk-7.0-r2.ebuild
index 57d84c5f1759..75180d26eb20 100644
--- a/app-admin/testdisk/testdisk-7.0-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r2.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-r2.ebuild,v 1.1 2015/04/21 03:04:22 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild,v 1.2 2015/04/21 16:27:26 nicolasbock Exp $
 
 EAPI=5
 
@@ -13,7 +13,9 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="jpeg ntfs reiserfs static"
+IUSE="ewf jpeg ntfs reiserfs static qt4"
+
+REQUIRED_USE="static? ( !qt4 )"
 
 # WARNING: reiserfs support does NOT work with reiserfsprogs
 # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
@@ -26,6 +28,7 @@ DEPEND="
 			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
 			>=sys-fs/e2fsprogs-1.35[static-libs]
 			sys-libs/zlib[static-libs]
+			!arm? ( ewf? ( app-forensics/libewf:*[static-libs] ) )
 			)
 		!static? (
 			sys-apps/util-linux
@@ -35,6 +38,8 @@ DEPEND="
 			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
 			>=sys-fs/e2fsprogs-1.35
 			sys-libs/zlib
+			!arm? ( ewf? ( app-forensics/libewf:* ) )
+			qt4? ( >=dev-qt/qtgui-4.0.1:* )
 			)"
 RDEPEND="!static? ( ${DEPEND} )"
 
@@ -56,11 +61,11 @@ src_configure() {
 	use reiserfs || myconf+=" --without-reiserfs"
 	use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
 	use jpeg || myconf+=" --without-jpeg"
+	use qt4 || myconf+=" --disable-qt"
+	use ewf || myconf+=" --without-ewf"
 
 	econf \
 		--docdir "${ROOT}/usr/share/doc/${P}" \
-		--disable-qt \
-		--without-ewf \
 		--enable-sudo \
 		${myconf}