Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-php/mod_php/ChangeLog8
-rw-r--r--dev-php/mod_php/Manifest4
-rw-r--r--dev-php/mod_php/files/digest-mod_php-4.3.93
-rw-r--r--dev-php/mod_php/files/digest-mod_php-5.0.21
-rw-r--r--dev-php/mod_php/mod_php-4.3.9.ebuild191
-rw-r--r--dev-php/mod_php/mod_php-5.0.2.ebuild144
-rw-r--r--dev-php/php-cgi/ChangeLog8
-rw-r--r--dev-php/php-cgi/Manifest28
-rw-r--r--dev-php/php-cgi/files/digest-php-cgi-4.3.93
-rw-r--r--dev-php/php-cgi/files/digest-php-cgi-5.0.21
-rw-r--r--dev-php/php-cgi/php-cgi-4.3.9.ebuild38
-rw-r--r--dev-php/php-cgi/php-cgi-5.0.2.ebuild42
-rw-r--r--dev-php/php/ChangeLog8
-rw-r--r--dev-php/php/Manifest16
-rw-r--r--dev-php/php/files/digest-php-4.3.92
-rw-r--r--dev-php/php/files/digest-php-5.0.21
-rw-r--r--dev-php/php/php-4.3.9.ebuild44
-rw-r--r--dev-php/php/php-5.0.2.ebuild22
18 files changed, 538 insertions, 26 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index e3e4e5e02997..13cfeff78a78 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.181 2004/09/14 17:08:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.182 2004/09/24 18:24:29 robbat2 Exp $
+
+*mod_php-5.0.2 (24 Sep 2004)
+
+ 24 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +mod_php-4.3.9.ebuild,
+ +mod_php-5.0.2.ebuild:
+ Bug #65180, version bump.
14 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf,
files/70_mod_php5.conf:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 3b6b2e66ce56..0b31dbd0ba89 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,4 +1,6 @@
MD5 309b2e76d5d4951508c3376817f1c416 mod_php-5.0.0.ebuild 3997
+MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9.ebuild 6027
+MD5 f6c0b2da02a8c55fc260ae228e9cf2f4 mod_php-5.0.2.ebuild 4246
MD5 b88dcf659c6b7a84f49710bf3a90c4cb mod_php-4.3.8.ebuild 5912
MD5 ee2192bcf2a49ea2faf6dc79b9b03099 mod_php-5.0.0-r1.ebuild 4181
MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9_rc1.ebuild 6027
@@ -11,8 +13,10 @@ MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63
MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
+MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205
MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63
MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.9 b/dev-php/mod_php/files/digest-mod_php-4.3.9
new file mode 100644
index 000000000000..b10301d72f1f
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.9
@@ -0,0 +1,3 @@
+MD5 b799bbb330da60324d972641baab693c php-4.3.9.tar.bz2 4001681
+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/files/digest-mod_php-5.0.2 b/dev-php/mod_php/files/digest-mod_php-5.0.2
new file mode 100644
index 000000000000..18677de1aedb
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-5.0.2
@@ -0,0 +1 @@
+MD5 579f82f3d6a61b669183b2ebce357a1e php-5.0.2.tar.bz2 4577974
diff --git a/dev-php/mod_php/mod_php-4.3.9.ebuild b/dev-php/mod_php/mod_php-4.3.9.ebuild
new file mode 100644
index 000000000000..28a902044139
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.9.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2004 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.3.9.ebuild,v 1.1 2004/09/24 18:24:29 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390"
+
+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
+
+DESCRIPTION="Apache module for PHP"
+
+DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
+ apache2? ( >=net-www/apache-2.0.43-r1 )"
+DEPEND="${DEPEND} ${DEPEND_EXTRA}"
+RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
+IUSE="${IUSE} debug"
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
+PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+
+# 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
+
+ # 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
+}
+
+src_compile() {
+ # 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 /etc/apache${USE_APACHE2}/conf/
+ dodir ${PHPINIDIRECTORY}
+ dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME}
+
+ einfo "Cleaning up a little"
+ rm -rf ${D}/usr/lib/apache${USE_APACHE2}/modules/libphp4.so
+ einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
+ dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+ exeinto /usr/lib/apache${USE_APACHE2}-extramodules
+ 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 /etc/apache2/conf/modules.d
+ doins ${FILESDIR}/70_mod_php.conf
+ else
+ einfo "Installing a Apache config for PHP (mod_php.conf)"
+ insinto /etc/apache/conf/addon-modules
+ doins ${FILESDIR}/mod_php.conf
+ dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${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/conf/apache.conf \
+ extramodules/libphp4.so mod_php4.c php4_module \
+ before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf
+ :;
+ fi
+}
diff --git a/dev-php/mod_php/mod_php-5.0.2.ebuild b/dev-php/mod_php/mod_php-5.0.2.ebuild
new file mode 100644
index 000000000000..79d6bde5c0f5
--- /dev/null
+++ b/dev-php/mod_php/mod_php-5.0.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2.ebuild,v 1.1 2004/09/24 18:24:29 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+KEYWORDS="~x86 ~ppc"
+PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+
+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}"
+MY_P="php-${PV}"
+
+# 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 php5-sapi eutils
+
+DESCRIPTION="Apache module for PHP 5"
+
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.2
+ >=net-www/apache-1.3.26-r2
+ apache2? ( >=net-www/apache-2.0.50 )
+ || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )"
+DEPEND="${DEPEND} ${DEPEND_EXTRA}"
+RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
+IUSE="${IUSE} debug"
+
+# 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() {
+ detectapache domsg
+
+ php5-sapi_src_unpack
+}
+
+src_compile() {
+ # 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*) ;;
+ *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;;
+ esac;
+ fi
+
+ #use apache2 \
+ my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+ php5-sapi_src_compile
+}
+
+
+src_install() {
+ PHP_INSTALLTARGETS="install"
+ php5-sapi_src_install
+
+ einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
+ dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib
+
+ if [ -n "${USE_APACHE2}" ] ; then
+ einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
+ insinto /etc/apache2/conf/modules.d
+ doins ${FILESDIR}/70_mod_php5.conf
+ else
+ einfo "Installing a Apache config for PHP (mod_php5.conf)"
+ insinto /etc/apache/conf/addon-modules
+ doins ${FILESDIR}/mod_php5.conf
+ dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE}
+ fi
+}
+
+apache2msg() {
+ einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS"
+ ewarn "This is a change from the old \"-D PHP4\"!"
+}
+
+pkg_postinst() {
+ 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 PHP5\" 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."
+ ewarn "This is a change from the old \"-D PHP4\"!"
+ fi
+}
+
+pkg_config() {
+ if [ -n "${USE_APACHE2}" ]; then
+ apache2msg
+ else
+ ${ROOT}/usr/sbin/apacheaddmod \
+ ${ROOT}/etc/apache/conf/apache.conf \
+ extramodules/libphp5.so mod_php5.c php5_module \
+ before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf
+ :;
+ fi
+}
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 16533eae85f5..051c3b473a4e 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.37 2004/08/20 12:22:21 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.38 2004/09/24 18:26:33 robbat2 Exp $
+
+*php-cgi-5.0.2 (24 Sep 2004)
+
+ 24 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +php-cgi-4.3.9.ebuild,
+ +php-cgi-5.0.2.ebuild:
+ Bug #65180, version bump.
20 Aug 2004; David Holm <dholm@gentoo.org> php-cgi-5.0.1.ebuild:
Added to ~ppc.
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index fb6e32c08921..fd2e1587be79 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,18 +1,22 @@
-MD5 4ee4a74438b13bf1a384c414302f29c7 ChangeLog 5158
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 ca42c18e46b70937fe8c3ff46ec89dc2 php-cgi-4.3.8-r1.ebuild 771
MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
-MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
-MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898
+MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
MD5 3411777bc579d53726a119e9bcd58c0c php-cgi-4.3.9_rc1.ebuild 866
-MD5 ca42c18e46b70937fe8c3ff46ec89dc2 php-cgi-4.3.8-r1.ebuild 771
+MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898
+MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
+MD5 552c78181a8dc33713a9c756c194fbf3 php-cgi-4.3.9.ebuild 806
+MD5 9e2227c1288f239d4b8c64c2997773ab php-cgi-5.0.2.ebuild 895
MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886
-MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 caf6f49f39f907b9ddcae240a1407420 ChangeLog 5242
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
+MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9 205
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-cgi-5.0.2 63
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.9 b/dev-php/php-cgi/files/digest-php-cgi-4.3.9
new file mode 100644
index 000000000000..b10301d72f1f
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.9
@@ -0,0 +1,3 @@
+MD5 b799bbb330da60324d972641baab693c php-4.3.9.tar.bz2 4001681
+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/files/digest-php-cgi-5.0.2 b/dev-php/php-cgi/files/digest-php-cgi-5.0.2
new file mode 100644
index 000000000000..18677de1aedb
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.2
@@ -0,0 +1 @@
+MD5 579f82f3d6a61b669183b2ebce357a1e php-5.0.2.tar.bz2 4577974
diff --git a/dev-php/php-cgi/php-cgi-4.3.9.ebuild b/dev-php/php-cgi/php-cgi-4.3.9.ebuild
new file mode 100644
index 000000000000..e0eb171cc1bb
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 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.3.9.ebuild,v 1.1 2004/09/24 18:26:33 robbat2 Exp $
+
+PHPSAPI="cgi"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc ~ia64"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
+PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+
+src_compile() {
+ # CLI needed to build stuff
+ myconf="${myconf} \
+ --enable-cgi \
+ --enable-cli \
+ --enable-fastcgi"
+
+ php-sapi_src_compile
+}
+
+
+src_install() {
+ PHP_INSTALLTARGETS="install"
+ php-sapi_src_install
+
+ # rename binary
+ mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+ php-sapi_pkg_postinst
+ einfo "This is a CGI only build."
+}
diff --git a/dev-php/php-cgi/php-cgi-5.0.2.ebuild b/dev-php/php-cgi/php-cgi-5.0.2.ebuild
new file mode 100644
index 000000000000..4a057bc228c5
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.2.ebuild,v 1.1 2004/09/24 18:26:33 robbat2 Exp $
+
+PHPSAPI="cgi"
+MY_P="php-${PV}"
+
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+# provides all base PHP extras (eg PEAR, extension building stuff)
+DEPEND_PHP=">=${PHP_PROVIDER_PKG}-5.0.2"
+DEPEND="${DEPEND} ${DEPEND_PHP}"
+RDEPEND="${RDEPEND} ${DEPEND_PHP}"
+
+PROVIDE="virtual/php-${PV} virtual/httpd-php-${PV}"
+
+src_compile() {
+ # CLI needed to build stuff
+ my_conf="${my_conf} \
+ --enable-cgi \
+ --enable-cli \
+ --enable-fastcgi"
+
+ php5-sapi_src_compile
+}
+
+
+src_install() {
+ PHP_INSTALLTARGETS="install"
+ php5-sapi_src_install
+
+ # rename binary
+ mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+ einfo "This is a CGI only build."
+}
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 4e6d71bbd243..3a0bce733545 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-php/php
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.121 2004/09/02 07:04:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.122 2004/09/24 18:25:17 robbat2 Exp $
+
+*php-5.0.2 (24 Sep 2004)
+
+ 24 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +php-4.3.9.ebuild,
+ +php-5.0.2.ebuild:
+ Bug #65180, version bump.
19 Aug 2004; Tom Gall <tgall@gentoo.org> php-4.3.8.ebuild:
stable on ppc64.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 61245e3167b5..246431075bd2 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,9 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 689ff503593ffe8079ea791bb730103f memtest.php 289
MD5 0413eca1cec9d3896cfe3634fd3e6806 php-5.0.1.ebuild 540
MD5 48aa6f4b37fb2c3cc4fa6ad0527f4378 php-5.0.0.ebuild 521
+MD5 03a3ce9659713bebf3431a6335dddd2d php-4.3.9.ebuild 1077
MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137
+MD5 0413eca1cec9d3896cfe3634fd3e6806 php-5.0.2.ebuild 540
MD5 1fd9e29b620c971d1fd0b7e8aca97ca3 ChangeLog 17158
MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
MD5 abf5f97a49422c509b77b8077d714153 php-5.0.0-r1.ebuild 540
@@ -14,13 +14,7 @@ MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
+MD5 b4787473c5b65d10113edd1635711e08 files/digest-php-4.3.9 131
MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-Comment: .//Manifest 1094108045
-
-iD8DBQFBNsOUPpIsIjIzwiwRAvWJAJ0UtkSLTTHvjIJJwbv63WlcX73wZQCgxQEZ
-JTy6eIclgDPMrFF+MUlDJok=
-=yP+O
------END PGP SIGNATURE-----
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63
diff --git a/dev-php/php/files/digest-php-4.3.9 b/dev-php/php/files/digest-php-4.3.9
new file mode 100644
index 000000000000..98166f60826e
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.9
@@ -0,0 +1,2 @@
+MD5 b799bbb330da60324d972641baab693c php-4.3.9.tar.bz2 4001681
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/files/digest-php-5.0.2 b/dev-php/php/files/digest-php-5.0.2
new file mode 100644
index 000000000000..18677de1aedb
--- /dev/null
+++ b/dev-php/php/files/digest-php-5.0.2
@@ -0,0 +1 @@
+MD5 579f82f3d6a61b669183b2ebce357a1e php-5.0.2.tar.bz2 4577974
diff --git a/dev-php/php/php-4.3.9.ebuild b/dev-php/php/php-4.3.9.ebuild
new file mode 100644
index 000000000000..e22c6474f584
--- /dev/null
+++ b/dev-php/php/php-4.3.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.9.ebuild,v 1.1 2004/09/24 18:25:17 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390"
+IUSE=""
+
+src_unpack() {
+ php-sapi_src_unpack
+ [ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+}
+
+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
+}
diff --git a/dev-php/php/php-5.0.2.ebuild b/dev-php/php/php-5.0.2.ebuild
new file mode 100644
index 000000000000..856d054f51e5
--- /dev/null
+++ b/dev-php/php/php-5.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.2.ebuild,v 1.1 2004/09/24 18:25:17 robbat2 Exp $
+
+PHPSAPI="cli"
+MY_P="${PN}-${PV}"
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+LICENSE="PHP"
+KEYWORDS="~x86 ~ppc"
+DEPEND="$DEPEND"
+RDEPEND="$RDEPEND"
+SLOT="0"
+
+# PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
+
+src_compile () {
+ my_conf="--disable-cgi --enable-cli --enable-embed"
+
+ php5-sapi_src_compile
+}