[dev-libs/Ice] EAPI=6

dev-libs/Ice/Ice-3.6.9999.ebuild

@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5} pypy )
 
@@ -21,7 +20,7 @@ EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 EGIT_BRANCH="3.6"
 
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator git-r3
+inherit db-use eutils mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs versionator git-r3
 
 # for mono-env
 unset SRC_URI
@@ -77,7 +76,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
+	default
 
 	sed -i \
 		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
@@ -319,7 +318,7 @@ src_install() {
 			insinto "${EXT_DIR}"
 			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
 		done
-		php-ext-source-r2_createinifiles
+		php-ext-source-r3_createinifiles
 
 		popd >/dev/null || die
 	fi