--- php-ext-source-r2.eclass.old	2011-01-10 16:32:01.000000000 +0100
+++ php-ext-source-r2.eclass.new	2011-03-15 11:07:21.000000000 +0100
@@ -182,8 +182,8 @@
 		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
@@ -206,12 +206,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}
 
@@ -228,7 +228,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
@@ -248,7 +248,7 @@
 
 		# Add the needed lines to the <ext>.ini files
 		if [[ "${PHP_EXT_INI}" = "yes" ]] ; then
-			php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
+			php-ext-source-r2_addextension "${PHP_EXT_NAME}$(get_modname)"
 		fi
 
 		# Symlink the <ext>.ini files from ext/ to ext-active/
@@ -260,7 +260,7 @@
 		done
 
 		# Add support for installing PHP files into a version dependant directory
-		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
+		PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}"
 	done
 }
 
@@ -319,9 +319,9 @@
 	fi
 
 	if [[ -z "${4}" ]] ; then
-		einfo "Added '${my_added}' to /${3}"
+		einfo "Added '${my_added}' to ${EROOT}${3}"
 	else
-		einfo "${4} to /${3}"
+		einfo "${4} to ${EROOT}${3}"
 	fi
 
 	insinto /$(dirname ${3})