Version bump, many upstream fixes. Bug #60216.

8 files changed, 184 insertions, 3 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 2a6318960dec..c50b9e559e4a 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.176 2004/08/13 20:48:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.177 2004/08/13 21:19:58 robbat2 Exp $
+
+*mod_php-5.0.1 (13 Aug 2004)
+
+  13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +mod_php-5.0.1.ebuild:
+  Version bump, many upstream fixes. Bug #60216.
 
   13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> :
   update apache depend.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 8669ceb2e40a..cc4d22fcfdd5 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -2,7 +2,8 @@ MD5 1c5a0beb6a09c14f2a2661ed78eeba4d mod_php-5.0.0.ebuild 4008
 MD5 b88dcf659c6b7a84f49710bf3a90c4cb mod_php-4.3.8.ebuild 5912
 MD5 4e71e32fe9d8f2eec8b24dc0ca72237d mod_php-5.0.0-r1.ebuild 4193
 MD5 9e19b7f691662389947b59c9a1156935 mod_php-4.3.9_rc1.ebuild 6027
-MD5 087d6bc4f61716f42193394d603b8dcc ChangeLog 32330
+MD5 049283d6d12e652e1625750593cdd22b mod_php-5.0.1.ebuild 4190
+MD5 11f34de08768b7feaeda84372e02c32c ChangeLog 32486
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
@@ -11,6 +12,7 @@ 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 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 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-5.0.1 b/dev-php/mod_php/files/digest-mod_php-5.0.1
new file mode 100644
index 000000000000..cbad23e72d02
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-5.0.1
@@ -0,0 +1 @@
+MD5 b12042826ddba29fba3ae5a2eac3c391 php-5.0.1.tar.bz2 4569781
diff --git a/dev-php/mod_php/mod_php-5.0.1.ebuild b/dev-php/mod_php/mod_php-5.0.1.ebuild
new file mode 100644
index 000000000000..2be0d1ac8929
--- /dev/null
+++ b/dev-php/mod_php/mod_php-5.0.1.ebuild
@@ -0,0 +1,143 @@
+# 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.1.ebuild,v 1.1 2004/08/13 21:19:58 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+KEYWORDS="~x86"
+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.1
+			  >=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 ${PHPINIDIRECTORY}/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 ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+	fi
+}
+
+apache2msg() {
+	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS"
+	ewarn "This is a change from before!"
+}
+
+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."
+	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/ChangeLog b/dev-php/php/ChangeLog
index aba1e2bb2148..725ab7322f5d 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.115 2004/08/12 11:05:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.116 2004/08/13 21:18:01 robbat2 Exp $
+
+*php-5.0.1 (13 Aug 2004)
+
+  13 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +php-5.0.1.ebuild:
+  Version bump, many upstream fixes. Bug #60216.
 
   12 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> php-5.0.0-r1.ebuild:
   Roll out 5.0.0-r1 to ~x86 ONLY. Other interested arches need to keyword the
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 2b18958871e8..bf6a667951c3 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,3 +1,4 @@
+MD5 abf5f97a49422c509b77b8077d714153 php-5.0.1.ebuild 540
 MD5 48aa6f4b37fb2c3cc4fa6ad0527f4378 php-5.0.0.ebuild 521
 MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137
 MD5 b2d0db4a25a518bc74e470b79905112b ChangeLog 16848
@@ -11,3 +12,4 @@ 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 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
diff --git a/dev-php/php/files/digest-php-5.0.1 b/dev-php/php/files/digest-php-5.0.1
new file mode 100644
index 000000000000..cbad23e72d02
--- /dev/null
+++ b/dev-php/php/files/digest-php-5.0.1
@@ -0,0 +1 @@
+MD5 b12042826ddba29fba3ae5a2eac3c391 php-5.0.1.tar.bz2 4569781
diff --git a/dev-php/php/php-5.0.1.ebuild b/dev-php/php/php-5.0.1.ebuild
new file mode 100644
index 000000000000..7b14fef46030
--- /dev/null
+++ b/dev-php/php/php-5.0.1.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.1.ebuild,v 1.1 2004/08/13 21:18:01 robbat2 Exp $
+
+PHPSAPI="cli"
+MY_P="${PN}-${PV}"
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+LICENSE="PHP"
+KEYWORDS="~x86"
+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
+}