diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index b6b40b7..751a254 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby24"
+USE_RUBY="ruby25"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php7-1 php7-2"
+USE_PHP="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 )
@@ -23,12 +23,11 @@ inherit db-use eapi7-ver mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-
 
 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/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug doc examples libressl +readline mono php python ruby test"
+RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
@@ -40,7 +39,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	)
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby24) )
+	ruby? ( $(ruby_implementation_depend ruby25) )
 	mono? ( dev-lang/mono )"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline:0= )
@@ -128,7 +127,7 @@ src_configure() {
 		"prefix=\"${ED%/}/usr\""
 		"install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
 		"install_configdir=\"${ED%/}/usr/share/${P}/config\""
-		"install_mandir=\"${ED%/}/usr/share/man\""
+		"install_mandir=\"${ED%/}/usr/share/man/man1\""
 		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
 		"LP64=yes"
 		"new_dtags=yes"
@@ -153,25 +152,25 @@ src_configure() {
 	fi
 
 	if use ruby; then
-		SITERUBY="$(ruby24 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby24 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
 		MAKE_RULES_RUBY=(
 			"install_rubydir=\"${ED%/}/${SITERUBY}\""
 			"install_libdir=\"${ED%/}/${SITERUBYARCH}\""
 		)
 
-		# make it use ruby24 only
+		# make it use ruby25 only
 		sed -i \
-			-e 's|RUBY = ruby|\024|' \
+			-e 's|RUBY = ruby|\025|' \
 			ruby/config/Make.rules || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\024|' \
+			-e 's|env ruby|\025|' \
 			ruby/config/s2rb.rb || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\024|' \
+			-e 's|env ruby|\025|' \
 			ruby/scripts/slice2rb || die "sed failed"
 		sed -i \
-			-e 's|output.write("ruby|\024|' \
+			-e 's|output.write("ruby|\025|' \
 			scripts/TestUtil.py || die "sed failed"
 	fi
 
@@ -261,7 +260,6 @@ src_test() {
 
 src_install() {
 	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
 	einstalldocs
 
 	insinto /usr/share/${P}
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index b93e421..350ce52 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS=""
 IUSE="debug examples libressl +readline mono php python ruby test"
+#RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1