diff --git a/dev-libs/libQtOlm/Manifest b/dev-libs/libQtOlm/Manifest
index d0b70f6..65eac89 100644
--- a/dev-libs/libQtOlm/Manifest
+++ b/dev-libs/libQtOlm/Manifest
@@ -1,3 +1 @@
 DIST libqtolm-v3.0.1.tar.gz 23507 BLAKE2B 9b5279020fa8c8fac21690fb184357614d411db4fd89e8ad83896fe1ee80078a220d229269935fb7ff24f9eddb92e733ad88cb52ac7ae88f2aa27e23dcb1db5b SHA512 98ee8f1a9f69e6e78105e9deb651d276de79678f749d43ae506295d59500617ce517338894a96a163e6d2de901413d6200bb788b507a6ad9179e1cbdc682a858
-EBUILD libQtOlm-3.0.1.ebuild 769 BLAKE2B 9a4683cac477e2eda728cc9565838bd919ddead385b41413b39ab1433044b643e77392e9698b976678f5ea9c87cf1f370302bb7ccd5638a7509494b44ac8a3c6 SHA512 3e2c4a37b47e7224c58ac3f662597fdcb7c9ba1ae46a375ea8c8d6cef7eb7482c2a6844a1c30d9a05d258f0d933b58dec9a2b80269cb6e47464d874c290e22a0
-EBUILD libQtOlm-9999.ebuild 564 BLAKE2B 99fd33be45e4a425bbc01a3e7951f1064aa6952cf8cdf5f4f9a5b6470441d16fffc1370abce8e673da6c50d29c4c716559582473aa403af105b4a1c88b6a98c3 SHA512 ac6f0c642fc9d48e1490f9fb8820691ee30d7bd8faf77399704321f297eb334d4e2f39788c43d624a2d032e779778c9632d877afe218ae55ca294a666e755d95
diff --git a/dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild b/dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild
index 675679e..4f093a3 100644
--- a/dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild
+++ b/dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild
@@ -1,25 +1,23 @@
- 
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt wrapper for libolm"
 HOMEPAGE="https://gitlab.com/b0/libQtOlm"
 
-inherit eutils cmake-utils 
+inherit eutils cmake-utils
 
 SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v3.0.1/libqtolm-v3.0.1.tar.gz"
 
 if [[ ${PV} == 9999 ]]
 then
-	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
-	EGIT_COMMIT="v${PV}"
 	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
 else
-    SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/libqtolm-v${PV}"
 fi
 
 LICENSE="GPL-3"
@@ -27,12 +25,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
-	dev-libs/olm"
-	
-S="${WORKDIR}"/libqtolm-v3.0.1
-	
+	dev-libs/olm
+"
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
diff --git a/dev-libs/libQtOlm/libQtOlm-9999.ebuild b/dev-libs/libQtOlm/libQtOlm-9999.ebuild
index 9c4f18d..4f093a3 100644
--- a/dev-libs/libQtOlm/libQtOlm-9999.ebuild
+++ b/dev-libs/libQtOlm/libQtOlm-9999.ebuild
@@ -1,19 +1,23 @@
- 
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt wrapper for libolm"
 HOMEPAGE="https://gitlab.com/b0/libQtOlm"
 
-inherit eutils cmake-utils git-r3
+inherit eutils cmake-utils
 
-SRC_URI=""
-EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
-if [[ ${PV} != "9999" ]]; then
-	EGIT_COMMIT="v${PV}"
-	KEYWORDS="~amd64 ~x86"
+SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v3.0.1/libqtolm-v3.0.1.tar.gz"
+
+if [[ ${PV} == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/b0/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/b0/libqtolm/-/archive/v${PV}/libqtolm-v${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/libqtolm-v${PV}"
 fi
 
 LICENSE="GPL-3"
@@ -21,9 +25,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
-	dev-libs/olm"
+	dev-libs/olm
+"
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON