--- php5-sapi.eclass.orig	2004-07-22 11:05:40.000000000 +0200
+++ php5-sapi.eclass.orig	2004-07-22 19:07:47.969339864 +0200
@@ -46,6 +46,7 @@ 
 	ming? ( media-libs/ming )
 	mssql? ( dev-db/freetds )
 	mysql? ( >=dev-db/mysql-3.23.26 )
+	mysqli? ( >=dev-db/mysql-4.1.2 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
@@ -98,16 +99,6 @@ 
 
 php5-sapi_check_awkward_uses () {
 
-	# mysqli support isn't possible yet
-
-	if useq mysqli ; then
-		eerror
-		eerror "We currently do not support the mysqli extension"
-		eerror "Support will be added once MySQL 4.1 has been added to Portage"
-		eerror
-		die "mysqli not supported yet"
-	fi
-
 	# recode not available; upstream bug
 
 	if useq recode ; then
@@ -191,9 +182,11 @@ 
 	fi
 
 	if useq mysql ; then
-		enable_extension_with		"mysql"			"mysql"			1
-	else
-		enable_extension_with		"mysqli"		"mysqli"			1
+		enable_extension_with		"mysql=/usr"	"mysql"			1
+	fi
+
+	if useq mysqli ; then
+		enable_extension_with		"mysqli"		"mysqli"		1
 	fi
 
 	confutils_use_conflict "readline" "libedit"
@@ -228,9 +221,6 @@ 
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
-	# mysql support
-	confutils_use_conflict "mysqli" "mysql"
-
 	# odbc support
 	confutils_use_depend_all "adabas"		"odbc"
 	confutils_use_depend_all "birdstep"		"odbc"
@@ -412,3 +402,7 @@ 
 		rm -rf ${D}/usr/share/man/man1/php.1*
 	fi
 }
+
+php5-sapi_pkg_preinst () {
+	#Nothing to do yet
+}