big updates

23 files changed, 320 insertions, 1186 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 29fe30645706..f9e578b2aa66 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,7 +1,21 @@
 # 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.86 2003/06/25 05:18:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.87 2003/06/30 10:05:50 robbat2 Exp $
 
+*mod_php-4.3.2-r3 (30 Jun 2003)
+
+  30 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r3.ebuild,
+  files/digest-mod_php-4.3.2-r3:
+  Commited new version to ~x86 with hopefully all of the fixes required for
+  Apache1 and Apache2 required longterm. Uses new PHPSAPI and configuration
+  style. Apache2 enbling variable has CHANGED to PHP4, this is a breakage
+  compared to previously.
+  
+  30 June 2003; 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.ebuild, files/70_mod_php.conf:
+  Updated for new PHPSAPI variable. Moved configuration files to new style
+  cleanly (/etc/php/${PHPSAPI}-php${PHPMAJORVERSION}/php.ini).
+  
   24 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.2.3-r2.ebuild,
   mod_php-4.3.0-r2.ebuild, mod_php-4.3.1-r1.ebuild, mod_php-4.3.1-r2.ebuild,
   mod_php-4.3.1-r3.ebuild, mod_php-4.3.1.ebuild,
@@ -10,7 +24,7 @@
   files/digest-mod_php-4.3.1-r2, files/digest-mod_php-4.3.1-r3:
   Removed old ebuilds as per GLSA 200306-02.
 
-*mod_php-4.3.2-r2 (10 June 2003)
+*mod_php-4.3.2-r2 (10 Jun 2003)
 
   24 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild:
   Fix bug #23200
@@ -29,7 +43,7 @@
   Apache2 ONLY: uses apache2 version (no USE="apache2" needed)
   Apache1 AND Apache2: Use apache1 version unless the USE flag is in place.
 
-*mod_php-4.3.2-r1 (10 June 2003)
+*mod_php-4.3.2-r1 (10 Jun 2003)
 
   10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild:
   Try to fix bug #22352. mod_php is now SLOTed by the major version of Apache
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 5dd80519392b..e7edb33b0e01 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,12 +1,10 @@
-MD5 a32c7501e3740b25ed274fa975ebe098 mod_php-4.3.2-r3.ebuild~ 3546
-MD5 136c8a948544ac163e93e4c45e46092c mod_php-4.3.2.ebuild 2740
-MD5 e0874cf1aa3bf54ffa79c65a8f6e4f25 mod_php-4.3.2-r2.ebuild 3613
-MD5 e0874cf1aa3bf54ffa79c65a8f6e4f25 mod_php-4.3.2-r2.ebuild~ 3613
-MD5 171b138769aa006ffa4393144555cba3 mod_php-4.3.2-r1.ebuild 2676
-MD5 16c901c9b81273c00b5236dee387ad0b ChangeLog 18472
-MD5 a32c7501e3740b25ed274fa975ebe098 mod_php-4.3.2-r3.ebuild 3546
+MD5 75b2655fca588a345ddd693cf40b3218 mod_php-4.3.2.ebuild 3178
+MD5 f389bde39dbbb564cafe6d6373ca7a9e mod_php-4.3.2-r2.ebuild 3667
+MD5 a2abdac0d990f87991007345db84281b mod_php-4.3.2-r1.ebuild 2730
+MD5 76731f74c469016057c2fe2e821bfdb4 ChangeLog 19162
+MD5 eeaf122d117dcf9edb21b4e1270f4b5b mod_php-4.3.2-r3.ebuild 4723
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853
+MD5 b8b9eaba318ccf5b095a857847f00465 files/70_mod_php.conf 1066
 MD5 9eb059611498a51db4d0d4b993ceb7a2 files/digest-mod_php-4.3.2 63
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 9eb059611498a51db4d0d4b993ceb7a2 files/digest-mod_php-4.3.2-r1 63
diff --git a/dev-php/mod_php/files/70_mod_php.conf b/dev-php/mod_php/files/70_mod_php.conf
index 2088bbb78c2b..b06b9cd75742 100644
--- a/dev-php/mod_php/files/70_mod_php.conf
+++ b/dev-php/mod_php/files/70_mod_php.conf
@@ -1,34 +1,39 @@
-<IfDefine PHP>
-  <IfModule !mod_php4.c>
-    LoadModule php4_module    extramodules/libphp4.so
-  </IfModule>
-</IfDefine>
+<IfDefine PHP4>
+    
+    # Load the module first
+    <IfModule !mod_php4.c>
+        LoadModule php4_module    extramodules/libphp4.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-source .phps
+    </IfModule>
+    
+    # Fix some bugs
+    <Files *.php>  
+        LimitRequestBody 524288
+        RequestHeader unset If-Modified-Since
+    </Files>
+    <Files *.php3>  
+        LimitRequestBody 524288
+        RequestHeader unset If-Modified-Since
+    </Files>
+    <Files *.php4>  
+        LimitRequestBody 524288
+        RequestHeader unset If-Modified-Since
+    </Files>
+    <Files *.phps>  
+        LimitRequestBody 524288
+        RequestHeader unset If-Modified-Since
+    </Files>
+    <Files *.phtml>  
+        LimitRequestBody 524288
+        RequestHeader unset If-Modified-Since
+    </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-source .phps
-</IfModule>
-
-<Files *.php>  
-    LimitRequestBody 524288
-    RequestHeader unset If-Modified-Since
-</Files>
-<Files *.php3>  
-    LimitRequestBody 524288
-    RequestHeader unset If-Modified-Since
-</Files>
-<Files *.php4>  
-    LimitRequestBody 524288
-    RequestHeader unset If-Modified-Since
-</Files>
-<Files *.phps>  
-    LimitRequestBody 524288
-    RequestHeader unset If-Modified-Since
-</Files>
-<Files *.phtml>  
-    LimitRequestBody 524288
-    RequestHeader unset If-Modified-Since
-</Files>
+</IfDefine4>
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r3
new file mode 100644
index 000000000000..8271dab4f822
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.2-r3
@@ -0,0 +1 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
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 447d882f6959..ab4ea114b739 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,7 +1,8 @@
 # Copyright 1999-2003 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.1 2003/06/10 19:14:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r1.ebuild,v 1.2 2003/06/30 10:05:50 robbat2 Exp $
 
