diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index b2bb45c..b6b40b7 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -19,16 +19,16 @@ USE_PHP="php7-1 php7-2"
 # This variable does not belong to any eclass. It is solely used in this ebuild
 BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
 
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs versionator
+inherit db-use eapi7-ver mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
 
 DESCRIPTION="ICE middleware C++ library and generator tools"
 HOMEPAGE="https://zeroc.com/products/ice"
 SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
+	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples libressl +readline mono php python ruby test debug"
+IUSE="debug doc examples libressl +readline mono php python ruby test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index d05e548..63442d1 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -23,7 +23,7 @@ EGIT_BRANCH="3.6"
 # This variable does not belong to any eclass. It is solely used in this ebuild
 BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
 
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs versionator git-r3
+inherit db-use eapi7-ver mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs git-r3
 
 # for mono-env
 unset SRC_URI
@@ -33,7 +33,7 @@ HOMEPAGE="https://zeroc.com/products/ice"
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS=""
-IUSE="examples libressl +readline mono php python ruby test debug"
+IUSE="debug examples libressl +readline mono php python ruby test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
diff --git a/dev-libs/libtommath/libtommath-1.0-r1.ebuild b/dev-libs/libtommath/libtommath-1.0-r1.ebuild
index e25b9e7..a154d6c 100644
--- a/dev-libs/libtommath/libtommath-1.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-1.0-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools-multilib eutils multilib toolchain-funcs
 
@@ -16,9 +15,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc examples static-libs"
 
 DEPEND="sys-devel/libtool"
-RDEPEND=""
 
 src_prepare() {
+	default
 	# need libtool for cross compilation. Bug #376643
 	cat <<-EOF > configure.ac
 	AC_INIT(libtommath, 0)
@@ -38,7 +37,11 @@ src_configure() {
 
 _emake() {
 	cd ${BUILD_DIR}
-	emake CC="$(tc-getCC)" -f makefile.shared \
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		-f makefile.shared \
 		IGNORE_SPEED=1 \
 		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
 		INCPATH="${EPREFIX}/usr/include" \
@@ -49,6 +52,11 @@ src_compile() {
 	multilib_foreach_abi _emake
 }
 
+src_test() {
+	multilib_foreach_abi _emake test_standalone
+	multilib_foreach_abi ./test || die
+}
+
 src_install() {
 	multilib_foreach_abi _emake DESTDIR="${ED}" install
 	# We only link against -lc, so drop the .la file.