Index: eclass/php.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/php.eclass,v
--- eclass/php.eclass	24 May 2003 13:36:47 -0000	1.23
+++ eclass/php.eclass	24 May 2003 20:51:51 -0000
@@ -188,7 +188,14 @@ 
 
 	[ -x "/usr/sbin/sendmail" ] || die "You need a virtual/mta that provides /usr/sbin/sendmail!"
 
-	use berkdb && myconf="${myconf} --with-db3=/usr"
+	#Hack to use db4
+	if has_version =sys-libs/db-4* && grep -q "\--with-db4" configure; then
+		einfo "enabling db4"
+		use berkdb && myconf="${myconf} --with-db4=/usr"
+	else
+		use berkdb && myconf="${myconf} --with-db3=/usr"
+	fi
+
 	use cjk && myconf="${myconf} --enable-mbstring --enable-mbregex"
 	use crypt && myconf="${myconf} --with-mcrypt=/usr --with-mhash"
 	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
Index: dev-php/mod_php/mod_php-4.3.1-r3.ebuild
===================================================================
RCS file: /home/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r3.ebuild,v
--- dev-php/mod_php/mod_php-4.3.1-r3.ebuild	14 May 2003 20:08:59 -0000	1.8
+++ dev-php/mod_php/mod_php-4.3.1-r3.ebuild	24 May 2003 20:51:51 -0000
@@ -16,6 +16,13 @@ 
 		>=net-www/apache-1.3.26-r2
 	)"
 
+src_unpack() {
+	php_src_unpack
+	epatch ${FILESDIR}/php-${PV}-db4.diff
+	cd ${S}
+	autoconf
+}
+
 src_compile() {
 	#no readline on server SAPI
 	myconf="${myconf} --without-readline "
Index: dev-php/mod_php/files/php-4.3.1-db4.diff
===================================================================
RCS file: dev-php/mod_php/files/php-4.3.1-db4.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dev-php/mod_php/files/php-4.3.1-db4.diff	24 May 2003 20:51:51 -0000
@@ -0,0 +1,51 @@ 
+--- ext/dba/config.m4.orig	2003-05-24 19:47:25.000000000 +0000
@@ -16,6 +16,13 @@ 
 
 RDEPEND="${RDEPEND}"
 
+src_unpack() {
+	php_src_unpack
+	epatch ${FILESDIR}/php-${PV}-db4.diff
+	cd ${S}
+	autoconf
+}
+
 src_compile() {
 	
 	use readline && myconf="${myconf} --with-readline"
Index: dev-php/php/files/php-4.3.1-db4.diff
===================================================================
RCS file: dev-php/php/files/php-4.3.1-db4.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ dev-php/php/files/php-4.3.1-db4.diff	24 May 2003 20:51:51 -0000