Version bump

Package-Manager: portage-2.0.51.19

6 files changed, 140 insertions, 22 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index c846c306833f..98465238257b 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.225 2005/04/30 15:36:12 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.226 2005/05/04 23:43:18 stuart Exp $
+
+*mod_php-5.0.4 (05 May 2005)
+
+  05 May 2005; Stuart Herbert <stuart@gentoo.org> files/php5-prefork.patch,
+  +files/5.0.4/70_mod_php5.conf, +mod_php-5.0.4.ebuild:
+  Version bump; this ebuild ONLY works with the Apache Refresh packages
 
   30 Apr 2005; Elfyn McBratney <beu@gentoo.org>
   files/4.3.11-r2/70_mod_php.conf:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index d3bb05578d9b..bcea81ef82c2 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,47 +1,50 @@
-MD5 b9c948760dd10ca702b32d8c19694405 ChangeLog 39010
+MD5 3f3c8819843770136df7bc2f0d8aaa9e ChangeLog 39248
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 ee8294251b178d776c61705a710347f1 mod_php-4.3.9_rc1.ebuild 6072
 MD5 3b4db25bfe82d2967bc9c607cccdb12c mod_php-5.0.0-r1.ebuild 4179
+MD5 ee8294251b178d776c61705a710347f1 mod_php-4.3.9_rc1.ebuild 6072
 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244
-MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995
-MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963
 MD5 794be7f3942662541c6c0d25fb64161c mod_php-4.3.9.ebuild 6074
 MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257
 MD5 dc2b446cde6865cfbccaef4a94db4aa2 mod_php-4.3.10.ebuild 6134
 MD5 5357393f40a578f7be2663a74f23640f mod_php-5.0.3.ebuild 4378
 MD5 940874a8b88c3614970e9e501f1dafaf mod_php-4.3.10-r1.ebuild 6349
+MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995
+MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963
 MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177
 MD5 5f347443c2b80bb26a91346b99501aca mod_php-5.0.3-r1.ebuild 4296
 MD5 a4b925aafabf9fb9d585715dfc41f2d3 mod_php-5.0.3-r2.ebuild 2051
+MD5 4be14b2f74cac7450c1dd3db2f28a6ad mod_php-4.3.11.ebuild 6072
 MD5 a423281d6b97a9dc2a285cd87f080635 mod_php-4.3.11-r1.ebuild 6289
 MD5 70c46b3aaf750d6af4a7e3f4502373b7 mod_php-4.3.11-r2.ebuild 6289
-MD5 4be14b2f74cac7450c1dd3db2f28a6ad mod_php-4.3.11.ebuild 6072
+MD5 c8a2506e4b3126a82c44c63d7b5116e3 mod_php-5.0.4.ebuild 2093
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-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 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63
 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63
 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63
 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282
 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10-r1 206
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63
 MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63
-MD5 cd604ffae30af42fdc9248147efd0c4b files/php5-prefork.patch 850
+MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11 206
 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r1 206
 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r2 206
+MD5 31708f113837cfa71a1be2265e1d851d files/digest-mod_php-5.0.4 63
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
+MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
diff --git a/dev-php/mod_php/files/5.0.4/70_mod_php5.conf b/dev-php/mod_php/files/5.0.4/70_mod_php5.conf
new file mode 100644
index 000000000000..d8cfa377aee7
--- /dev/null
+++ b/dev-php/mod_php/files/5.0.4/70_mod_php5.conf
@@ -0,0 +1,20 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP5>
+
+	# Load the module first
+	<IfModule !sapi_apache2.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddType application/x-httpd-php .php
+		AddType application/x-httpd-php .phtml
+		AddType application/x-httpd-php .php3
+		AddType application/x-httpd-php .php4
+		AddType application/x-httpd-php .php5
+		AddType application/x-httpd-php-source .phps
+	</IfModule>
+
+	AddDirectoryIndex index.php index.phtml index.php5
+</IfDefine>
diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.4 b/dev-php/mod_php/files/digest-mod_php-5.0.4
new file mode 100644
index 000000000000..db1060f4c4fc
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-5.0.4
@@ -0,0 +1 @@
+MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
diff --git a/dev-php/mod_php/files/php5-prefork.patch b/dev-php/mod_php/files/php5-prefork.patch
index 71194dd64c89..135579c33d82 100644
--- a/dev-php/mod_php/files/php5-prefork.patch
+++ b/dev-php/mod_php/files/php5-prefork.patch
@@ -1,6 +1,6 @@
-diff -u --recursive php-5.0.3-orig/sapi/apache2filter/config.m4 php-5.0.3/sapi/apache2filter/config.m4
---- php-5.0.3-orig/sapi/apache2filter/config.m4	2005-03-13 20:30:44.767051120 +0000
-+++ php-5.0.3/sapi/apache2filter/config.m4	2005-03-13 20:32:01.999310032 +0000
+diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4
+--- php-5.0.4-orig/sapi/apache2filter/config.m4	2005-03-13 20:30:44.767051120 +0000
++++ php-5.0.4/sapi/apache2filter/config.m4	2005-03-13 20:32:01.999310032 +0000
 @@ -115,9 +115,6 @@
      ;;
    esac
