Version bump.

Package-Manager: portage-2.0.51.22-r1

12 files changed, 412 insertions, 60 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index b6ed38767c94..d15e24a80e16 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.237 2005/06/11 13:30:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.238 2005/06/13 19:32:13 sebastian Exp $
+
+*mod_php-4.4.0_rc1 (13 Jun 2005)
+
+  13 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +mod_php-4.4.0_rc1.ebuild:
+  Version bump.
 
   11 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> mod_php-5.0.4.ebuild:
   Add ~ia64 and ~alpha keywords.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 7708405aaeac..502c038226b0 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,36 +1,38 @@
+MD5 490f9e2ff2635eae30c20d16861e6f6d mod_php-4.3.9.ebuild 6068
+MD5 001341d164c4e4431c2bd07227c2e328 mod_php-4.3.11-r1.ebuild 6422
+MD5 4cb83a3eb0d5e8df016e6aca9b9b5486 mod_php-4.4.0_rc1.ebuild 6463
+MD5 acc16e417db750b0a6f65eb6120469ff mod_php-4.3.10-r1.ebuild 6346
+MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205
+MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
 MD5 e4b18e01eaf5163e6236425277b965b3 mod_php-4.3.8.ebuild 5963
+MD5 ae4194e1f5a0793f371bb09b230b5181 mod_php-5.1.0_beta.ebuild 2425
+MD5 93f24cd45f23a55e8f9c85b4c7cfa4d8 mod_php-4.3.9_rc1.ebuild 6066
 MD5 8a5a40024d86195720f12c9b65ae19c6 mod_php-4.3.11-r2.ebuild 6422
-MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
-MD5 acc16e417db750b0a6f65eb6120469ff mod_php-4.3.10-r1.ebuild 6346
 MD5 904572139d32fefe90c16a096e746820 ChangeLog 41475
-MD5 ae4194e1f5a0793f371bb09b230b5181 mod_php-5.1.0_beta.ebuild 2425
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 93f24cd45f23a55e8f9c85b4c7cfa4d8 mod_php-4.3.9_rc1.ebuild 6066
-MD5 001341d164c4e4431c2bd07227c2e328 mod_php-4.3.11-r1.ebuild 6422
-MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205
 MD5 bf3e266fc7fbc08f3b079effce2c7086 mod_php-4.3.10.ebuild 6128
