--- old/php-ext-source-r2.eclass	2011-09-15 23:05:37.000000000 +0200
+++ new/php-ext-source-r2.eclass	2011-09-15 23:26:33.000000000 +0200
@@ -179,15 +179,15 @@
 		php_init_slot_env ${slot}
 
 		# Let's put the default module away
-		insinto "${EXT_DIR}"
-		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+		insinto "${EXT_DIR#${EPREFIX}}"
+		newins "modules/${PHP_EXT_NAME}$(get_modname)" "${PHP_EXT_NAME}$(get_modname)" || die "Unable to install extension"
 
 		local doc
 		for doc in ${DOCS} ; do
 			[[ -s ${doc} ]] && dodoc ${doc}
 		done
 
-		INSTALL_ROOT="${D}" emake install-headers
+		INSTALL_ROOT="${ED}" emake install-headers
 	done
 	php-ext-source-r2_createinifiles
 }
@@ -204,12 +204,12 @@
 php_init_slot_env() {
 	libdir=$(get_libdir)
 
-	PHPIZE="/usr/${libdir}/${1}/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
-	PHPCLI="/usr/${libdir}/${1}/bin/php"
-	PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
+	PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize"
+	PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config"
+	PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php"
+	PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi"
 	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
-	PHPPREFIX="/usr/${libdir}/${slot}"
+	PHPPREFIX="${EPREFIX}/usr/${libdir}/${slot}"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 	PHP_CURRENTSLOT=${1:3}
 
@@ -226,7 +226,7 @@
 	PHPINIFILELIST=""
 	local x
 	for x in ${PHPSAPILIST} ; do
-		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
+		if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
 		fi
 	done
@@ -338,7 +338,7 @@
 	fi
 
 	insinto /$(dirname ${3})
-	doins "${inifile}"
+	doins "${inifile#${EPREFIX}}"
 }
 
 # @FUNCTION: php-ext-source-r2_addtoinifiles