Eblits changes

eblits.diff (text/plain), 23.26 KB, created by nietonfir on 2010-09-19 15:19:09 UTC

diff -u eblits.orig/common-v1.eblit eblits/common-v1.eblit
--- eblits.orig/common-v1.eblit	2010-09-19 16:29:48.000000000 +0200
+++ eblits/common-v1.eblit	2010-09-16 23:02:34.000000000 +0200
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
 
 php_set_ini_dir() {
-	PHP_INI_DIR="/etc/php/${1}-php${PHP_MV}"
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${PHP_MV}"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
diff -u eblits.orig/pkg_postinst-v1.eblit eblits/pkg_postinst-v1.eblit
--- eblits.orig/pkg_postinst-v1.eblit	2010-09-19 16:29:55.000000000 +0200
+++ eblits/pkg_postinst-v1.eblit	2010-09-16 23:02:59.000000000 +0200
@@ -16,7 +16,7 @@
 
 	# Update Apache2 to use mod_php
 	if use apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php${PHP_MV} > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t apache2 php${PHP_MV} > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 2 ]] ; then
 			php-select apache2 php${PHP_MV}
@@ -29,7 +29,7 @@
 
 	# Create the symlinks for php-cli
 	if use cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php${PHP_MV} > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t php php${PHP_MV} > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 5 ]] ; then
 			php-select php php${PHP_MV}
@@ -42,7 +42,7 @@
 
 	# Create the symlinks for php-cgi
 	if use cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php${PHP_MV} > /dev/null 2>&1
+		"${EROOT}/usr/sbin/php-select" -t php-cgi php${PHP_MV} > /dev/null 2>&1
 		exitStatus=$?
 		if [[ ${exitStatus} == 5 ]] ; then
 			php-select php-cgi php${PHP_MV}
@@ -54,7 +54,7 @@
 	fi
 
 	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php${PHP_MV} > /dev/null 2>&1
+	"${EROOT}/usr/sbin/php-select" -t php-devel php${PHP_MV} > /dev/null 2>&1
 	exitStatus=$?
 	if [[ $exitStatus == 5 ]] ; then
 		php-select php-devel php${PHP_MV}
