[patch] Updated PHP 5.2 patch for PHP 5.2.5-r1

php-5.2.5-r1.ebuild (text/plain), 2.54 KB, created by Dirk Tilger on 2008-07-20 16:58:29 UTC

--- /Gentoo/usr/portage.main.converted/dev-lang/php/php-5.2.5-r1.ebuild	2008-03-01 15:45:32 +0400
+++ /Gentoo/usr/portage/local/layman/prefix-users/dev-lang/php/php-5.2.5-r1.ebuild	2008-02-03 18:11:52 +0400
@@ -8,7 +8,7 @@
 APACHE2_SAPI_USE="concurrentmodphp threads"
 IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
 
-KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-freebsd ~x86-macos"
+KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-fbsd ~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
@@ -225,7 +225,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
@@ -337,7 +337,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
@@ -350,7 +350,7 @@
 src_install() {
 	php_determine_sapis
 
-	destdir=/usr/$(get_libdir)/php5
+	destdir="${EPREFIX}/usr/$(get_libdir)/php5"
 
 	# Let the eclass do the common work
 	php5_2-sapi_src_install
@@ -441,8 +441,8 @@
 			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
@@ -457,8 +457,8 @@
 			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
@@ -472,7 +472,7 @@
 		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