--- /usr/portage/dev-lang/php/php-5.2.2-r1.ebuild	2007-05-12 13:35:41.000000000 +0200
+++ php-5.2.3.ebuild	2007-06-09 17:44:37.000000000 +0200
@@ -20,8 +20,8 @@
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="2"
-SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo.patch.gz"
+PHP_PATCHSET_REV="1"
+SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
@@ -254,8 +254,8 @@
 		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
 			[[ -f ${x} ]] && rm -f ${x}
 		done
-		make sapi/cgi/php || die "Unable to make CGI SAPI"
-		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+		make sapi/cgi/php-cgi || die "Unable to make CGI SAPI"
+		cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
 	fi
 
 	if [[ ${build_apache2} = 1 ]] ; then
@@ -319,7 +319,7 @@
 				phpconfutils_extension_enable "discard-path" "discard-path" 0
 				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
 				php5_2-sapi_src_compile
-				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+				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"