diff -u eblits.orig/src_configure-v1.eblit eblits/src_configure-v1.eblit
--- eblits.orig/src_configure-v1.eblit	2010-09-19 16:29:59.000000000 +0200
+++ eblits/src_configure-v1.eblit	2010-09-18 17:53:50.000000000 +0200
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.6 2010/08/09 13:02:23 mabi Exp $
 
 eblit-php-src_configure() {
-	PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${PHP_MV}"
 
 	# This is a global variable and should be in caps. It isn't because the
 	# phpconfutils eclass relies on exactly this name...
@@ -27,26 +27,26 @@
 	phpconfutils_extension_with    "curl"         "curl"             1
 	phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
 	phpconfutils_extension_disable "dom"          "xml"              0
-	phpconfutils_extension_with    "enchant"      "enchant"          1 "/usr"
+	phpconfutils_extension_with    "enchant"      "enchant"          1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "exif"         "exif"             1
 	phpconfutils_extension_disable "fileinfo"     "fileinfo"         1
 	phpconfutils_extension_disable "filter"       "filter"           0
 	phpconfutils_extension_enable  "ftp"          "ftp"              1
-	phpconfutils_extension_with    "gettext"      "nls"              1
+	phpconfutils_extension_with    "gettext"      "nls"              1 "${EPREFIX}/usr"
 	phpconfutils_extension_with    "gmp"          "gmp"              1
 	phpconfutils_extension_disable "hash"         "hash"             0
-	phpconfutils_extension_without "iconv"        "iconv"            0
+	phpconfutils_extension_with    "iconv"        "iconv"            0 "${EPREFIX}/usr"
 	phpconfutils_extension_enable  "intl"         "intl"             1
 	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    "mssql"        "mssql"            1
-	phpconfutils_extension_with    "onig"         "unicode"          0 "/usr"
+	phpconfutils_extension_with    "onig"         "unicode"          0 "${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_disable "phar"         "phar"             1
 	phpconfutils_extension_disable "pdo"          "pdo"              0
@@ -59,7 +59,7 @@
 	phpconfutils_extension_with    "snmp"         "snmp"             1
 	phpconfutils_extension_enable  "soap"         "soap"             1
 	phpconfutils_extension_enable  "sockets"      "sockets"          1
-	phpconfutils_extension_without "sqlite3"      "sqlite3"          1 "/usr"
+	phpconfutils_extension_without "sqlite3"      "sqlite3"          1 "${EPREFIX}/usr"
 	phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1
 	phpconfutils_extension_enable  "sysvmsg"      "sysvipc"          1
 	phpconfutils_extension_enable  "sysvsem"      "sysvipc"          1
@@ -92,17 +92,17 @@
 
 	# Support for the GD graphics library
 	if use 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
 	fi
@@ -113,8 +113,8 @@
 		phpconfutils_extension_with "imap-ssl" "ssl"  0
 	fi
 
-	phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
-	phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	phpconfutils_extension_with "interbase"	"interbase"	0 "${EPREFIX}/opt"
+	phpconfutils_extension_with	"interbase"	"firebird"	0 "${EPREFIX}/usr"
 
 	# LDAP support
 	if use ldap ; then
@@ -131,21 +131,21 @@
 		if use mysqlnd ; then
 			phpconfutils_extension_with "mysql"      "mysql" 1 "mysqlnd"
 		else
-			phpconfutils_extension_with "mysql"      "mysql" 1 "/usr"
+			phpconfutils_extension_with "mysql"      "mysql" 1 "${EPREFIX}/usr"
 		fi
-		phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
+		phpconfutils_extension_with "mysql-sock" "mysql" 0 "${EPREFIX}/var/run/mysqld/mysqld.sock"
 	fi
 
 	# MySQLi support
 	if use mysqlnd ; then
 		phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd"
 	else
-		phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
+		phpconfutils_extension_with "mysqli" "mysqli" 1 "${EPREFIX}/usr/bin/mysql_config"
 	fi
 
 	# ODBC support
 	if use 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
 		phpconfutils_extension_with "dbmaker"  "dbmaker"  1
@@ -160,7 +160,7 @@
 	fi
 
 	if use iodbc ; then
-		phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
+		phpconfutils_extension_with "iodbc"   "iodbc" 1 "${EPREFIX}/usr"
 	fi
 
 	# Oracle support
@@ -171,7 +171,7 @@
 			sed -e 's|-r.*||g')"
 
 		phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-			"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
+			"instantclient,${EPREFIX}/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
 	fi
 
 	# PDO support
@@ -180,17 +180,17 @@
 		if use mysqlnd ; then
 			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "mysqlnd"
 		else
-			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
+			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "${EPREFIX}/usr"
 		fi
 		phpconfutils_extension_with "pdo-pgsql"  "postgres"	1
-		phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "/usr"
-		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
+		phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "${EPREFIX}/usr"
+		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,${EPREFIX}/usr"
 		if use oci8 ; then
 			phpconfutils_extension_with "pdo-oci" "oci8" 1
 		fi
 		if use oci8-instant-client ; then
 			phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-				"instantclient,/usr,${OCI8IC_PKG}"
+				"instantclient,${EPREFIX}/usr,${OCI8IC_PKG}"
 		fi
 	fi
 
@@ -207,7 +207,7 @@
 
 	# SQLite support
 	if use sqlite ; then
-		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "/usr"
+		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "${EPREFIX}/usr"
 		phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
 	else
 		phpconfutils_extension_without "sqlite" "sqlite" 0
@@ -218,14 +218,14 @@
 	fi
 
 	if has fpm ${IUSE//+} && use fpm ; then
-		my_conf="${my_conf} --with-libevent-dir=/usr/`get_libdir`"
+		my_conf="${my_conf} --with-libevent-dir=${EPREFIX}/usr/`get_libdir`"
 	fi
 
 
 	# we use the system copy of pcre
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
 
 	# Catch CFLAGS problems
 	php_check_cflags
@@ -265,7 +265,7 @@
 
 				apache2)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
 					else
 						sapi_conf="${sapi_conf} --without-apxs2"
 					fi
