Index: eclass/php5_2-sapi.eclass
===================================================================
--- eclass/php5_2-sapi.eclass	(revision 20203)
+++ eclass/php5_2-sapi.eclass	(working copy)
@@ -228,16 +228,16 @@
 }
 
 php5_2-sapi_set_php_ini_dir() {
-	PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"
+	PHP_INI_DIR="${EPREFIX}/etc/php/${PHPSAPI}-php5"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 
 php5_2-sapi_install_ini() {
-	destdir=/usr/$(get_libdir)/php5
+	destdir="${EPREFIX}"/usr/$(get_libdir)/php5
 
 	# get the extension dir, if not already defined
-	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`"
+	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
 
 	# work out where we are installing the ini file
 	php5_2-sapi_set_php_ini_dir
@@ -255,7 +255,7 @@
 
 	# Set the include path to point to where we want to find PEAR packages
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php5:/usr/share/php"|' -i ${phpinisrc}
+	sed -e "s|^;include_path = \".:/php/includes\".*|include_path = \".:${EPREFIX}/usr/share/php5:${EPREFIX}/usr/share/php\"|" -i ${phpinisrc}
 
 	# Add needed MySQL extensions charset configuration
 	local phpmycnfcharset=""
@@ -288,20 +288,20 @@
 		echo ";pdo_mysql.connect_charset = utf8" >> ${phpinisrc}
 	fi
 
-	dodir ${PHP_INI_DIR}
-	insinto ${PHP_INI_DIR}
+	dodir ${PHP_INI_DIR#${EPREFIX}}
+	insinto ${PHP_INI_DIR#${EPREFIX}}
 	newins ${phpinisrc} ${PHP_INI_FILE}
 
-	dodir ${PHP_EXT_INI_DIR}
-	dodir ${PHP_EXT_INI_DIR_ACTIVE}
+	dodir ${PHP_EXT_INI_DIR#${EPREFIX}}
+	dodir ${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}
 
 	# Install any extensions built as shared objects
 	if use sharedext ; then
-		for x in `ls "${ED}/${PHPEXTDIR}/"*.so | sort` ; do
+		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
 			inifilename=${x/.so/.ini}
 			inifilename=`basename ${inifilename}`
-			echo "extension=`basename ${x}`" >> "${ED}/${PHP_EXT_INI_DIR}/${inifilename}"
-			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
+			echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
+			dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"
 		done
 	fi
 }
@@ -390,8 +390,11 @@
 	# Fix configure scripts to correctly support Suhosin
 	einfo "Running aclocal"
 	aclocal --force || die "Unable to run aclocal successfully"
+	# Prefixed portage seems not to find libtoolize here, since it is glibtoolize
 	einfo "Running libtoolize"
-	libtoolize --copy --force || die "Unable to run libtoolize successfully"
+	libtoolize --copy --force ||
+		glibtoolize --copy --force || 
+		die "Unable to run libtoolize successfully"
 
 	# Rebuild configure to make sure it's up to date
 	einfo "Rebuilding configure script"
@@ -409,7 +412,7 @@
 # Takes care of compiling php according to USE flags set by user (and those automagically
 # enabled via phpconfutils eclass if unavoidable).
 php5_2-sapi_src_compile() {
-	destdir=/usr/$(get_libdir)/php5
+	destdir="${EPREFIX}"/usr/$(get_libdir)/php5
 
 	php5_2-sapi_set_php_ini_dir
 
@@ -421,10 +424,10 @@
 
 	#				extension		USE flag		shared support?
 	phpconfutils_extension_enable	"bcmath"		"bcmath"		1
-	phpconfutils_extension_with	"bz2"			"bzip2"			1
+	phpconfutils_extension_with	"bz2"			"bzip2"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"calendar"		"calendar"		1
 	phpconfutils_extension_disable	"ctype"			"ctype"			0
-	phpconfutils_extension_with	"curl"			"curl"			1
+	phpconfutils_extension_with	"curl"			"curl"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"curlwrappers"		"curlwrappers"		0
 	phpconfutils_extension_enable	"dbase"			"dbase"			1
 	phpconfutils_extension_disable	"dom"			"xml"			0
@@ -434,32 +437,32 @@
 	phpconfutils_extension_disable	"filter"		"filter"		0
 	phpconfutils_extension_enable	"ftp"			"ftp"			1
 	phpconfutils_extension_with	"gettext"		"nls"			1
-	phpconfutils_extension_with	"gmp"			"gmp"			1
+	phpconfutils_extension_with	"gmp"			"gmp"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_disable	"hash"			"hash"			0
 	phpconfutils_extension_without	"iconv"			"iconv"			0
 	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
 	phpconfutils_extension_disable	"json"			"json"			0
-	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "/usr"
+	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}/usr"
 	phpconfutils_extension_disable	"libxml"		"xml"			0
 	phpconfutils_extension_enable	"mbstring"		"unicode"		1
-	phpconfutils_extension_with	"mcrypt"		"crypt"			1
+	phpconfutils_extension_with	"mcrypt"		"crypt"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"mhash"			"mhash"			1
 	phpconfutils_extension_with	"msql"			"msql"			1
 	phpconfutils_extension_with	"mssql"			"mssql"			1
-	phpconfutils_extension_with	"ncurses"		"ncurses"		1
+	phpconfutils_extension_with	"ncurses"		"ncurses"		1 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"openssl"		"ssl"			0
-	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "/usr"
+	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
 	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
 	phpconfutils_extension_disable	"pdo"			"pdo"			0
-	phpconfutils_extension_with	"pgsql"			"postgres"		1
+	phpconfutils_extension_with	"pgsql"			"postgres"		1 "${EPREFIX}/usr"
 	phpconfutils_extension_disable	"posix"			"posix"			0
-	phpconfutils_extension_with	"pspell"		"spell"			1
-	phpconfutils_extension_with	"recode"		"recode"		1
+	phpconfutils_extension_with	"pspell"		"spell"			1 "${EPREFIX}/usr"
+	phpconfutils_extension_with	"recode"		"recode"		1 "${EPREFIX}/usr"
 	phpconfutils_extension_disable	"reflection"		"reflection"		0
 	phpconfutils_extension_disable	"simplexml"		"simplexml"		0
 	phpconfutils_extension_enable	"shmop"			"sharedmem"		0
-	phpconfutils_extension_with	"snmp"			"snmp"			1
+	phpconfutils_extension_with	"snmp"			"snmp"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"soap"			"soap"			1
 	phpconfutils_extension_enable	"sockets"		"sockets"		1
 	phpconfutils_extension_disable	"spl"			"spl"			0
@@ -468,16 +471,16 @@
 	phpconfutils_extension_enable	"sysvmsg"		"sysvipc"		1
 	phpconfutils_extension_enable	"sysvsem"		"sysvipc"		1
 	phpconfutils_extension_enable	"sysvshm"		"sysvipc"		1
-	phpconfutils_extension_with	"tidy"			"tidy"			1
+	phpconfutils_extension_with	"tidy"			"tidy"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
 	phpconfutils_extension_enable	"wddx"			"wddx"			1
 	phpconfutils_extension_disable	"xml"			"xml"			0
 	phpconfutils_extension_disable	"xmlreader"		"xmlreader"		0
 	phpconfutils_extension_disable	"xmlwriter"		"xmlwriter"		0
 	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
-	phpconfutils_extension_with	"xsl"			"xsl"			1
+	phpconfutils_extension_with	"xsl"			"xsl"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"zip"			"zip"			1
-	phpconfutils_extension_with	"zlib"			"zlib"			1
+	phpconfutils_extension_with	"zlib"			"zlib"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"debug"			"debug"			0
 
 	# DBA support
@@ -492,27 +495,27 @@
 
 	# DBA drivers support
 	phpconfutils_extension_with 	"cdb"			"cdb"			0
-	phpconfutils_extension_with 	"db4"			"berkdb"		0
+	phpconfutils_extension_with 	"db4"			"berkdb"		0 "${EPREFIX}/usr"
 	phpconfutils_extension_with 	"flatfile"		"flatfile"		0
-	phpconfutils_extension_with 	"gdbm"			"gdbm"			0
+	phpconfutils_extension_with 	"gdbm"			"gdbm"			0 "${EPREFIX}/usr"
 	phpconfutils_extension_with 	"inifile"		"inifile"		0
-	phpconfutils_extension_with	"qdbm"			"qdbm"			0
+	phpconfutils_extension_with	"qdbm"			"qdbm"			0 "${EPREFIX}/usr"
 
 	# Support for the GD graphics library
 	if use gd-external || phpconfutils_usecheck gd-external ; then
-		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
-		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
+		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
+		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
 		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
-		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "/usr"
+		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "${EPREFIX}/usr"
 	else
-		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "/usr"
-		phpconfutils_extension_with	"t1lib"		"truetype"		0 "/usr"
+		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
+		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
 		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
-		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "/usr"
-		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "/usr"
-		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "/usr"
+		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "${EPREFIX}/usr"
+		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "${EPREFIX}/usr"
+		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "${EPREFIX}/usr"
 		# enable gd last, so configure can pick up the previous settings
-		phpconfutils_extension_with 	"gd" 		"gd" 			0
+		phpconfutils_extension_with 	"gd" 		"gd" 			0 "${EPREFIX}/usr"
 	fi
 
 	# IMAP support
@@ -543,16 +546,16 @@
 
 	# MySQL support
 	if use mysql ; then
-		phpconfutils_extension_with	"mysql"			"mysql"		1 "/usr"
-		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "/var/run/mysqld/mysqld.sock"
+		phpconfutils_extension_with	"mysql"			"mysql"		1 "${EPREFIX}/usr"
+		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "${EPREFIX}/var/run/mysqld/mysqld.sock"
 	fi
 
 	# MySQLi support
-	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "/usr/bin/mysql_config"
+	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "${EPREFIX}/usr/bin/mysql_config"
 
 	# ODBC support
 	if use odbc || phpconfutils_usecheck odbc ; then
-		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "/usr"
+		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "${EPREFIX}/usr"
 
 		phpconfutils_extension_with	"adabas"		"adabas"	1
 		phpconfutils_extension_with	"birdstep"		"birdstep"	1
@@ -592,15 +595,15 @@
 			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
 			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
 		fi
-		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,/usr"
-		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1
-		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "/usr"
+		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,${EPREFIX}/usr"
+		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1 "${EPREFIX}/usr"
+		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "${EPREFIX}/usr"
 	fi
 
 	# readline/libedit support
 	# You can use readline or libedit, but you can't use both
-	phpconfutils_extension_with			"readline"	"readline"	0
-	phpconfutils_extension_with			"libedit"	"libedit"	0
+	phpconfutils_extension_with			"readline"	"readline"	0 "${EPREFIX}/usr"
+	phpconfutils_extension_with			"libedit"	"libedit"	0 
 
 	# Session support
 	if ! use session && ! phpconfutils_usecheck session ; then
@@ -638,7 +641,7 @@
 	tc-export CC
 
 	# We don't use econf, because we need to override all of its settings
-	./configure --prefix=${destdir} --host=${CHOST} --mandir=${destdir}/man --infodir=${destdir}/info --sysconfdir=/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed"
+	./configure --prefix=${destdir} --host=${CHOST} --mandir=${destdir}/man --infodir=${destdir}/info --sysconfdir=${EPREFIX}/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -685,7 +688,7 @@
 		for x in `ls "${S}/modules/"*.so | sort` ; do
 			module=`basename ${x}`
 			modulename=${module/.so/}
-			insinto "${PHPEXTDIR}"
+			insinto "${PHPEXTDIR#${EPREFIX}}"
 			einfo "Installing PHP ${modulename} extension"
 			doins "modules/${module}"
 		done
Index: eclass/depend.php.eclass
===================================================================
--- eclass/depend.php.eclass	(revision 20203)
+++ eclass/depend.php.eclass	(working copy)
@@ -56,12 +56,12 @@
 	# cache this
 	libdir=$(get_libdir)
 
-	PHPIZE="/usr/${libdir}/php4/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/php4/bin/php-config"
-	PHPCLI="/usr/${libdir}/php4/bin/php"
-	PHPCGI="/usr/${libdir}/php4/bin/php-cgi"
+	PHPIZE="${EPREFIX}/usr/${libdir}/php4/bin/phpize"
+	PHPCONFIG="${EPREFIX}/usr/${libdir}/php4/bin/php-config"
+	PHPCLI="${EPREFIX}/usr/${libdir}/php4/bin/php"
+	PHPCGI="${EPREFIX}/usr/${libdir}/php4/bin/php-cgi"
 	PHP_PKG="$(best_version =dev-lang/php-4*)"
-	PHPPREFIX="/usr/${libdir}/php4"
+	PHPPREFIX="${EPREFIX}/usr/${libdir}/php4"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 
 	einfo
@@ -107,12 +107,12 @@
 	# cache this
 	libdir=$(get_libdir)
 
-	PHPIZE="/usr/${libdir}/php5/bin/phpize"
-	PHPCONFIG="/usr/${libdir}/php5/bin/php-config"
-	PHPCLI="/usr/${libdir}/php5/bin/php"
-	PHPCGI="/usr/${libdir}/php5/bin/php-cgi"
+	PHPIZE="${EPREFIX}/usr/${libdir}/php5/bin/phpize"
+	PHPCONFIG="${EPREFIX}/usr/${libdir}/php5/bin/php-config"
+	PHPCLI="${EPREFIX}/usr/${libdir}/php5/bin/php"
+	PHPCGI="${EPREFIX}/usr/${libdir}/php5/bin/php-cgi"
 	PHP_PKG="$(best_version =dev-lang/php-5*)"
-	PHPPREFIX="/usr/${libdir}/php5"
+	PHPPREFIX="${EPREFIX}/usr/${libdir}/php5"
 	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
 
 	einfo
@@ -624,7 +624,11 @@
 	exit 1
 fi
 
+phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"
 phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"
 
 for x in $@ ; do
 	if [[ -s "${x}" ]] ; then