From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 6 Dec 2017 18:23:20 +0000
Subject: gentoo resync : 06.12.2017

---
 app-admin/testdisk/Manifest                        |  5 ++--
 .../testdisk/files/testdisk-7.0-qtbindir.patch     | 27 ++++++++++++++++++++++
 app-admin/testdisk/testdisk-7.0-r3.ebuild          |  2 ++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app-admin/testdisk/files/testdisk-7.0-qtbindir.patch

(limited to 'app-admin/testdisk')

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 20b3db4acd2d..f89f0352933b 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +1,4 @@
-DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
-EBUILD testdisk-7.0-r3.ebuild 2443 BLAKE2B 6e3ce9784e34190e089ed5b5b294c154f0e12536c308a82b3a9d472930af269ece3fdc2474a360265f8bdf079006ea658ed0145c3691687740ef0ea47874bbc3 SHA512 0e3e7478ddb21b301167f1ee39d67803e4f68912100194f7d6eba378281eaf2efeb36cadc773cb22aac896095e780288a53a13d0c21093fa858827dca63b1068
+AUX testdisk-7.0-qtbindir.patch 958 BLAKE2B 0d3ba4622cc6a83fe6b1fe65dd51203e05c936b7fc169fa5c070a3e77e799eac4f87068a6a6bbe9a3d6fbe25a8c6afae3a5251a72137eb4fdd4afb966e724a9e SHA512 c17dd97e058633cc3ca1f51d371bcce9d702dc2ffbd80eaad2aa1830d17c604702b23e4fb4d1516ab888f55899817e132be535d723c6b7275686d9513c6d6e31
+DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
+EBUILD testdisk-7.0-r3.ebuild 2490 BLAKE2B 05e6b8c2362f82795092e86d4962b61bf18372c07f6c10a5ec63a3e6f16835a674800edaa84c8cab3ad0d5134f08228e24a5dd825fea4a8b73e6c21d08fc5e83 SHA512 b9abc56f703cdb6398fa694e428c32fb0951d3cbd790eea41da6c24df019e47b971df902aae086e9ab85c3c4861b20b5d4c602a2a6058aede5e8ed69cf43ca3b
 MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
new file mode 100644
index 000000000000..cb99e503829d
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac	2015-04-18 11:04:47.000000000 +0200
++++ b/configure.ac	2017-12-04 20:34:51.804861863 +0100
+@@ -854,17 +854,14 @@
+ 
+ if test "$use_qt" = "true";
+ then
+-  PKG_CHECK_MODULES(QTGUI, [QtGui  >= 4.0.1],,use_qt=false)
+-  AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
+-  if test x$MOC = x ; then
+-	AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
++  PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
++        QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
++        AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
++        AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
++  ], [
++        AC_MSG_ERROR([Qt4 not found])
+ 	use_qt=false
+-  fi 
+-  AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
+-  if test x$RCC = x ; then
+-	AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
+-	use_qt=false
+-  fi 
++  ])
+   qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
+   qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
+ fi
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index 22e8db9dfe2c..30247d7d1ca6 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( )
 
+PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
+
 src_configure() {
 	local myconf
 
-- 
cgit v1.2.3