diff -u eblits.orig/src_configure-v52.eblit eblits/src_configure-v52.eblit
--- eblits.orig/src_configure-v52.eblit	2010-09-19 16:29:59.000000000 +0200
+++ eblits/src_configure-v52.eblit	2010-09-16 23:10:25.000000000 +0200
@@ -4,7 +4,7 @@
 
 eblit-php-src_configure() {
 	export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
 	# This is a global variable and should be in caps. It isn't because the
 	# phpconfutils eclass relies on exactly this name...
@@ -30,7 +30,7 @@
 	phpconfutils_extension_disable "dom"          "xml"              0
 	phpconfutils_extension_enable  "exif"         "exif"             1
 	phpconfutils_extension_with	   "fbsql"		  "frontbase"		 1
-	phpconfutils_extension_with	   "fdftk"		  "fdftk"			 1 "/opt/fdftk-6.0"
+	phpconfutils_extension_with	   "fdftk"		  "fdftk"			 1 "${EPREFIX}/opt/fdftk-6.0"
 	phpconfutils_extension_disable "filter"       "filter"           0
 	phpconfutils_extension_enable  "ftp"          "ftp"              1
 	phpconfutils_extension_with    "gettext"      "nls"              1
@@ -39,7 +39,7 @@
 	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
@@ -48,7 +48,7 @@
 	phpconfutils_extension_with    "mssql"        "mssql"            1
 	phpconfutils_extension_with	   "ncurses"	  "ncurses"		     1
 	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
@@ -95,17 +95,17 @@
 
 	# Support for the GD graphics library
 	if use 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
 	fi
@@ -116,8 +116,8 @@
 		phpconfutils_extension_with "imap-ssl" "ssl"  0
 	fi
 
-	phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
-	phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	phpconfutils_extension_with "interbase"	"interbase"	0 "${EPREFIX}/opt"
+	phpconfutils_extension_with	"interbase"	"firebird"	0 "${EPREFIX}/usr"
 
 	# LDAP support
 	if use ldap ; then
@@ -131,16 +131,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 ; 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
 		phpconfutils_extension_with "dbmaker"  "dbmaker"  1
@@ -155,7 +155,7 @@
 	fi
 
 	if use iodbc ; then
-		phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
+		phpconfutils_extension_with "iodbc"   "iodbc" 1 "${EPREFIX}/usr"
 	fi
 
 	# Oracle support
@@ -166,22 +166,22 @@
 			sed -e 's|-r.*||g')"
 
 		phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-			"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
+			"instantclient,${EPREFIX}/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
 	fi
 
 	# PDO support
 	if use pdo ; then
 		phpconfutils_extension_with "pdo-dblib"  "mssql"    1
-		phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
+		phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "${EPREFIX}/usr"
 		phpconfutils_extension_with "pdo-pgsql"  "postgres"	1
-		phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "/usr"
-		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
+		phpconfutils_extension_with "pdo-sqlite" "sqlite"   1 "${EPREFIX}/usr"
+		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,${EPREFIX}/usr"
 		if use oci8 ; then
 			phpconfutils_extension_with "pdo-oci" "oci8" 1
 		fi
 		if use oci8-instant-client ; then
 			phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-				"instantclient,/usr,${OCI8IC_PKG}"
+				"instantclient,${EPREFIX}/usr,${OCI8IC_PKG}"
 		fi
 	fi
 
@@ -198,7 +198,7 @@
 
 	# SQLite support
 	if use sqlite ; then
-		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "/usr"
+		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "${EPREFIX}/usr"
 		phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
 	else
 		phpconfutils_extension_without "sqlite" "sqlite" 0
@@ -213,7 +213,7 @@
 	# --with-pcre-regex affects ext/pcre
 	# --with-pcre-dir affects ext/filter and ext/zip
 	if use pcre ; then
-		my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
+		my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
 	fi
 
 	# Catch CFLAGS problems
@@ -264,7 +264,7 @@
 
 				apache2)
 					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
 					else
 						sapi_conf="${sapi_conf} --without-apxs2"
 					fi
