diff --git a/app-forensics/guymager/Manifest b/app-forensics/guymager/Manifest
index 43f4339c5..ca80d9013 100644
--- a/app-forensics/guymager/Manifest
+++ b/app-forensics/guymager/Manifest
@@ -1 +1,2 @@
 DIST guymager-0.7.3.tar.gz 277484 SHA256 1b59dfd82580fe601bd18ddb9a088134a03a5f1945c6aeb1cad09e21b89dea0f SHA512 ed6881fe5ddbb3097467f4566c56dc46a03394d8faac93cbf6305e63a4ee9f17685a7b11b2a4de1a2ec795ca959c520af5aa4d169d08609d1d98e62eda1dd8ae WHIRLPOOL f99b7d97a759d91cbff0e3ab31d23d04b803b7444f31540fec223ef6935e4e7c9a1c11e3f3eb6a59e23e45bca4d88362af7bd7fdb48ffb74ccdf727c7bef6f22
+DIST guymager-0.8.7.tar.gz 293199 SHA256 0b57d7e32e61e69a9860ef72c2cf3e23412a907b2f5178fe0847f90a70a54c4d SHA512 b9ec9f49c82b57c59b33622453c892136d9767b511395fb1fa06fec8fa84e377ac79268358f3643c23768b751f8344f48f0e5c6c61f6fbb12dfff9b6a6f7ad69 WHIRLPOOL efa0791784e4d3b71c56bf1e8b383e740e939de1c469f34c23e809e47d9bf9255465b613815657697fb65ca0ef8242233b6cfb5e4f76df0fdc300bb01992079c
diff --git a/app-forensics/guymager/guymager-0.8.7.ebuild b/app-forensics/guymager/guymager-0.8.7.ebuild
index 6db150133..fa05c6542 100644
--- a/app-forensics/guymager/guymager-0.8.7.ebuild
+++ b/app-forensics/guymager/guymager-0.8.7.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit qt4-r2 subversion
+inherit qmake-utils
 
 DESCRIPTION="Guymager is a fast and user friendly forensic imager."
 HOMEPAGE="http://guymager.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/guymager/${PV}.tar.gz"
-#SRC_URI="mirror://debian/pool/main/g/guymager/${P//-/_}.orig.tar.gz ->  ${P}.tar.gz"
-ESVN_REPO_URI="https://svn.code.sf.net/p/guymager/code/tags/guymager-0.8.7"
-
+SRC_URI="mirror://sourceforge/guymager/guymager/LatestSource/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -19,13 +16,13 @@ SLOT="0"
 
 IUSE="debug hdparm udisk smart parted"
 
-RDEPEND="dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtdbus
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtdbus:5
 	sys-libs/zlib
 	sys-process/procps
 	hdparm? ( sys-apps/hdparm )
-	udisk? ( sys-fs/udisks )
+	udisk? ( sys-fs/udisks:* )
 	smart? ( sys-apps/smartmontools )
 	parted? ( sys-block/parted )"
 DEPEND="${RDEPEND}
@@ -33,20 +30,13 @@ DEPEND="${RDEPEND}
 	app-forensics/libewf
 	dev-libs/libguytools2:="
 
-#PATCHES=(
-#	"${FILESDIR}/systemlibs.patch"
-#	"${FILESDIR}/support_new_libewf.patch"
-#	"${FILESDIR}/libewf201711.patch"
-#)
-
 src_prepare() {
-#	epatch "${FILESDIR}/systemlibs.patch"
-#	epatch "${FILESDIR}/support_new_libewf.patch"
 	epatch "${FILESDIR}/libewf201711.patch"
+	eapply_user
 }
 
 src_configure() {
-	eqmake4
+	eqmake5
 }
 
 src_compile() {