big updates

15 files changed, 78 insertions, 1137 deletions

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
 }