diff -u eblits.orig/src_install-v1.eblit eblits/src_install-v1.eblit
--- eblits.orig/src_install-v1.eblit	2010-09-19 16:30:00.000000000 +0200
+++ eblits/src_install-v1.eblit	2010-09-19 16:06:16.000000000 +0200
@@ -16,7 +16,7 @@
 	done
 
 	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR}/bin"
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
 
 	# Install php environment (without any sapis)
 	cd "${WORKDIR}/sapis-build/$first_sapi"
@@ -46,12 +46,12 @@
 			einfo "Installing SAPI: ${sapi}"
 			cd "${WORKDIR}/sapis-build/${sapi}"
 			# needed each time, php_install_ini would reset it
-			into "${PHP_DESTDIR}"
+			into "${PHP_DESTDIR#${EPREFIX}}"
 			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
 
 			if [[ "${file: -3}" == ".so" ]]; then 
 				if [[ "${sapi}" == "apache2" ]]; then
-					insinto "${PHP_DESTDIR}/../apache2/modules/"
+					insinto "${PHP_DESTDIR#${EPREFIX}}/../apache2/modules/"
 					newins "${file}" "${file/*\/}"
 				else
 					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
@@ -75,12 +75,13 @@
 	# Install env.d files
 	newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
 		"20php${PHP_MV}"
+	eprefixify "${ED}/etc/env.d/20php${PHP_MV}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${D}/etc/env.d/20php${PHP_MV}"
+		"${ED}/etc/env.d/20php${PHP_MV}"
 
 	# set php-config variable correctly (bug #278439)
 	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${D}/usr/$(get_libdir)/php5/bin/php-config"
+		"${ED}/usr/$(get_libdir)/php5/bin/php-config"
 }
 
 php_install_ini() {
@@ -96,39 +97,39 @@
 	sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"
 
 	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}"
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
 
 	# Set the extension dir
 	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
 
 	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR}"
-	insinto "${PHP_INI_DIR}"
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':$'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+	
+	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
-		insinto "${PHP_EXT_INI_DIR}"
-		for extension in "${D}/${extension_dir}/"*.so ; do
+		insinto "${PHP_EXT_INI_DIR#${EPREFIX}}"
+		for extension in "${ED}/${extension_dir}/"*.so ; do
 			extension="${extension##*/}"
 			inifilename="${extension/.so/.ini}"
 			echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
 			doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename"
-			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
+			dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"
 		done
 	fi
 
 	# SAPI-specific handling
 	if [[ "${sapi}" == "apache2" ]] ; then
 		if use concurrentmodphp ; then
-			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
+			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf-r1"
+			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2-r1" \
 				"70_mod_php${PHP_MV}_concurr.conf"
 
 			# Put the ld version script in the right place so
@@ -137,8 +138,8 @@
 			doins "${FILESDIR}/php${PHP_MV}-ldvs"
 		else
 			einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf"
-			insinto ${APACHE_MODULES_CONFDIR}
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2-r1" \
 				"70_mod_php${PHP_MV}.conf"
 		fi
 	fi
@@ -151,6 +152,7 @@
 		dodir "/etc/init.d"
 		insinto "/etc/init.d"
 		newins  "${FILESDIR}/php-fpm.init" "php-fpm"
+		eprefixify "/etc/init.d/php-fpm.init"
 		fperms 755 "/etc/init.d/php-fpm"
 		dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
 	fi
diff -u eblits.orig/src_prepare-v1.eblit eblits/src_prepare-v1.eblit
--- eblits.orig/src_prepare-v1.eblit	2010-09-19 16:30:01.000000000 +0200
+++ eblits/src_prepare-v1.eblit	2010-09-19 01:58:48.000000000 +0200
@@ -50,6 +50,11 @@
 	if use suhosin ; then
 		epatch "${WORKDIR}/${SUHOSIN_PATCH}"
 	fi
+	
+	# Fix mysqli build failure on OS X caused by ulong (php-bug: 52413)
+	if use mysqli && [[ ${CHOST} == *apple* && ${PV} == 5.3.3 ]] ; then
+		epatch "${FILESDIR}/php-5.3.3-ulong-osx.patch"
+	fi
 
 	# rebuild the whole autotools stuff as we are heavily patching it
 	# (suhosin, fastbuild, ...)