fix copyright headers and add new mod_php build

19 files changed, 237 insertions, 58 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 49387666898e..81228cb954a0 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.113 2004/01/05 21:28:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.114 2004/01/08 04:11:46 robbat2 Exp $
+
+  07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild,
+  mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild,
+  mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild,
+  mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild,
+  mod_php-4.3.3_rc3.ebuild, mod_php-4.3.4-r1.ebuild:
+  fix copyright headers and add new mod_php build
 
   19 Dec 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.3-r3.ebuild:
   Marked stable on hppa.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index e15a02260919..807bfef7192e 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,18 +1,19 @@
-MD5 9c38ee73c891f0aa8afb0b7c7167f499 mod_php-4.3.2.ebuild 3397
-MD5 085cec272b63ee8b26e947a554c4ee75 mod_php-4.3.3-r2.ebuild 4983
-MD5 b81baaaa5f38d6b5eac3d7bc476824dd mod_php-4.3.2-r5.ebuild 5114
-MD5 f5998dc6781e4ce20aa95f31962ae91a mod_php-4.3.4-r1.ebuild 5063
-MD5 2367a16f3bdf02568cd5d250ded22c84 mod_php-4.3.3_rc3.ebuild 5133
-MD5 2c0c225b78054a1693a9662dcd2e63cb mod_php-4.3.4.ebuild 4985
-MD5 2b403f62d409c8b30f3d86dc25745cae mod_php-4.3.2-r2.ebuild 3700
-MD5 d1f9a7327cc66cac61c283a243327b86 mod_php-4.3.3-r1.ebuild 4941
-MD5 afa464a769fd97a49ea7f69976107efd mod_php-4.3.2-r4.ebuild 4983
-MD5 bbfc5d891242e3bc02105aae9caaad1a mod_php-4.3.3.ebuild 4903
-MD5 8f99471f4c07d3ea5cc891b2820f1913 mod_php-4.3.3-r3.ebuild 4984
-MD5 50fff8612bb40040a285f7ce993a57bf mod_php-4.3.2-r1.ebuild 2764
-MD5 8017002c8afe232534b2d4a30a7653d7 ChangeLog 23043
+MD5 775add25cc780bd95fd05627f1cb8861 mod_php-4.3.2.ebuild 3396
+MD5 52e6d5c29a06757fb0cdc6db0805e792 mod_php-4.3.3-r2.ebuild 4982
+MD5 79d34bd2d33f79ff4d5c4cecec6b1dd2 mod_php-4.3.2-r5.ebuild 5113
+MD5 d94cea7e03eb6ea7f3834f246a094ef7 mod_php-4.3.4-r1.ebuild 5062
+MD5 1d9cbacb67dfd7f5a162bb1ac2f4d627 mod_php-4.3.3_rc3.ebuild 5132
+MD5 3c04ca28f8d5df2b08e17b72b5225874 mod_php-4.3.4.ebuild 4984
+MD5 0978df39cdde92ea17c4521e62becea4 mod_php-4.3.2-r2.ebuild 3700
+MD5 82c362a1684aa4e8dd32b9fe1afb041e mod_php-4.3.3-r1.ebuild 4941
+MD5 3ca4f93abd706c39973ddddc1f5c1df4 mod_php-4.3.2-r4.ebuild 4982
+MD5 041b7315a7b196be518f20fd4aad3322 mod_php-4.3.3.ebuild 4902
+MD5 22c27fd0663e806da4d4d8785ee08714 mod_php-4.3.3-r3.ebuild 4984
+MD5 340c651b5fff670db272df3249e7faed mod_php-4.3.2-r1.ebuild 2763
+MD5 a3cd91f0bf6d263bd7da7048c2e516d1 mod_php-4.3.4-r2.ebuild 5087
+MD5 f6ee9db41acf5bca91d4225ec422ac81 ChangeLog 23452
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 ab922e090a73966d2e013740358baf07 mod_php-4.3.2-r3.ebuild 4943
+MD5 60bf3a76a5d6146886b465951edccbaf mod_php-4.3.2-r3.ebuild 4942
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137
@@ -29,3 +30,4 @@ MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r1 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r1 137
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r2
new file mode 100644
index 000000000000..d65ce9576341
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.4-r2
@@ -0,0 +1,2 @@
+MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild b/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
index 44a2cb292b14..c27a2bd7745e 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r1.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r1.ebuild,v 1.7 2004/01/08 04:11:46 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
diff --git a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
index 7d06d75015d9..1be62cf35f45 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.9 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.10 2004/01/08 04:11:46 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
diff --git a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
index c1f5474ac07c..c02af80469ad 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r3.ebuild,v 1.8 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r3.ebuild,v 1.9 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild b/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
index 320535d234ac..1ca1ad0575eb 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r4.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r4.ebuild,v 1.7 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
index d58623f05298..917f2350cb4f 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r5.ebuild,v 1.6 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r5.ebuild,v 1.7 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.2.ebuild b/dev-php/mod_php/mod_php-4.3.2.ebuild
index 950fda832f89..a397e1099d47 100644
--- a/dev-php/mod_php/mod_php-4.3.2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2.ebuild,v 1.10 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2.ebuild,v 1.11 2004/01/08 04:11:46 robbat2 Exp $
 
 use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
