[patch] patch for php-eblits

php-eblits.patch (text/plain), 12.52 KB, created by Christoph Junghans (RETIRED) on 2012-09-06 03:22:46 UTC

--- /usr/portage/dev-lang/php/files/eblits/common-v2.eblit	2010-10-08 12:25:10.000000000 -0600
+++ common-v2.eblit	2012-09-03 20:11:10.000000000 -0600
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/common-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $
 
 php_set_ini_dir() {
-	PHP_INI_DIR="/etc/php/${1}-php${SLOT}"
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
 	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
--- /usr/portage/dev-lang/php/files/eblits/src_configure-v54.eblit	2012-08-22 09:31:08.000000000 -0600
+++ src_configure-v54.eblit	2012-09-05 20:56:41.000000000 -0600
@@ -6,7 +6,7 @@
 	addpredict /usr/share/snmp/mibs/.index
 	addpredict /var/lib/net-snmp/mib_indexes
 
-	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...
@@ -23,60 +23,61 @@
 	#                             extension	      USE flag        shared
 	my_conf+="
 	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
 	$(use_enable calendar calendar )
 	$(use_enable ctype ctype )
-	$(use_with curl curl )
-	$(use_with curlwrappers curlwrappers )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
 	$(use_enable xml dom )
-	$(use_with enchant enchant /usr)
+	$(use_with enchant enchant "${EPREFIX}"/usr)
 	$(use_enable exif exif )
 	$(use_enable fileinfo fileinfo )
 	$(use_enable filter filter )
 	$(use_enable ftp ftp )
-	$(use_with nls gettext )
-	$(use_with gmp gmp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
 	$(use_enable hash hash )
-	$(use_with mhash mhash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
 	$(use_with iconv iconv )
 	$(use_enable intl intl )
 	$(use_enable ipv6 ipv6 )
 	$(use_enable json json )
-	$(use_with kerberos kerberos /usr)
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
 	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
 	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt )
-	$(use_with mssql mssql )
-	$(use_with unicode onig /usr)
-	$(use_with ssl openssl )
-	$(use_with ssl openssl-dir /usr)
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
 	$(use_enable pcntl pcntl )
 	$(use_enable phar phar )
 	$(use_enable pdo pdo )
-	$(use_with postgres pgsql )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
 	$(use_enable posix posix )
-	$(use_with spell pspell )
-	$(use_with recode recode )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
 	$(use_enable simplexml simplexml )
 	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
 	$(use_enable soap soap )
 	$(use_enable sockets sockets )
-	$(use_with sqlite3 sqlite3 /usr)
-	$(use_with sybase-ct sybase-ct /usr)
+	$(use_with sqlite3 sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
 	$(use_enable sysvipc sysvmsg )
 	$(use_enable sysvipc sysvsem )
 	$(use_enable sysvipc sysvshm )
-	$(use_with tidy tidy )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
 	$(use_enable tokenizer tokenizer )
 	$(use_enable wddx wddx )
 	$(use_enable xml xml )
 	$(use_enable xmlreader xmlreader )
 	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc )
-	$(use_with xsl xsl )
+	$(use_with xmlrpc xmlrpc "${EPREFIX}"/usr)
+	$(use_with xsl xsl "${EPREFIX}"/usr)
 	$(use_enable zip zip )
-	$(use_with zlib zlib )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
 	$(use_enable debug debug )"
 
 	# DBA support
@@ -87,44 +88,44 @@
 
 	# DBA drivers support
 	my_conf+="
-	$(use_with cdb cdb )
-	$(use_with berkdb db4 )
+	$(use_with cdb cdb ${EPREFIX}/usr)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
 	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
 	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm )"
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
 
 	# Support for the GD graphics library
 	my_conf+="
-	$(use_with truetype freetype-dir /usr)
-	$(use_with truetype t1lib /usr)
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
 	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir /usr)
-	$(use_with gd png-dir /usr)
-	$(use_with xpm xpm-dir /usr)"
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
 	# enable gd last, so configure can pick up the previous settings
 	my_conf+="
-	$(use_with gd gd )"
+	$(use_with gd gd ${EPREFIX}/usr)"
 
 	# IMAP support
 	if use imap ; then
 	    my_conf+="
-		$(use_with imap imap )
-		$(use_with ssl imap-ssl )"
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
 	fi
 
 	# Interbase/firebird support
 	
 	if use firebird ; then
 	    my_conf+="
-		$(use_with firebird interbase /usr)"
+		$(use_with firebird interbase ${EPREFIX}/usr)"
 	fi
 
 	# LDAP support
 	if use ldap ; then
 	    my_conf+="
-		$(use_with ldap ldap )
-		$(use_with ldap-sasl ldap-sasl )"
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
 	fi
 
 	# MySQL support
