--- /Gentoo/usr/portage/eclass/php4_4-sapi.eclass	2008-01-31 19:02:30 +0400
+++ /Gentoo/usr/portage/local/layman/prefix-users/eclass/php4_4-sapi.eclass	2008-02-04 09:44:45 +0400
@@ -223,7 +223,7 @@
 	destdir="${EPREFIX}"/usr/$(get_libdir)/php4
 
 	# 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
 	php4_4-sapi_set_php_ini_dir
@@ -241,7 +241,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 = ".:${EPREFIX}/usr/share/php4:${EPREFIX}/usr/share/php"|' -i ${phpinisrc}
+	sed -e "s|^;include_path = \".:/php/includes\".*|include_path = \".:${EPREFIX}/usr/share/php4:${EPREFIX}/usr/share/php\"|" -i ${phpinisrc}
 
 	# Add needed MySQL extension charset configuration
 	local phpmycnfcharset=""
@@ -285,7 +285,7 @@
 		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort | sed -e "s|.*java.*||g"` ; do
 			inifilename=${x/.so/.ini}
 			inifilename=`basename ${inifilename}`
-			echo "extension=`basename ${x}`" >> "${ED}/${PHP_EXT_INI_DIR}/${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
@@ -331,6 +331,8 @@
 	# Apply general PHP4 patches
 	if [[ -d "${WORKDIR}/${MY_PHP_PV}/php4" ]] ; then
 		EPATCH_SOURCE="${WORKDIR}/${MY_PHP_PV}/php4" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+		# If we patch PHP for libtool compilation, we should patch it for libtool linking, too!
+		epatch "${FILESDIR}/php4-libtool-1.5-linking.patch"
 	fi
 
 	# Apply version-specific PHP patches
@@ -424,10 +426,10 @@
 	phpconfutils_extension_with	"iconv"			"iconv"			0
 	phpconfutils_extension_with	"informix"		"informix"		1
 	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
-	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}//usr"
+	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"mbstring"		"unicode"		1
-	phpconfutils_extension_with	"mcal"			"mcal"			1 "${EPREFIX}//usr"
-	phpconfutils_extension_with	"mcrypt"		"crypt"			1
+	phpconfutils_extension_with	"mcal"			"mcal"			1 "${EPREFIX}/usr"
+	phpconfutils_extension_with	"mcrypt"		"crypt"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"mcve"			"mcve"			1
 	phpconfutils_extension_enable	"memory-limit"		"memlimit"		0
 	phpconfutils_extension_with	"mhash"			"mhash"			1
@@ -435,7 +437,7 @@
 	phpconfutils_extension_with	"mnogosearch"		"mnogosearch"		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	"oci8"			"oci8"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"oci8-instant-client"	"oci8-instant-client"	1
 	phpconfutils_extension_with	"oracle"		"oracle7"		1
@@ -445,7 +447,7 @@
 	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
 	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
 	phpconfutils_extension_with	"pfpro"			"pfpro"			1 "${EPREFIX}/usr"
-	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 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"recode"		"recode"		1 "${EPREFIX}/usr"
@@ -459,8 +461,9 @@
 	phpconfutils_extension_enable	"sysvshm"		"sysvipc"		1
 	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
 	phpconfutils_extension_enable	"wddx"			"wddx"			1
-	phpconfutils_extension_disable	"xml"			"expat"			0
+	phpconfutils_extension_disable	"xml"			"expat"			0 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
+	phpconfutils_extension_with	"expat-dir"		"xmlrpc"		0 "${EPREFIX}/usr"
 	phpconfutils_extension_with	"zlib"			"zlib"			1 "${EPREFIX}/usr"
 	phpconfutils_extension_enable	"debug"			"debug"			0