--- old/php-5.2.8-r2.ebuild	2009-02-22 18:14:10 +0100
+++ new/php-5.2.8-r2.ebuild	2009-02-22 18:36:06 +0100
@@ -2,11 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.8 2009/02/01 10:39:52 klausman Exp $
 
+EAPI="prefix"
+
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
 IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
 
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
@@ -263,7 +265,7 @@
 	fi
 
 	if [[ ${build_apache2} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+		my_conf="${my_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs2"
 
 		# Threaded Apache2 support
 		if use threads ; then
@@ -293,8 +295,8 @@
 		einfo "Building CLI SAPI"
 		einfo
 
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "${EPREFIX}/etc/php/cli-php5"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "${EPREFIX}/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
 		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
 			[[ -f ${x} ]] && rm -f ${x}
 		done
@@ -307,8 +309,8 @@
 		einfo "Building CGI SAPI"
 		einfo
 
-		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "${EPREFIX}/etc/php/cgi-php5"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "${EPREFIX}/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
 		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
 			[[ -f ${x} ]] && rm -f ${x}
 		done
@@ -321,8 +323,8 @@
 		einfo "Building apache${APACHE_VERSION} SAPI"
 		einfo
 
-		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
-		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
+		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"${EPREFIX}/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
+		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"${EPREFIX}/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
 		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
 			[[ -f ${x} ]] && rm -f ${x}
 		done
@@ -381,7 +383,7 @@
 				cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
 				;;
 			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+				my_conf="${my_conf} --disable-cli --with-apxs2=${EPREFIX}/usr/sbin/apxs2"
 				php5_2-sapi_src_compile
 				;;
 		esac
@@ -425,7 +427,7 @@
 				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
 				if use concurrentmodphp ; then
 					einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
+					insinto ${APACHE_MODULES_CONFDIR#${EPREFIX}}
 					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
 
 					# Put the ld version script in the right place so it's always accessible
@@ -433,10 +435,10 @@
 					doins "${FILESDIR}/php5-ldvs"
 
 					# Redefine the extension dir to have the modphp suffix
-					PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
+					PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`-versioned"
 				else
 					einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
+					insinto ${APACHE_MODULES_CONFDIR#${EPREFIX}}
 					newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
 				fi
 				php5_2-sapi_install_ini
@@ -446,7 +448,7 @@
 
 	# Install env.d files
 	newenvd "${FILESDIR}/20php5-envd" "20php5"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php5"
 }
 
 pkg_postinst() {
@@ -463,7 +465,7 @@
 
 	# Update Apache2 to use mod_php
 	if use apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 2 ]] ; then
 			php-select apache2 php5
@@ -479,14 +481,14 @@
 
 	# Create the symlinks for php-cli
 	if use cli || phpconfutils_usecheck cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 5 ]] ; then
 			php-select php php5
 		elif [[ ${exitStatus} == 4 ]] ; then
 			ewarn
-			ewarn "/usr/bin/php links to a different version of PHP."
-			ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
+			ewarn "${EPREFIX}/usr/bin/php links to a different version of PHP."
+			ewarn "To make ${EPREFIX}/usr/bin/php point to PHP v5, use php-select:"
 			ewarn
 			ewarn "    php-select php php5"
 			ewarn
@@ -495,14 +497,14 @@
 
 	# Create the symlinks for php-cgi
 	if use cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 5 ]] ; then
 			php-select php-cgi php5
 		elif [[ ${exitStatus} == 4 ]] ; then
 			ewarn
-			ewarn "/usr/bin/php-cgi links to a different version of PHP."
-			ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
+			ewarn "${EPREFIX}/usr/bin/php-cgi links to a different version of PHP."
+			ewarn "To make ${EPREFIX}/usr/bin/php-cgi point to PHP v5, use php-select:"
 			ewarn
 			ewarn "    php-select php-cgi php5"
 			ewarn
@@ -510,13 +512,13 @@
 	fi
 
 	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
+	"${EROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
 	exitStatus=$?
 	if [[ $exitStatus == 5 ]] ; then
 		php-select php-devel php5
 	elif [[ $exitStatus == 4 ]] ; then
 		ewarn
-		ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+		ewarn "${EPREFIX}/usr/bin/php-config and/or ${EPREFIX}/usr/bin/phpize are linked to a"
 		ewarn "different version of PHP. To make them point to PHP v5, use"
 		ewarn "php-select:"
 		ewarn