@@ -11,9 +11,9 @@ diff -u --recursive php-5.0.3-orig/sapi/apache2filter/config.m4 php-5.0.3/sapi/a
    AC_MSG_RESULT(yes)
    
    PHP_SUBST(APXS)
-diff -u --recursive php-5.0.3-orig/sapi/apache2handler/config.m4 php-5.0.3/sapi/apache2handler/config.m4
---- php-5.0.3-orig/sapi/apache2handler/config.m4	2005-03-13 20:30:44.771050512 +0000
-+++ php-5.0.3/sapi/apache2handler/config.m4	2005-03-13 20:31:50.106118072 +0000
+diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4
+--- php-5.0.4-orig/sapi/apache2handler/config.m4	2005-03-13 20:30:44.771050512 +0000
++++ php-5.0.4/sapi/apache2handler/config.m4	2005-03-13 20:31:50.106118072 +0000
 @@ -114,9 +114,6 @@
      ;;
    esac
diff --git a/dev-php/mod_php/mod_php-5.0.4.ebuild b/dev-php/mod_php/mod_php-5.0.4.ebuild
new file mode 100644
index 000000000000..51e5cdc81de8
--- /dev/null
+++ b/dev-php/mod_php/mod_php-5.0.4.ebuild
@@ -0,0 +1,88 @@
+# 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-5.0.4.ebuild,v 1.1 2005/05/04 23:43:18 stuart Exp $
+
+IUSE="${IUSE} apache2"
+
+# this duplicates the code from depend.apache.eclass, but it's the
+# only way to do this here
+
+if useq apache2 ; then
+	APACHE_VERSION=2
+else
+	APACHE_VERSION=1
+fi
+
+KEYWORDS="~x86 ~amd64"
+PROVIDE="virtual/httpd-php-${PV}"
+
+SLOT="${APACHE_VERSION}"
+
+PHPSAPI="apache${APACHE_VERSION}"
+MY_PHP_P="php-${PV}"
+PHP_S="${WORKDIR}/php-${PV}"
+PHP_PACKAGE=1
+
+# BIG FAT WARNING!
+# the php eclass requires the PHPSAPI setting!
+inherit eutils php5-sapi-r2 apache-module
+
+need_apache
+
+DESCRIPTION="Apache module for PHP 5"
+
+pkg_setup() {
+
+	# the list of safe MPM's may need revising
+	if ! useq threads ; then
+		APACHE2_SAFE_MPMS="prefork"
+	else
+		APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool"
+	fi
+
+	apache-module_pkg_setup
+	php5-sapi-r2_pkg_setup
+}
+
+src_unpack() {
+	php5-sapi-r2_src_unpack
+
+	# if we're not using threads, we need to force them to be switched
+	# off by patching php's configure script
+	cd ${S}
+	pwd
+	if ! useq threads ; then
+		epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support"
+		einfo "Rebuilding configure script"
+		WANT_AUTOCONF=2.5 \
+		autoconf -W no-cross || die "Unable to regenerate configure script"
+	fi
+}
+
+src_compile() {
+	if [ "${APACHE_VERSION}" = "2" ]; then
+			if useq threads ; then
+				my_conf="${my_conf} --enable-experimental-zts"
+				ewarn "Enabling ZTS for Apache2 MPM"
+			fi
+	fi
+
+	my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	php5-sapi-r2_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php5-sapi-r2_src_install
+
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
+		insinto ${APACHE_MODULES_CONFDIR}
+		doins "${FILESDIR}/5.0.4/70_mod_php5.conf"
+	else
+		einfo "Installing a Apache config for PHP (mod_php5.conf)"
+		insinto ${APACHE_MODULES_CONFDIR}
+		doins ${FILESDIR}/mod_php5.conf
+	fi
+}