--- /usr/portage/eclass/php-sapi.eclass	2004-11-02 03:37:25.000000000 +0100
+++ /embedded//usr/portage/eclass/php-sapi.eclass	2004-12-15 02:27:24.379030456 +0100
@@ -424,11 +424,16 @@
 	# These were previously optional, but are now included directly as PEAR needs them.
 	# Zlib is needed for XML
 	myconf="${myconf} --with-zlib=/usr --with-zlib-dir=/usr"
-	LIBS="${LIBS} -lxmlparse -lxmltok"
-	myconf="${myconf} --with-sablot=/usr"
-	myconf="${myconf} --enable-xslt" 
-	myconf="${myconf} --with-xslt-sablot" 
-	myconf="${myconf} --with-xmlrpc"
+
+	if use xml2; then
+		LIBS="${LIBS} -lxmlparse -lxmltok"
+		myconf="${myconf} --with-sablot=/usr"
+		myconf="${myconf} --enable-xslt" 
+		myconf="${myconf} --with-xslt-sablot" 
+		if use xmlrpc; then
+			myconf="${myconf} --with-xmlrpc"
+		fi
+	fi
 	myconf="${myconf} --enable-wddx"
 	myconf="${myconf} --with-xml"
 
@@ -458,10 +463,16 @@
 	myconf="${myconf} --with-mime-magic=/usr/share/misc/file/magic.mime"
 	myconf="${myconf} --enable-sockets"
 	myconf="${myconf} --enable-sysvsem --enable-sysvshm --enable-sysvmsg"
-	myconf="${myconf} --with-iconv"
+	if use xml2; then
+		myconf="${myconf} --with-iconv"
+	fi
 	myconf="${myconf} --enable-shmop"
 	myconf="${myconf} --enable-dio"
-	myconf="${myconf} --enable-yp"
+	if use nis; then
+		myconf="${myconf} --enable-yp"
+	else
+		myconf="${myconf} --disable-yp"
+	fi
 
 	# recode is NOT used as it conflicts with IMAP
 	# iconv is better anyway