+use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
 
 IUSE="${IUSE} apache2"
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 3824e860ec1d..05767cdb3c83 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,7 +1,8 @@
 # Copyright 1999-2003 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.4 2003/06/24 22:27:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.5 2003/06/30 10:05:50 robbat2 Exp $
 
+use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
 
 IUSE="${IUSE} apache2"
@@ -111,6 +112,7 @@ apache2msg() {
 }
 
 pkg_postinst() {
+	php_pkg_postinst
 	einfo "To have Apache run php programs, please do the following:"
 	if [ "`use apache2`" ] ; then
 		apache2msg
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
new file mode 100644
index 000000000000..26be1eebf79b
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2003 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.1 2003/06/30 10:05:50 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~arm ~sparc"
+EXCLUDE_DB4_FIX=1
+EXCLUDE_PEAR_FIX=1
+
+DEPEND="${DEPEND}
+	>=net-www/apache-1.3.26-r2
+	apache2? ( >=net-www/apache-2.0.43-r1 ) "
+
+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}"
+
+inherit php eutils
+
+src_unpack() {
+	multiinstwarn
+	detectapache domsg
+	php_src_unpack
+}
+
+src_compile() {
+	#no readline on server SAPI
+	myconf="${myconf} --without-readline"
+
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`apache2 -l |egrep 'worker|prechild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		case "${APACHE2_MPM}" in
+			prefork) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ;;
+		esac;
+	fi
+
+	# optional support for apache2
+	#&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \
+	#|| myconf="${myconf} --with-apxs=/usr/sbin/apxs"
+
+	#use apache2 \
+	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	#php CGI stuff
+	#--enable-discard-path --enable-force-cgi-redirect
+
+	php_src_compile
+}
+
+ 
+src_install() {
+	php_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\""
+	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 copies of mod_php installed. Please look at the autoclean"
+	ewarn "output at the end of the emerge and unmerge all but relevant"
+	ewarn "copies."
+}
+
+pkg_preinst() {
+	multiinstwarn
+	php_pkg_preinst
+	einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change."
+	dosed 's,-D PHP,-D PHP4,' /etc/conf.d/apache2
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	multiinstwarn
+	einfo "To have Apache run php programs, please do the following:"
+	if [ "`use apache2`" ] ; then
+		apache2msg
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
+		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.2.ebuild b/dev-php/mod_php/mod_php-4.3.2.ebuild
index fa21bcbf9457..9a2b9da0f217 100644
--- a/dev-php/mod_php/mod_php-4.3.2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2003 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.4 2003/06/05 20:06:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2.ebuild,v 1.5 2003/06/30 10:05:50 robbat2 Exp $
 
+use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 inherit php eutils
 
 IUSE="${IUSE} apache2"
@@ -18,6 +19,7 @@ DEPEND="${DEPEND}
 	apache2? ( >=net-www/apache-2.0.43-r1 )
 	)"
 
+
 src_compile() {
 	#no readline on server SAPI
 	myconf="${myconf} --without-readline"
@@ -74,7 +76,16 @@ src_install() {
 }
 
 apache2msg() {
-		einfo "Edit /etc/conf.d/apache2 and add \"-D PHP\""
+		ewarn "Edit /etc/conf.d/apache2 and add \"-D PHP4\""
+		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"
+}
+
+pkg_preinst() {
+	php_pkg_preinst
+	einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change."
+	dosed 's,-D PHP,-D PHP4,' /etc/conf.d/apache2
 }
 
 pkg_postinst() {
@@ -84,7 +95,7 @@ pkg_postinst() {
 	else
 		einfo "1. Execute the command:"
 		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
-		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
 		einfo "That will include the php mime types in your configuration"
 		einfo "automagically and setup Apache to load php when it starts."
 	fi
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 5bcd005edfe6..78b742136466 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.50 2003/06/19 03:10:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.51 2003/06/30 10:05:10 robbat2 Exp $
+
+*php-4.3.2-r1 (30 Jun 2003)
+
+  30 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r1.ebuild
+  files/digest-php-4.3.2-r1:
+  Move java stuff to eclass.
+
+  30 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r1.ebuild
+  files/digest-php-4.3.2-r1, php-4.3.2.ebuild, files/digest-php-4.3.2:
+  Move to new PHPSAPI system, and new configuration system.
+ 
+  29 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.0-r3.ebuild
+  php-4.3.0-r4.ebuild php-4.3.1-r1.ebuild php-4.3.1-r2.ebuild php-4.3.1.ebuild
+  files/digest-php-4.3.0-r3 files/digest-php-4.3.0-r4 files/digest-php-4.3.1
+  files/digest-php-4.3.1-r1 files/digest-php-4.3.1-r2:
+  Remove old versions due to GLSA release.
  
 *php-4.3.2 (31 May 2003)
 
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 8232e5dc3f9b..2b7cce10f10e 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,17 +1,6 @@
-MD5 aa14abdac4f22717f18a40946d98625a 1 13284
-MD5 0d1e14b4e015cbd589bc3a7d5886b602 php-4.3.1-r1.ebuild 8142
-MD5 c06db8bbd5bb6030cc4f41c35a7bfc67 php-4.3.0-r4.ebuild 8032
-MD5 cf6ae278f8345d8dbb7173b99c934924 php-4.3.2.ebuild 2449
-MD5 32e507e008f3a07bf40463b7e8b0d1fe php-4.3.0-r3.ebuild 6737
-MD5 8af160385148468e64dcc62efdce0a95 php-4.3.1.ebuild 8500
-MD5 82c31a660af5431b5abd96f70ece4854 php-4.3.1-r2.ebuild 2436
-MD5 fd2e60052c43942c6dfd997f1959d105 ChangeLog 7232
-MD5 c6ec0ca49b4488d7c51035d410938b3e php-4.3.2-r1.ebuild 2535
-MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r3 63
-MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r4 63
-MD5 316366d60770de4c45957483cde50fe8 files/digest-php-4.3.1-r1 63
-MD5 975be13035769ea0b0734d0b108d9479 files/digest-php-4.3.1-r2 126
+MD5 5541cf4177bfcf205012ed0da4cd38c0 php-4.3.2.ebuild 2423
+MD5 85e736aaccfececab5d1cd3dc7e26c01 ChangeLog 7927
+MD5 7588d047b95d706759df29bdafceb4cf php-4.3.2-r1.ebuild 992
 MD5 9eb059611498a51db4d0d4b993ceb7a2 files/digest-php-4.3.2-r1 63
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 316366d60770de4c45957483cde50fe8 files/digest-php-4.3.1 63
 MD5 5123f10b8c04d755f87e65e6aeb66fa2 files/digest-php-4.3.2 126
diff --git a/dev-php/php/files/digest-php-4.3.0-r3 b/dev-php/php/files/digest-php-4.3.0-r3
deleted file mode 100644
index 2902565baab1..000000000000
--- a/dev-php/php/files/digest-php-4.3.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a3e1ad25cc912816c1f958cd4507767 php-4.3.0.tar.bz2 3680957
diff --git a/dev-php/php/files/digest-php-4.3.0-r4 b/dev-php/php/files/digest-php-4.3.0-r4
deleted file mode 100644
index 2902565baab1..000000000000
--- a/dev-php/php/files/digest-php-4.3.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a3e1ad25cc912816c1f958cd4507767 php-4.3.0.tar.bz2 3680957
diff --git a/dev-php/php/files/digest-php-4.3.1 b/dev-php/php/files/digest-php-4.3.1
deleted file mode 100644
index da8da7df7d9d..000000000000
--- a/dev-php/php/files/digest-php-4.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbfe584acb3549c62bb61355165e2ca6 php-4.3.1.tar.bz2 3682417
diff --git a/dev-php/php/files/digest-php-4.3.1-r1 b/dev-php/php/files/digest-php-4.3.1-r1
deleted file mode 100644
index da8da7df7d9d..000000000000
--- a/dev-php/php/files/digest-php-4.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbfe584acb3549c62bb61355165e2ca6 php-4.3.1.tar.bz2 3682417
diff --git a/dev-php/php/files/digest-php-4.3.1-r2 b/dev-php/php/files/digest-php-4.3.1-r2
deleted file mode 100644
index 14e9f6456827..000000000000
--- a/dev-php/php/files/digest-php-4.3.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bbfe584acb3549c62bb61355165e2ca6 php-4.3.1.tar.bz2 3682417
-MD5 be35e7f1f7d84343e94faa88f35a96c6 php-4.3.1-db4.diff.gz 606
diff --git a/dev-php/php/files/digest-php-4.3.2-r1 b/dev-php/php/files/digest-php-4.3.2-r1
new file mode 100644
index 000000000000..8271dab4f822
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.2-r1
@@ -0,0 +1 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
diff --git a/dev-php/php/php-4.3.0-r3.ebuild b/dev-php/php/php-4.3.0-r3.ebuild
deleted file mode 100644
index e3fc5f810a6d..000000000000
--- a/dev-php/php/php-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.0-r3.ebuild,v 1.4 2003/03/06 04:20:59 vapier Exp $
-
-IUSE="truetype postgres tiff libwww nls jpeg readline ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam"
-
-MY_P=php-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="PHP Shell Interpreter"
-SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.php.net/"
-LICENSE="PHP"
-SLOT="0"
-PROVIDE="virtual/php"
-KEYWORDS="x86 ppc sparc"
-
-	# too many users not being able to compile with gmp support
-	# - rphillips
-	# >=dev-libs/gmp-3.1.1
-
-DEPEND="
-	truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	nls? ( sys-devel/gettext )
-	pam? ( >=sys-libs/pam-0.75 )
-	xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	curl? ( >=net-ftp/curl-7.8.1 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	imap? ( >=net-mail/uw-imap-2001a-r1 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	xml2? ( dev-libs/libxml2 )
-	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	freetds? ( >=dev-db/freetds-0.53 )
-	flash? ( media-libs/libswf >=media-libs/ming-0.2a )
-	berkdb? ( >=sys-libs/db-3 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	firebird? ( >=dev-db/firebird-1.0 )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	readline? ( >=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1 )"
-
-#Removed
-#java? ( virtual/jdk )
-
-RDEPEND="
-	xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )
-	qt? ( >=x11-libs/qt-2.3.0 )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	# Configure Patch for wired uname -a
-	mv configure configure.old
-	cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
-	chmod 755 configure
-
-	# fix PEAR installer
-	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-	sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
-
-	# if [ "`use java`" ] ; then
-
-	#	cp configure configure.orig
-	#	cat configure.orig | \
-	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
-	#		> configure
-
-	#	cp ext/gd/gd.c ext/gd/gd.c.orig
-	#	cat ext/gd/gd.c.orig | \
-	#		sed -e "s/typedef FILE gdIOCtx;//" \
-	#		> ext/gd/gd.c
-	#	if [ "$JAVAC" ];
-	#	then
-	#             cp ext/java/Makefile.in ext/java/Makefile.in.orig
-	#              cat ext/java/Makefile.in.orig | \
-	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
-	#                      > ext/java/Makefile.in
-	#	fi
-	# fi
-}
-
-src_compile() {
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
-	use ssl && myconf="${myconf} --with-openssl"
-	use cjk && myconf="${myconf} --enable-mbstring"
-	use curl && myconf="${myconf} --with-curl"
-	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap &&  myconf="${myconf} --with-ldap"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
-	use pdflib && myconf="${myconf} --enable-pdflib=/usr"
-	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib" || myconf="${myconf} --without-jpeg"
-	use tiff && myconf="${myconf} --with-tiff-dir=/usr" || myconf="${myconf} --without-tiff"
-	use png || myconf="${myconf} --without-png"
-
-	# optional support for oracle oci8 
-	if [ "`use oci8`" ] ; then 
-			if [ "$ORACLE_HOME" ] ; then 
-					myconf="${myconf} --with-oci8=${ORACLE_HOME}" 
-			fi 
-	fi 
-	
-	use qt && myconf="${myconf} --with-qtdom"
-
-	if [ "`use imap`" ] ; then
-		if [ "`use ssl`" ] && [ "`strings ${ROOT}/usr/lib/c-client.a \
-					| grep ssl_onceonlyinit`" ] ; then
-			echo "Compiling imap with SSL support"
-			myconf="${myconf} --with-imap --with-imap-ssl"
-		else
-			echo "Compiling imap without SSL support"
-			myconf="${myconf} --with-imap"
-		fi
-	fi
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="${myconf} --enable-xslt" 
-		myconf="${myconf} --with-xslt-sablot=/usr" 
-		myconf="${myconf} --with-xmlrpc"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-	use crypt && myconf="${myconf} --enable-mcrypt=/usr --with-mhash"
-	#use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-		# --with-gmp \
-
-	./configure \
-		--prefix=/usr \
-		--with-bz2 \
-		--enable-ftp \
-		--enable-dbase \
-		--with-zlib=yes \
-		--enable-bcmath \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--with-gd \
-		--enable-sockets \
-		--enable-pcntl \
-		--enable-cli \
-		--disable-cgi \
-		--enable-calendar \
-		--enable-trans-sid \
-		--enable-versioning \
-		--enable-track-vars \
-		--enable-inline-optimization \
-		--with-config-file-path=/etc/php4 \
-		--with-pear \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-
-src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-
-	make INSTALL_ROOT=${D} install-pear install-headers || die
-
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-
-	# php executable is located in ./sapi/cli/
-	cp sapi/cli/php .
-	exeinto /usr/bin
-	doexe php
-
-	insinto /etc/php4
-	mv php.ini-dist php.ini
-	doins php.ini
-	dosym /usr/lib/php/extensions/no-debug-non-zts-20020429 /etc/php4/lib
-
-	#install scripts
-	exeinto /usr/bin
-	doexe ${S}/pear/scripts/phpize
-	doexe ${S}/pear/scripts/php-config
-	doexe ${S}/pear/scripts/phpextdist
-
-	# This fixes the permission from world writeable to the correct one.
-	# - novell@kiruna.se
-}
-
-pkg_postinst() {
-	# This fixes the permission from world writeable to the correct one.
-	# - novell@kiruna.se
-	chmod 755 /usr/bin/pear
-
-	# This is more correct information.
-	einfo 
-	einfo "This is a CLI only build."
-	einfo "You can not use it on a webserver."
-	einfo 
-}
diff --git a/dev-php/php/php-4.3.0-r4.ebuild b/dev-php/php/php-4.3.0-r4.ebuild
deleted file mode 100644
index 852ed478c48f..000000000000
--- a/dev-php/php/php-4.3.0-r4.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.0-r4.ebuild,v 1.5 2003/03/06 04:20:59 vapier Exp $
-
-IUSE="truetype postgres tiff libwww nls jpeg readline ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam"
-
-MY_P=php-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="PHP Shell Interpreter"
-SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.php.net/"
-LICENSE="PHP"
-SLOT="0"
-PROVIDE="virtual/php"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-	# too many users not being able to compile with gmp support
-	# - rphillips
-	# >=dev-libs/gmp-3.1.1
-
-DEPEND="
-	truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	nls? ( sys-devel/gettext )
-	pam? ( >=sys-libs/pam-0.75 )
-	xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	curl? ( >=net-ftp/curl-7.8.1 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	imap? ( >=net-mail/uw-imap-2001a-r1 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	xml2? ( dev-libs/libxml2 )
-	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	freetds? ( >=dev-db/freetds-0.53 )
-	flash? ( media-libs/libswf >=media-libs/ming-0.2a )
-	berkdb? ( >=sys-libs/db-3 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	firebird? ( >=dev-db/firebird-1.0 )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	readline? ( >=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1 )
-	java? ( virtual/jdk )"
-
-#Removed
-#java? ( virtual/jdk )
-
-RDEPEND="
-	xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	java? ( virtual/jdk )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	# Configure Patch for wired uname -a
-	mv configure configure.old
-	cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
-	chmod 755 configure
-
-	# fix PEAR installer
-	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-	sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
-
-	# if [ "`use java`" ] ; then
-
-	#	cp configure configure.orig
-	#	cat configure.orig | \
-	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
-	#		> configure
-
-	#	cp ext/gd/gd.c ext/gd/gd.c.orig
-	#	cat ext/gd/gd.c.orig | \
-	#		sed -e "s/typedef FILE gdIOCtx;//" \
-	#		> ext/gd/gd.c
-	#	if [ "$JAVAC" ];
-	#	then
-	#             cp ext/java/Makefile.in ext/java/Makefile.in.orig
-	#              cat ext/java/Makefile.in.orig | \
-	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
-	#                      > ext/java/Makefile.in
-	#	fi
-	# fi
-}
-
-src_compile() {
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
-	use ssl && myconf="${myconf} --with-openssl"
-	use cjk && myconf="${myconf} --enable-mbstring"
-	use curl && myconf="${myconf} --with-curl"
-	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap &&  myconf="${myconf} --with-ldap"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
-	use pdflib && myconf="${myconf} --enable-pdflib=/usr"
-	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib" || myconf="${myconf} --without-jpeg"
-	use tiff && myconf="${myconf} --with-tiff-dir=/usr" || myconf="${myconf} --without-tiff"
-	use png || myconf="${myconf} --without-png"
-
-	# optional support for oracle oci8 
-	if [ "`use oci8`" ] ; then 
-			if [ "$ORACLE_HOME" ] ; then 
-					myconf="${myconf} --with-oci8=${ORACLE_HOME}" 
-			fi 
-	fi
-
-	use qt && myconf="${myconf} --with-qtdom"
-
-	if [ "`use imap`" ] ; then
-		if [ "`use ssl`" ] && [ "`strings ${ROOT}/usr/lib/c-client.a \
-					| grep ssl_onceonlyinit`" ] ; then
-			echo "Compiling imap with SSL support"
-			myconf="${myconf} --with-imap --with-imap-ssl"
-		else
-			echo "Compiling imap without SSL support"
-			myconf="${myconf} --with-imap"
-		fi
-	fi
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="${myconf} --enable-xslt" 
-		myconf="${myconf} --with-xslt-sablot=/usr" 
-		myconf="${myconf} --with-xmlrpc"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-	use crypt && myconf="${myconf} --enable-mcrypt=/usr --with-mhash"
-	use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-		# --with-gmp \
-
-	./configure \
-		--prefix=/usr \
-		--with-bz2 \
-		--enable-ftp \
-		--enable-dbase \
-		--with-zlib=yes \
-		--enable-bcmath \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--with-gd \
-		--enable-sockets \
-		--enable-pcntl \
-		--enable-cli \
-		--disable-cgi \
-		--enable-calendar \
-		--enable-trans-sid \
-		--enable-versioning \
-		--enable-track-vars \
-		--enable-inline-optimization \
-		--with-config-file-path=/etc/php4 \
-		--with-pear \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-
-src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-
-	make INSTALL_ROOT=${D} install-cli install-pear install-headers install-programs install-modules || die
-
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-
-	# php executable is located in ./sapi/cli/
-	cp sapi/cli/php .
-	exeinto /usr/bin
-	doexe php
-
-	#install scripts
-	exeinto /usr/bin
-	doexe ${S}/pear/scripts/phpize
-	doexe ${S}/pear/scripts/php-config
-	doexe ${S}/pear/scripts/phpextdist
-
-	# Support for Java extension
-	#
-	# 1. install php_java.jar file into /etc/php4/lib directory
-	# 2. edit the php.ini file ready for installation
-	#
-	# - stuart@gnqs.org
-
-	if [ "`use java`" ] ; then
-
-		# we put these into /usr/lib so that they cannot conflict
-		# with other versions of PHP
-
-		insinto /usr/lib/php/extensions/no-debug-non-zts-20020429
-		doins ext/java/php_java.jar
-
-		cp ext/java/except.php java-test.php
-		doins java-test.php
-
-		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's/.\+-DJAVALIB=\"\([^"]*\)\".*$/\1/g;'`"
-		cat php.ini-dist | sed -e "s|;java.library .*$|java.library = $JAVA_LIBRARY|g;" > php.ini-1
-		cat php.ini-1 | sed -e "s|;java.class.path .*$|java.class.path = /etc/php4/lib/php_java.jar|g;" > php.ini-2
-		cat php.ini-2 | sed -e "s|extension_dir .*$|extension_dir = /etc/php4/lib|g;" > php.ini-3
-		cat php.ini-3 | sed -e "s|;extension=php_java.dll.*$|extension = java.so|g;" > php.ini-4
-		cat php.ini-4 | sed -e "s|;java.library.path .*$|java.library.path = /etc/php4/lib/|g;" > php.ini-5
-
-		mv php.ini-5 php.ini
-	else
-		mv php.ini-dist php.ini
-	fi
-
-    insinto /etc/php4
-	doins php.ini
-
-	if [ "`use java`" ]; then
-		# I can't find a way to make these symlinks using dosym
-		# SLH - 20030211
-
-		( cd ${D}/usr/lib/php/extensions/no-debug-non-zts-20020429 ; ln -snf java.so libphp_java.so )
-		( cd ${D}/etc/php4 ; ln -snf ../../usr/lib/php/extensions/no-debug-non-zts-20020429 lib )
-	fi
-
-}
-
-pkg_postinst() {
-	# This fixes the permission from world writeable to the correct one.
-	# - novell@kiruna.se
-	chmod 755 /usr/bin/pear
-
-	# This is more correct information.
-	einfo 
-	einfo "This is a CLI only build."
-	einfo "You can not use it on a webserver."
-	einfo 
-}
diff --git a/dev-php/php/php-4.3.1-r1.ebuild b/dev-php/php/php-4.3.1-r1.ebuild
deleted file mode 100644
index 7f4c3ffcbe42..000000000000
--- a/dev-php/php/php-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1-r1.ebuild,v 1.10 2003/04/24 18:16:09 robbat2 Exp $
-
-IUSE="truetype postgres tiff libwww nls jpeg readline ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam spell"
-
-MY_P=php-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="PHP Shell Interpreter"
-SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.php.net/"
-LICENSE="PHP"
-SLOT="0"
-PROVIDE="virtual/php"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-
-	# too many users not being able to compile with gmp support
-	# - rphillips
-	# >=dev-libs/gmp-3.1.1
-
-DEPEND="
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	nls? ( sys-devel/gettext )
-	pam? ( >=sys-libs/pam-0.75 )
-	png? ( >=media-libs/libpng-1.2.5 )
-	xml? ( >=net-libs/libwww-5.3.2
-		>=app-text/sablotron-0.95-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	curl? ( >=net-ftp/curl-7.9.0 )
-	java? ( virtual/jdk )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	imap? ( >=net-mail/uw-imap-2001a-r1 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	xml2? ( dev-libs/libxml2 )
-	crypt? ( >=dev-libs/libmcrypt-2.4
-		>=app-crypt/mhash-0.8 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	flash? ( media-libs/libswf
-		>=media-libs/ming-0.2a )
-	spell? ( app-text/aspell )
-	berkdb? ( >=sys-libs/db-3 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	freetds? ( >=dev-db/freetds-0.53 )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-	truetype? ( ~media-libs/freetype-1.3.1
-		>=media-libs/t1lib-1.3.1 )
-	firebird? ( >=dev-db/firebird-1.0 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	readline? ( >=sys-libs/ncurses-5.1
-		>=sys-libs/readline-4.1 )"
-
-#Removed
-#java? ( virtual/jdk )
-
-RDEPEND="
-	xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	java? ( virtual/jdk )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	# Configure Patch for wired uname -a
-	mv configure configure.old
-	cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
-	chmod 755 configure
-
-	# fix PEAR installer
-	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-	sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
-
-	# if [ "`use java`" ] ; then
-
-	#	cp configure configure.orig
-	#	cat configure.orig | \
-	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
-	#		> configure
-
-	#	cp ext/gd/gd.c ext/gd/gd.c.orig
-	#	cat ext/gd/gd.c.orig | \
-	#		sed -e "s/typedef FILE gdIOCtx;//" \
-	#		> ext/gd/gd.c
-	#	if [ "$JAVAC" ];
-	#	then
-	#             cp ext/java/Makefile.in ext/java/Makefile.in.orig
-	#              cat ext/java/Makefile.in.orig | \
-	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
-	#                      > ext/java/Makefile.in
-	#	fi
-	# fi
-}
-
-src_compile() {
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
-	use ssl && myconf="${myconf} --with-openssl"
-	use cjk && myconf="${myconf} --enable-mbstring"
-	use curl && myconf="${myconf} --with-curl"
-	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap &&  myconf="${myconf} --with-ldap"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
-	use pdflib && myconf="${myconf} --enable-pdflib=/usr"
-	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib" || myconf="${myconf} --without-jpeg"
-	use tiff && myconf="${myconf} --with-tiff-dir=/usr" || myconf="${myconf} --without-tiff"
-	use png || myconf="${myconf} --without-png"
-	use spell && myconf="${myconf} --with-pspell"
-
-	# optional support for oracle oci8 
-	if [ "`use oci8`" ] ; then 
-			if [ "$ORACLE_HOME" ] ; then 
-					myconf="${myconf} --with-oci8=${ORACLE_HOME}" 
-			fi 
-	fi
-
-	use qt && myconf="${myconf} --with-qtdom" 
-
-	if [ "`use imap`" ] ; then
-		if [ "`use ssl`" ] && [ "`strings ${ROOT}/usr/lib/c-client.a \
-					| grep ssl_onceonlyinit`" ] ; then
-			echo "Compiling imap with SSL support"
-			myconf="${myconf} --with-imap --with-imap-ssl"
-		else
-			echo "Compiling imap without SSL support"
-			myconf="${myconf} --with-imap"
-		fi
-	fi
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="${myconf} --enable-xslt" 
-		myconf="${myconf} --with-xslt-sablot=/usr" 
-		myconf="${myconf} --with-xmlrpc"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-	use crypt && myconf="${myconf} --enable-mcrypt=/usr --with-mhash"
-	use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-		# --with-gmp \
-
-	econf \
-		--with-bz2 \
-		--enable-ftp \
-		--enable-dbase \
-		--with-zlib=yes \
-		--enable-bcmath \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--with-gd \
-		--enable-sockets \
-		--enable-cli \
-		--disable-cgi \
-		--enable-calendar \
-		--enable-trans-sid \
-		--enable-versioning \
-		--enable-track-vars \
-		--enable-inline-optimization \
-		--with-config-file-path=/etc/php4 \
-		--with-pear \
-		--enable-pcntl \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-
-src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-
-	make INSTALL_ROOT=${D} install-cli install-pear install-headers install-programs install-modules install-build || die
-
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-
-	# php executable is located in ./sapi/cli/
-	cp sapi/cli/php .
-	exeinto /usr/bin
-	doexe php
-
-	#install scripts
-	exeinto /usr/bin
-	doexe ${S}/pear/scripts/phpize
-	doexe ${S}/pear/scripts/php-config
-	doexe ${S}/pear/scripts/phpextdist
-
-	# Support for Java extension
-	#
-	# 1. install php_java.jar file into /etc/php4/lib directory
-	# 2. edit the php.ini file ready for installation
-	#
-	# - stuart@gnqs.org
-
-	if [ "`use java`" ] ; then
-
-		# we put these into /usr/lib so that they cannot conflict
-		# with other versions of PHP
-
-		insinto /usr/lib/php/extensions/no-debug-non-zts-20020429
-		doins ext/java/php_java.jar
-
-		cp ext/java/except.php java-test.php
-		doins java-test.php
-
-		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's/.\+-DJAVALIB=\"\([^"]*\)\".*$/\1/g;'`"
-		cat php.ini-dist | sed -e "s|;java.library .*$|java.library = $JAVA_LIBRARY|g;" > php.ini-1
-		cat php.ini-1 | sed -e "s|;java.class.path .*$|java.class.path = /etc/php4/lib/php_java.jar|g;" > php.ini-2
-		cat php.ini-2 | sed -e "s|extension_dir .*$|extension_dir = /etc/php4/lib|g;" > php.ini-3
-		cat php.ini-3 | sed -e "s|;extension=php_java.dll.*$|extension = java.so|g;" > php.ini-4
-		cat php.ini-4 | sed -e "s|;java.library.path .*$|java.library.path = /etc/php4/lib/|g;" > php.ini-5
-
-		mv php.ini-5 php.ini
-	else
-		mv php.ini-dist php.ini
-	fi
-
-    insinto /etc/php4
-	doins php.ini
-
-	if [ "`use java`" ]; then
-		# I can't find a way to make these symlinks using dosym
-		# SLH - 20030211
-
-		( cd ${D}/usr/lib/php/extensions/no-debug-non-zts-20020429 ; ln -snf java.so libphp_java.so )
-		( cd ${D}/etc/php4 ; ln -snf ../../usr/lib/php/extensions/no-debug-non-zts-20020429 lib )
-	fi
-
-}
-
-pkg_postinst() {
-	# This fixes the permission from world writeable to the correct one.
-	# - novell@kiruna.se
-	chmod 755 /usr/bin/pear
-
-	# This is more correct information.
-	einfo 
-	einfo "This is a CLI only build."
-	einfo "You can not use it on a webserver."
-	einfo 
-}
diff --git a/dev-php/php/php-4.3.1-r2.ebuild b/dev-php/php/php-4.3.1-r2.ebuild
deleted file mode 100644
index a81c954cd58b..000000000000
--- a/dev-php/php/php-4.3.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1-r2.ebuild,v 1.4 2003/05/15 21:31:33 robbat2 Exp $
-
-inherit php eutils
-
-IUSE="${IUSE} readline"
-
-DESCRIPTION="PHP Shell Interpreter"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
-
-DEPEND="${DEPEND}
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) "
-
-RDEPEND="${RDEPEND}"
-
-src_compile() {
-	
-	use readline && myconf="${myconf} --with-readline"
-
-	myconf="${myconf} \
-		--disable-cgi \
-		--enable-cli \
-		--enable-pcntl"
-	
-	php_src_compile
-
-}
-
-
-src_install() {
-	installtargets="${installtargets} install-cli"
-	php_src_install
-
-	# php executable is located in ./sapi/cli/
-	cp sapi/cli/php .
-	exeinto /usr/bin
-	doexe php
-
-	# Support for Java extension
-	#
-	# 1. install php_java.jar file into /etc/php4/lib directory
-	# 2. edit the php.ini file ready for installation
-	#
-	# - stuart@gnqs.org
-
-	if [ "`use java`" ] ; then
-
-		# we put these into /usr/lib so that they cannot conflict
-		# with other versions of PHP
-
-		insinto /usr/lib/php/extensions/no-debug-non-zts-20020429
-		doins ext/java/php_java.jar
-
-		cp ext/java/except.php java-test.php
-		doins java-test.php
-
-		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's/.\+-DJAVALIB=\"\([^"]*\)\".*$/\1/g;'`"
-		cat php.ini-dist | sed -e "s|;java.library .*$|java.library = $JAVA_LIBRARY|g;" > php.ini-1
-		cat php.ini-1 | sed -e "s|;java.class.path .*$|java.class.path = /etc/php4/lib/php_java.jar|g;" > php.ini-2
-		cat php.ini-2 | sed -e "s|extension_dir .*$|extension_dir = /etc/php4/lib|g;" > php.ini-3
-		cat php.ini-3 | sed -e "s|;extension=php_java.dll.*$|extension = java.so|g;" > php.ini-4
-		cat php.ini-4 | sed -e "s|;java.library.path .*$|java.library.path = /etc/php4/lib/|g;" > php.ini-5
-
-		mv php.ini-5 php.ini
-	else
-		mv php.ini-dist php.ini
-	fi
-
-    insinto /etc/php4
-	doins php.ini
-
-	if [ "`use java`" ]; then
-		# I can't find a way to make these symlinks using dosym
-		# SLH - 20030211
-		( cd ${D}/usr/lib/php/extensions/no-debug-non-zts-20020429 ; ln -snf java.so libphp_java.so )
-		( cd ${D}/etc/php4 ; ln -snf ../../usr/lib/php/extensions/no-debug-non-zts-20020429 lib )
-	fi
-
-}
-
-pkg_postinst() {
-	# This is more correct information.
-	einfo 
-	einfo "This is a CLI only build."
-	einfo "You can not use it on a webserver."
-	einfo 
-}
diff --git a/dev-php/php/php-4.3.1.ebuild b/dev-php/php/php-4.3.1.ebuild
deleted file mode 100644
index a95c0a262e2b..000000000000
--- a/dev-php/php/php-4.3.1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.1.ebuild,v 1.10 2003/06/02 20:12:18 robbat2 Exp $
-
-IUSE="truetype postgres tiff libwww nls jpeg readline ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam spell"
-
-MY_P=php-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="PHP Shell Interpreter"
-SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.php.net/"
-LICENSE="PHP"
-SLOT="0"
-PROVIDE="virtual/php"
-KEYWORDS="x86 ppc sparc"
-
-	# too many users not being able to compile with gmp support
-	# - rphillips
-	# >=dev-libs/gmp-3.1.1
-
-DEPEND="
-	truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	X? ( virtual/x11 )
-	qt? ( x11-libs/qt )
-	nls? ( sys-devel/gettext )
-	pam? ( >=sys-libs/pam-0.75 )
-	xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.95-r1 )
-	ssl? ( >=dev-libs/openssl-0.9.5 )
-	curl? ( >=net-ftp/curl-7.8.1 )
-	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-	imap? ( >=net-mail/uw-imap-2001a-r1 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	xml2? ( dev-libs/libxml2 )
-	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	flash? ( media-libs/libswf >=media-libs/ming-0.2a )
-	spell? ( app-text/aspell )
-	berkdb? ( >=sys-libs/db-3 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-	freetds? ( >=dev-db/freetds-0.53 )
-	firebird? ( >=dev-db/firebird-1.0 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	readline? ( >=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1 )
-	java? ( =virtual/jdk-1.4* dev-java/java-config )"
-
-#Removed
-#java? ( virtual/jdk )
-
-RDEPEND="
-	xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	java? ( =virtual/jdk-1.4* )"
-
-php_check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	# Configure Patch for wired uname -a
-	mv configure configure.old
-	cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
-	chmod 755 configure
-
-	# fix PEAR installer
-	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-	sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
-
-	# if [ "`use java`" ] ; then
-
-	#	cp configure configure.orig
-	#	cat configure.orig | \
-	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
-	#		> configure
-
-	#	cp ext/gd/gd.c ext/gd/gd.c.orig
-	#	cat ext/gd/gd.c.orig | \
-	#		sed -e "s/typedef FILE gdIOCtx;//" \
-	#		> ext/gd/gd.c
-	#	if [ "$JAVAC" ];
-	#	then
-	#             cp ext/java/Makefile.in ext/java/Makefile.in.orig
-	#              cat ext/java/Makefile.in.orig | \
-	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
-	#                      > ext/java/Makefile.in
-	#	fi
-	# fi
-}
-
-src_compile() {
-
-	use java && php_check_java_config
-
-	local myconf
-
-	use readline && myconf="${myconf} --with-readline"
-	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
-	use ssl && myconf="${myconf} --with-openssl"
-	use cjk && myconf="${myconf} --enable-mbstring"
-	use curl && myconf="${myconf} --with-curl"
-	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use ldap &&  myconf="${myconf} --with-ldap"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
-	use pdflib && myconf="${myconf} --enable-pdflib=/usr"
-	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib" || myconf="${myconf} --without-jpeg"
-	use tiff && myconf="${myconf} --with-tiff-dir=/usr" || myconf="${myconf} --without-tiff"
-	use png || myconf="${myconf} --without-png"
-	use spell && myconf="${myconf} --with-pspell"
-
-	# optional support for oracle oci8 
-	if [ "`use oci8`" ] ; then 
-			if [ "$ORACLE_HOME" ] ; then 
-					myconf="${myconf} --with-oci8=${ORACLE_HOME}" 
-			fi 
-	fi 
-
-	use qt && myconf="${myconf} --with-qtdom"
-
-	if [ "`use imap`" ] ; then
-		if [ "`use ssl`" ] && [ "`strings ${ROOT}/usr/lib/c-client.a \
-					| grep ssl_onceonlyinit`" ] ; then
-			echo "Compiling imap with SSL support"
-			myconf="${myconf} --with-imap --with-imap-ssl"
-		else
-			echo "Compiling imap without SSL support"
-			myconf="${myconf} --with-imap"
-		fi
-	fi
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="${myconf} --enable-xslt" 
-		myconf="${myconf} --with-xslt-sablot=/usr" 
-		myconf="${myconf} --with-xmlrpc"
-	fi
-
-	use xml2 && myconf="${myconf} --with-dom"
-	use crypt && myconf="${myconf} --enable-mcrypt=/usr --with-mhash"
-	use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-		# --with-gmp \
-
-	econf \
-		--with-bz2 \
-		--enable-ftp \
-		--enable-dbase \
-		--with-zlib=yes \
-		--enable-bcmath \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--with-gd \
-		--enable-sockets \
-		--enable-cli \
-		--disable-cgi \
-		--enable-calendar \
-		--enable-trans-sid \
-		--enable-versioning \
-		--enable-track-vars \
-		--enable-inline-optimization \
-		--with-config-file-path=/etc/php4 \
-		--with-pear \
-		--enable-pcntl \
-		${myconf} || die "bad ./configure"
-	# this b0rks user's machines, so until we can assure this flag is stable,
-	# I'm disabling it -- seemant (march 3 2003)
-
-	make || die "compile problem"
-}
-
-
-src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-
-	make INSTALL_ROOT=${D} install-cli install-pear install-headers install-programs install-modules || die
-
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-
-	# php executable is located in ./sapi/cli/
-	cp sapi/cli/php .
-	exeinto /usr/bin
-	doexe php
-
-	#install scripts
-	exeinto /usr/bin
-	doexe ${S}/pear/scripts/phpize
-	doexe ${S}/pear/scripts/php-config
-	doexe ${S}/pear/scripts/phpextdist
-
-	# Support for Java extension
-	#
-	# 1. install php_java.jar file into /etc/php4/lib directory
-	# 2. edit the php.ini file ready for installation
-	#
-	# - stuart@gnqs.org
-
-	if [ "`use java`" ] ; then
-
-		# we put these into /usr/lib so that they cannot conflict
-		# with other versions of PHP
-
-		insinto /usr/lib/php/extensions/no-debug-non-zts-20020429
-		doins ext/java/php_java.jar
-
-		cp ext/java/except.php java-test.php
-		doins java-test.php
-
-		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's/.\+-DJAVALIB=\"\([^"]*\)\".*$/\1/g;'`"
-		cat php.ini-dist | sed -e "s|;java.library .*$|java.library = $JAVA_LIBRARY|g;" > php.ini-1
-		cat php.ini-1 | sed -e "s|;java.class.path .*$|java.class.path = /etc/php4/lib/php_java.jar|g;" > php.ini-2
-		cat php.ini-2 | sed -e "s|extension_dir .*$|extension_dir = /etc/php4/lib|g;" > php.ini-3
-		cat php.ini-3 | sed -e "s|;extension=php_java.dll.*$|extension = java.so|g;" > php.ini-4
-		cat php.ini-4 | sed -e "s|;java.library.path .*$|java.library.path = /etc/php4/lib/|g;" > php.ini-5
-
-		mv php.ini-5 php.ini
-	else
-		mv php.ini-dist php.ini
-	fi
-
-    insinto /etc/php4
-	doins php.ini
-
-	if [ "`use java`" ]; then
-		# I can't find a way to make these symlinks using dosym
-		# SLH - 20030211
-
-		( cd ${D}/usr/lib/php/extensions/no-debug-non-zts-20020429 ; ln -snf java.so libphp_java.so )
-		( cd ${D}/etc/php4 ; ln -snf ../../usr/lib/php/extensions/no-debug-non-zts-20020429 lib )
-	fi
-
-}
-
-pkg_postinst() {
-	# This fixes the permission from world writeable to the correct one.
-	# - novell@kiruna.se
-	chmod 755 /usr/bin/pear
-
-	# This is more correct information.
-	einfo 
-	einfo "This is a CLI only build."
-	einfo "You can not use it on a webserver."
-	einfo 
-}
diff --git a/dev-php/php/php-4.3.2-r1.ebuild b/dev-php/php/php-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..e67441b43842
--- /dev/null
+++ b/dev-php/php/php-4.3.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2-r1.ebuild,v 1.1 2003/06/30 10:05:11 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php eutils
+
+IUSE="${IUSE} readline"
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+DEPEND="${DEPEND}
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) "
+
+RDEPEND="${RDEPEND}"
+
+EXCLUDE_DB4_FIX=1
+EXCLUDE_PEAR_FIX=1
+
+src_compile() {
+	
+	use readline && myconf="${myconf} --with-readline"
+
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+	
+	php_src_compile
+
+}
+
+
+src_install() {
+	installtargets="${installtargets} install-cli"
+	php_src_install
+
+	# php executable is located in ./sapi/cli/
+	exeinto /usr/bin
+	doexe sapi/cli/php
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You can not use it on a webserver."
+}
+pkg_preinst() {
+	php_pkg_preinst
+}
diff --git a/dev-php/php/php-4.3.2.ebuild b/dev-php/php/php-4.3.2.ebuild
index 596f431d9617..6df495f755de 100644
--- a/dev-php/php/php-4.3.2.ebuild
+++ b/dev-php/php/php-4.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Update: Roman Weber <gentoo@gonzo.ch>
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2.ebuild,v 1.3 2003/06/19 03:10:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2.ebuild,v 1.4 2003/06/30 10:05:11 robbat2 Exp $
 
+PHPSAPI="cli"
 inherit php eutils
 
 IUSE="${IUSE} readline"
@@ -84,9 +84,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	# This is more correct information.
-	einfo 
+	php_pkg_postinst
 	einfo "This is a CLI only build."
 	einfo "You can not use it on a webserver."
-	einfo 
+}
+pkg_preinst() {
+	php_pkg_preinst
 }