-MD5 490f9e2ff2635eae30c20d16861e6f6d mod_php-4.3.9.ebuild 6068
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
+MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
+MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
+MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282
 MD5 457955f18cb41f31bab803aac779573c files/digest-mod_php-5.0.4 140
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
-MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-mod_php-5.1.0_beta 65
-MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10-r1 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r1 284
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r2 284
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
 MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10-r1 284
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-mod_php-5.1.0_beta 65
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 61651790550bc156f10ae2a3edafebe2 files/digest-mod_php-4.4.0_rc1 208
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
-MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r2 284
-MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282
-MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
-MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
+MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
+MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0_rc1 b/dev-php/mod_php/files/digest-mod_php-4.4.0_rc1
new file mode 100644
index 000000000000..aefeb8263132
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.4.0_rc1
@@ -0,0 +1,3 @@
+MD5 d957e8e543f096bf1477affaf8814435 php-4.4.0RC1.tar.bz2 4082878
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild b/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild
new file mode 100644
index 000000000000..cc16b582125a
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0_rc1.ebuild,v 1.1 2005/06/13 19:32:13 sebastian Exp $
+
+SRC_URI_BASE="http://qa.php.net/~derick"
+IUSE="${IUSE} apache2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+detectapache() {
+	local domsg=
+	[ -n "$1" ] && domsg=1
+	HAVE_APACHE1=
+	HAVE_APACHE2=
+	has_version '=net-www/apache-1*' && HAVE_APACHE1=1
+	has_version '=net-www/apache-2*' && HAVE_APACHE2=1
+
+	[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
+	[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
+	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+
+	case "${APACHEVER}" in
+	1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;;
+	2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';;
+	both)
+		if use apache2; then
+			[ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
+			APACHEVER=2
+		else
+			[ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
+			APACHEVER=1
+		fi ;;
+	*) if [ -n "${domsg}" ]; then
+			MSG="Unknown Apache version!"; eerror $MSG ; die $MSG
+	   else
+			APACHEVER=0
+	   fi; ;;
+	esac
+}
+
+detectapache
+
+SLOT="${APACHEVER}"
+[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2=''
+
+PHPSAPI="apache${APACHEVER}"
+SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
+
+# BIG FAT WARNING!
+# the php eclass requires the PHPSAPI setting!
+# In this case the PHPSAPI setting is dependant on the detectapache function
+# above this point as well!
+inherit php-sapi eutils apache-module flag-o-matic
+
+DESCRIPTION="Apache module for PHP"
+
+DEPEND_EXTRA=">=net-www/apache-1.3.33-r2
+			  apache2? ( >=net-www/apache-2.0.54-r10 )"
+DEPEND="${DEPEND} ${DEPEND_EXTRA}"
+RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
+IUSE="${IUSE} debug"
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
+PROVIDE="${PROVIDE} virtual/httpd-php"
+
+# generalize some apache{,2} vars (defined by apache-module.eclass)
+if [ -n ${USE_APACHE2} ]; then
+	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
+	APACHE_CONFDIR=${APACHE2_CONFDIR}
+else
+	APACHE_MODULESDIR=${APACHE_MODULESDIR}
+	APACHE_CONFDIR=${APACHE_CONFDIR}
+fi
+
+# Add a 'return 0' as we DON'T want the return code checked
+pkg_setup() {
+	use debug && einfo "Installing in SLOT=${SLOT}"
+	return 0
+}
+
+src_unpack() {
+	multiinstwarn
+	detectapache domsg
+	php-sapi_src_unpack
+	if [ "${ARCH}" == "amd64" ] ; then
+		epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff
+	fi
+
+	# bug fix for security problem - bug #39952
+	# second revision as the apache2 stuff was resolved upstream
+	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
+
+	# Bug 88756
+	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
+
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+
+	# stop php from activing the apache config, as we will do that ourselves
+	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4; do
+		sed -i.orig -e 's,-i -a -n php4,-i -n php4,g' $i
+	done
+}
+
+setup_environ() {
+	append-flags `apr-config --cppflags --cflags`
+}
+
+src_compile() {
+	setup_environ
+
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`/usr/sbin/apache2 -l | egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		einfo "Apache2 MPM: ${APACHE2_MPM}"
+		case "${APACHE2_MPM}" in
+			*prefork*) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;;
+		esac;
+	fi
+
+	#use apache2 \
+	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	php-sapi_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}"
+	dodir ${APACHE_CONFDIR}
+	dodir ${PHPINIDIRECTORY}
+	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
+
+	einfo "Cleaning up a little"
+	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
+
+	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
+	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
+	exeinto ${APACHE_MODULESDIR}
+
+	einfo "Installing mod_php shared object now"
+	doexe .libs/libphp4.so
+
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Installing a Apache2 config for PHP (70_mod_php.conf)"
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf"
+	else
+		einfo "Installing a Apache config for PHP (mod_php.conf)"
+		insinto ${APACHE1_MODULES_CONFDIR}
+		doins ${FILESDIR}/mod_php.conf
+		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${PHPINIFILENAME}
+	fi
+}
+
+apache2msg() {
+	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\" to APACHE2_OPTS"
+	ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\""
+	ewarn "This is for the upcoming PHP5 support. The ebuild will attempt"
+	ewarn "to make this update between PHP and PHP4 automatically"
+}
+
+multiinstwarn() {
+	ewarn "Due to some previous bloopers with PHP and slotting, you may have"
+	ewarn "multiple instances of mod_php installed. Please look at the autoclean"
+	ewarn "output at the end of the emerge and unmerge all but relevant"
+	ewarn "instances."
+}
+
+apache2fix() {
+	if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then
+		einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change."
+		local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`"
+		cp /etc/conf.d/apache2 ${oldfile}
+		sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile}  <${oldfile} >/etc/conf.d/apache2
+	fi
+}
+
+
+pkg_preinst() {
+	multiinstwarn
+	[ "${APACHEVER}" -eq '2' ] && apache2fix
+	php-sapi_pkg_preinst
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	multiinstwarn
+	einfo "To have Apache run php programs, please do the following:"
+	if [ -n "${USE_APACHE2}" ]; then
+		apache2msg
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\" to APACHE_OPTS"
+		einfo "That will include the php mime types in your configuration"
+		einfo "automagically and setup Apache to load php when it starts."
+	fi
+}
+
+pkg_config() {
+	multiinstwarn
+	if [ -n "${USE_APACHE2}" ]; then
+		apache2msg
+	else
+		${ROOT}/usr/sbin/apacheaddmod \
+			${ROOT}/etc/apache/apache.conf \
+			modules/libphp4.so mod_php4.c php4_module \
+			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
+			:;
+	fi
+}
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index a29a55e6601c..6083869ebcb3 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.73 2005/06/11 13:26:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.74 2005/06/13 19:32:58 sebastian Exp $
+
+*php-cgi-4.4.0_rc1 (13 Jun 2005)
+
+  13 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +php-cgi-4.4.0_rc1.ebuild:
+  Version bump.
 
   11 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> php-cgi-5.0.4.ebuild:
   Add ~ia64 and ~alpha keywords.
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 34691f489435..983d1d37af2d 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,28 +1,30 @@
-MD5 09d3d3d80c7d19497f383b50f0d6f2f6 php-cgi-4.3.11.ebuild 995
-MD5 478fc112feed11a4a2e5bcce9a7f0f6c ChangeLog 9821
-MD5 46aebfa8a26be82c3c0a32aab969f492 php-cgi-4.3.10.ebuild 921
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 ec6a9c89ec2cc50a21a6beba1811af20 php-cgi-4.3.11-r1.ebuild 1118
+MD5 686f1f839bde788f08f6a1193b860a10 php-cgi-5.0.4.ebuild 1100
+MD5 b0699992939c804bbc6e2382978bbe1f php-cgi-4.3.8-r1.ebuild 767
 MD5 a2364c381c6ecc36e77343399d311f8f php-cgi-4.3.8.ebuild 749
+MD5 17e277f5779f990fa11d3007bfeaeb0e php-cgi-4.4.0_rc1.ebuild 1159
+MD5 09d3d3d80c7d19497f383b50f0d6f2f6 php-cgi-4.3.11.ebuild 995
 MD5 dceed980602910f4b477dfec8d31bc68 php-cgi-4.3.9_rc1.ebuild 860
-MD5 bd43248eeca41df5712a8cd1d8fad2b1 php-cgi-4.3.9_rc1-r1.ebuild 878
-MD5 b0699992939c804bbc6e2382978bbe1f php-cgi-4.3.8-r1.ebuild 767
 MD5 0027de1560a23faca547c7531eebce2f php-cgi-4.3.9.ebuild 790
-MD5 686f1f839bde788f08f6a1193b860a10 php-cgi-5.0.4.ebuild 1100
+MD5 46aebfa8a26be82c3c0a32aab969f492 php-cgi-4.3.10.ebuild 921
 MD5 a4c7d82cf8fe5d4b82eff5a4b283d882 php-cgi-4.3.9-r1.ebuild 808
-MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9-r1 282
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11 284
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 bd43248eeca41df5712a8cd1d8fad2b1 php-cgi-4.3.9_rc1-r1.ebuild 878
+MD5 ec6a9c89ec2cc50a21a6beba1811af20 php-cgi-4.3.11-r1.ebuild 1118
+MD5 478fc112feed11a4a2e5bcce9a7f0f6c ChangeLog 9821
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11-r1 284
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-php-cgi-4.3.10 284
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
 MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9 282
 MD5 457955f18cb41f31bab803aac779573c files/digest-php-cgi-5.0.4 140
+MD5 61651790550bc156f10ae2a3edafebe2 files/digest-php-cgi-4.4.0_rc1 208
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
+MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9-r1 282
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 f7a7898637874593f519c336db79fa45 files/php-cgi-5.0.3-missing-arches.patch 524
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-php-cgi-4.3.10 284
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11 284
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.4.0_rc1 b/dev-php/php-cgi/files/digest-php-cgi-4.4.0_rc1
new file mode 100644
index 000000000000..aefeb8263132
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.4.0_rc1
@@ -0,0 +1,3 @@
+MD5 d957e8e543f096bf1477affaf8814435 php-4.4.0RC1.tar.bz2 4082878
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild b/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild
new file mode 100644
index 000000000000..4f9690b67d4f
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.4.0_rc1.ebuild,v 1.1 2005/06/13 19:32:58 sebastian Exp $
+
+SRC_URI_BASE="http://qa.php.net/~derick"
+PHPSAPI="cgi"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+IUSE="${IUSE} force-cgi-redirect"
+KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc ~ia64 ~amd64 ~mips"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
+PROVIDE="${PROVIDE} virtual/httpd-php"
+
+src_unpack() {
+	php-sapi_src_unpack
+
+	# Bug 88756
+	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
+
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+}
+
+src_compile() {
+	# CLI needed to build stuff
+	myconf="${myconf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	if use force-cgi-redirect; then
+		myconf="${myconf} --enable-force-cgi-redirect"
+	fi
+
+	php-sapi_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	rm -f ${D}/usr/bin/php
+	# rename binary
+	newbin ${S}/sapi/cgi/php php-cgi
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CGI only build."
+}
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index bd23c11549f5..82b4fb442f35 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.165 2005/06/11 14:28:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.166 2005/06/13 19:31:09 sebastian Exp $
+
+*php-4.4.0_rc1 (13 Jun 2005)
+
+  13 Jun 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +php-4.4.0_rc1.ebuild:
+  Version bump.
 
   11 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> php-5.0.4-r1.ebuild:
   Add ~ia64 and ~alpha keywords.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index eedf2c7dba21..91f30de8ded9 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,23 +1,25 @@
-MD5 e560f830cab5402d56e1d29141bb82ec ChangeLog 22651
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 a556b249b3263a9b723dc17df6feac49 php-5.1.0_beta.ebuild 960
-MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
-MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
 MD5 fbba8d77e8712b6026b0815967281540 php-4.3.10.ebuild 1137
+MD5 62c3df59e32afd3a3b5b8d89ceac6d3d php-4.4.0_rc1.ebuild 1172
+MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
 MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217
-MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
+MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
+MD5 a556b249b3263a9b723dc17df6feac49 php-5.1.0_beta.ebuild 960
 MD5 47897b0231033ecac196f1b218c2c5e8 php-5.0.4-r1.ebuild 952
-MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-php-5.1.0_beta 65
+MD5 e560f830cab5402d56e1d29141bb82ec ChangeLog 22651
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
 MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
-MD5 205c1cd94cbb81c772fa366163faff0a files/digest-php-4.3.9 208
+MD5 e89b8e6fd76cf1f38bb0f93ff8903ce1 files/digest-php-4.4.0_rc1 134
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 6fb14885b5124b2bb92eb7a02ac24b01 files/php-5.0.3-gcc4.patch 432
+MD5 c489374c3a857fe00e500c1d49ad1ee4 files/digest-php-5.1.0_beta 65
 MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
+MD5 457955f18cb41f31bab803aac779573c files/digest-php-5.0.4-r1 140
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
+MD5 205c1cd94cbb81c772fa366163faff0a files/digest-php-4.3.9 208
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
 MD5 e1385dbdad960ad1d13116d33814dacd files/digest-php-4.3.11 210
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 6fb14885b5124b2bb92eb7a02ac24b01 files/php-5.0.3-gcc4.patch 432
-MD5 457955f18cb41f31bab803aac779573c files/digest-php-5.0.4-r1 140
diff --git a/dev-php/php/files/digest-php-4.4.0_rc1 b/dev-php/php/files/digest-php-4.4.0_rc1
new file mode 100644
index 000000000000..2cbd9955b1d4
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.4.0_rc1
@@ -0,0 +1,2 @@
+MD5 d957e8e543f096bf1477affaf8814435 php-4.4.0RC1.tar.bz2 4082878
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/php-4.4.0_rc1.ebuild b/dev-php/php/php-4.4.0_rc1.ebuild
new file mode 100644
index 000000000000..f99c81e7451e
--- /dev/null
+++ b/dev-php/php/php-4.4.0_rc1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.4.0_rc1.ebuild,v 1.1 2005/06/13 19:31:09 sebastian Exp $
+
+PHPSAPI="cli"
+SRC_URI_BASE="http://qa.php.net/~derick"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+
+	# Bug 88756
+	use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch
+
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}