@@ -134,10 +135,10 @@
 			$(use_with mysql mysql mysqlnd)"
 		else
 	        my_conf+="
-			$(use_with mysql mysql /usr)"
+			$(use_with mysql mysql ${EPREFIX}/usr)"
 		fi
 	    my_conf+="
-		$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
 	fi
 
 	# MySQLi support
@@ -146,18 +147,18 @@
 		$(use_with mysqli mysqli mysqlnd)"
 	else
 	    my_conf+="
-		$(use_with mysqli mysqli /usr/bin/mysql_config)"
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
 	fi
 
 	# ODBC support
 	if use odbc ; then
 	    my_conf+="
-		$(use_with odbc unixODBC /usr)"
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
 	fi
 
 	if use iodbc ; then
 	    my_conf+="
-		$(use_with iodbc iodbc /usr)"
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
 	fi
 
 	# Oracle support
@@ -175,12 +176,12 @@
 			$(use_with mysql pdo-mysql mysqlnd)"
 		else
 	        my_conf+="
-			$(use_with mysql pdo-mysql /usr)"
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
 		fi
 	    my_conf+="
 		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite3 pdo-sqlite /usr)
-		$(use_with odbc pdo-odbc unixODBC,/usr)"
+		$(use_with sqlite3 pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
 		if use oci8-instant-client ; then
 	        my_conf+="
 			$(use_with oci8-instant-client pdo-oci)"
@@ -189,13 +190,13 @@
 
 	# readline/libedit support
 	my_conf+="
-	$(use_with readline readline )
-	$(use_with libedit libedit )"
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
 
 	# Session support
 	if use session ; then
 	    my_conf+="
-		$(use_with sharedmem mm )"
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
 	else
 	    my_conf+="
 		$(use_enable session session )"
@@ -208,7 +209,7 @@
 	# 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
     # Fixes bug #14067.
@@ -244,7 +245,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
--- /usr/portage/dev-lang/php/files/eblits/src_install-v3.eblit	2012-09-04 04:01:08.000000000 -0600
+++ src_install-v3.eblit	2012-09-05 21:13:41.000000000 -0600
@@ -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"
@@ -24,7 +24,7 @@
 		install-build install-headers install-programs \
 		|| die "emake install failed"
 
-	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
 
 	# Create the directory where we'll put version-specific php scripts
 	keepdir /usr/share/php${PHP_MV}
@@ -40,12 +40,12 @@
 			if [[ "${sapi}" == "apache2" ]] ; then
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR}/apache2/"
-				newins ".libs/libphp5.so" "libphp${PHP_MV}.so"
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
 				# needed each time, php_install_ini would reset it
-				into "${PHP_DESTDIR}"
+				into "${PHP_DESTDIR#${EPREFIX}}"
 			    case "$sapi" in
 					cli)
 						source="sapi/cli/php"
@@ -57,14 +57,14 @@
 						source="sapi/fpm/php-fpm"
 						;;
 					embed)
-						source="libs/libphp${PHP_MV}.so"
+						source="libs/libphp${PHP_MV}$(get_libname)"
 						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
 				esac
 
-				if [[ "${source: -3}" == ".so" ]]; then 
+				if [[ "${source}" == *"$(get_libname)" ]]; then 
 					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
 				else
 					dobin "${source}" || die "Unable to install ${sapi} sapi"
@@ -87,13 +87,13 @@
 	newenvd "${FILESDIR}/20php5-envd" \
 		"20php${SLOT}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${D}/etc/env.d/20php${SLOT}"
+		"${ED}/etc/env.d/20php${SLOT}"
 	sed -e "s|php5|php${SLOT}|g" -i \
-		"${D}/etc/env.d/20php${SLOT}"
+		"${ED}/etc/env.d/20php${SLOT}"
 
 	# set php-config variable correctly (bug #278439)
 	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
 }
 
 php_install_ini() {
@@ -106,44 +106,44 @@
 	cp "${PHP_INI_UPSTREAM}" "${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}"
 
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}"
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
 	elog
 
-	dodir "${PHP_EXT_INI_DIR}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE}"
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
 
 	# SAPI-specific handling
 	if [[ "${sapi}" == "apache2" ]] ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-				"70_mod_php${PHP_MV}.conf"
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+			"70_mod_php${PHP_MV}.conf"
 	fi
 
 	if [[ "${sapi}" == "fpm" ]] ; then
         [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
         [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
 		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto ${PHP_INI_DIR}
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
 		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
 		dodir "/etc/init.d"
 		insinto "/etc/init.d"
 		newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
-		#dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
+		# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm"
 		
 		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default"
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
 	fi
 
   # Install PHP ini files into /usr/share/php