diff --git a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
index 083255603214..e0994d2c3825 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r1.ebuild,v 1.5 2003/12/16 12:14:25 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r1.ebuild,v 1.6 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
index 82e503b33065..b0640fc64e24 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r2.ebuild,v 1.4 2003/11/24 03:51:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r2.ebuild,v 1.5 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
index 09a10ca517a9..9dabda539151 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r3.ebuild,v 1.6 2003/12/19 12:06:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r3.ebuild,v 1.7 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.3.ebuild b/dev-php/mod_php/mod_php-4.3.3.ebuild
index 610f361cf837..5174bc612e41 100644
--- a/dev-php/mod_php/mod_php-4.3.3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3.ebuild,v 1.4 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3.ebuild,v 1.5 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild b/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
index 84f802e84dc0..5302f1c768f7 100644
--- a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild,v 1.4 2003/10/26 03:33:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild,v 1.5 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild b/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
index 11b7932e8f93..157dbe3a08ba 100644
--- a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r1.ebuild,v 1.3 2003/11/24 03:51:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r1.ebuild,v 1.4 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
new file mode 100644
index 000000000000..414e060f4612
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r2.ebuild,v 1.1 2004/01/08 04:11:46 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~arm ~amd64"
+
+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}"
+
+# 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
+
+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}"
+
+src_unpack() {
+	multiinstwarn
+	detectapache domsg
+	php-sapi_src_unpack
+}
+
+src_compile() {
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`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-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 "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-4.3.4.ebuild b/dev-php/mod_php/mod_php-4.3.4.ebuild
index 7220bb3075af..d35497df1755 100644
--- a/dev-php/mod_php/mod_php-4.3.4.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4.ebuild,v 1.3 2003/11/24 03:51:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4.ebuild,v 1.4 2004/01/08 04:11:46 robbat2 Exp $
 
 IUSE="${IUSE} apache2"
 
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 60bf23711538..965be423a114 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,5 +1,7 @@
+MD5 73a6903206cea63f6a6a66282e65081e php-cgi-4.3.4.ebuild 1312
+MD5 8e1b89fb0e128697e9983cc7a17786f4 php-cgi-4.3.4-r2.ebuild 735
+MD5 87431f9bd06194d4346eeb24204d116c ChangeLog 632
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-cgi-4.3.4 137
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-cgi-4.3.4-r2 137
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 d149ca1d95bfba63366fba7db8e9c0c9 php-cgi-4.3.4.ebuild 1313
-MD5 276e9acc54ee2cbc89e5d44735fce812 ChangeLog 447
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 78bb3e422679..fef5e8c090df 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,4 +1,18 @@
-MD5 3d6fd0dabba5f9c3beb6357b0cf36adc php-5.0_beta1-r1.ebuild 1296
+MD5 7fc2f4e9ec15787b541de6c43bf28a36 php-4.3.4-r2.ebuild 1181
+MD5 1bf2a14eaed5c9a95ced86169d9a373f php-5.0_beta1-r1.ebuild 1295
+MD5 8a3a2f5cadfd2aa8ef3a5acf0dc44cec php-4.3.2-r3.ebuild 1139
+MD5 6ab6943b2e8fb979707f596f4c13f9ed php-4.3.3-r2.ebuild 1207
+MD5 278bf268e5fdc9efd93ff92fff5fc195 php-4.3.2.ebuild 2417
+MD5 81a4feab9cd41dfd1759258bdcf8e8c8 php-4.3.4-r1.ebuild 1294
+MD5 95d82f71ce344021ef1fb30fd5c9d7a8 php-4.3.2-r2.ebuild 1181
+MD5 a3eb148680b0a54c484041a0c3e99c30 php-4.3.4.ebuild 1215
+MD5 e17e8e4005ed581a3bf1ee7e69fe88dc php-4.3.3-r1.ebuild 1208
+MD5 ba18a043310aab1bdf65f20bc38c911f php-5.0_beta1.ebuild 1175
+MD5 360356f5ddb24863cfe2cbd443bd0ab0 ChangeLog 10432
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 e3ce4c0754a64f6c4f5be97ec11452fd php-4.3.3-r3.ebuild 1218
+MD5 c3bbca1771fe709e2b56c676a975b1e5 php-4.3.2-r1.ebuild 989
+MD5 d5bdffd14cd79cf7f7eab80853aab7f0 php-4.3.3.ebuild 1209
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r3 137
@@ -6,22 +20,10 @@ MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r1 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r3 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r1 137
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r2 137
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3 137
 MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-php-4.3.4 208
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
-MD5 9960c1a7ed72f9fdedce49456bd805a2 php-4.3.2-r3.ebuild 1141
-MD5 66ce848fd56119473b2d66722f59316b php-4.3.3-r2.ebuild 1208
-MD5 f09650e6c25eea6768304c608e96fac6 php-4.3.2.ebuild 2419
-MD5 7eaa00264155ff7484cd7b5fbac0dc85 php-4.3.4-r1.ebuild 1295
-MD5 fb73db8354092f57ac65bf17eb9b5ba9 php-4.3.2-r2.ebuild 1183
-MD5 01defd491c45ffb94657ff611a7bf5c0 php-4.3.4.ebuild 1216
-MD5 5d0eff803459486b748cd3b47da21c39 php-4.3.3-r1.ebuild 1209
-MD5 02965cb9de4d44841d680156e18c96b2 php-5.0_beta1.ebuild 1177
-MD5 0602426a12c84a98421467bfb8bafab6 ChangeLog 10027
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 4853c60510825040397e1510f17f3077 php-4.3.3-r3.ebuild 1219
-MD5 fb86d5617b1f16c5db4b2d8408f149ba php-4.3.2-r1.ebuild 991
-MD5 641b63b1b80eb8d2cf90d557ee48edaa php-4.3.3.ebuild 1211