diff --git a/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch b/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
index 70a54fdbe6f83..5fa46f33081d1 100644
--- a/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
+++ b/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
@@ -1,7 +1,7 @@
 https://code.launchpad.net/~ballogy/libindicate-qt/make-examples-and-tests-optional/+merge/82829
 === modified file 'CMakeLists.txt'
---- CMakeLists.txt	2010-03-08 09:02:19 +0000
-+++ CMakeLists.txt	2011-11-20 20:28:23 +0000
+--- A/CMakeLists.txt	2010-03-08 09:02:19 +0000
++++ B/CMakeLists.txt	2011-11-20 20:28:23 +0000
 @@ -36,8 +36,16 @@
      DESTINATION lib${LIB_SUFFIX}/pkgconfig)
  
diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
index 14c4a89669321..bce155b520245 100644
--- a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
+++ b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-inherit eutils virtualx cmake-utils
+EAPI=6
+
+inherit virtualx cmake-utils
 
 _UBUNTU_REVISION=5
 
@@ -17,24 +18,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND=">=dev-libs/libindicate-12.10.0
-	dev-qt/qtgui:4"
+RDEPEND="
+	>=dev-libs/libindicate-12.10.0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( dev-qt/qttest:4 )
-	virtual/pkgconfig"
+"
 
 # bug #440042
 RESTRICT="test"
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
-	epatch "${FILESDIR}"/${P}-optionaltests.patch
+	eapply "${WORKDIR}"/debian/patches
+	eapply "${FILESDIR}"/${P}-optionaltests.patch
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
-		$(cmake-utils_use_build test TESTS)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	cmake-utils_src_configure