diff --git a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild
index a918f64a5965f..9d26d35d5dfcb 100644
--- a/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.2_pre20180118.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
@@ -31,7 +31,8 @@ RDEPEND="
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -62,7 +63,7 @@ src_configure() {
 	append-cxxflags -std=c++14
 
 	econf \
-		--program-suffix=-${SLOT} \
+		--program-suffix=-$(ver_cut 1-2) \
 		--disable-werror \
 		$(use_with man) \
 		$(use_enable static-libs static) \
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index 648347ed63bc3..8513c4a8cb4fb 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
@@ -31,7 +31,8 @@ RDEPEND="
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -57,7 +58,7 @@ src_configure() {
 	append-cxxflags -std=c++14
 
 	econf \
-		--program-suffix=-${SLOT} \
+		--program-suffix=-$(ver_cut 1-2) \
 		--disable-werror \
 		$(use_with man) \
 		$(use_enable static-libs static) \