[patch] Fix to eclass/php5-sapi.eclas

php5-sapi.eclass-sharedext.patch (text/plain), 5.63 KB, created by Dani Church on 2005-02-23 04:20:47 UTC

--- eclass/php5-sapi.eclass.old	2005-02-23 00:43:29.523687080 -0500
+++ eclass/php5-sapi.eclass	2005-02-23 00:51:54.368938936 -0500
@@ -23,7 +23,7 @@
 LICENSE="PHP-3"
 SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session shared sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
@@ -245,14 +245,14 @@
 	confutils_use_conflict "recode" "mysql" "imap" "nis" #"yaz"
 
 	if ! useq session ; then
-		enable_extension_disable	"session"		"session"		1
+		enable_extension_disable	"session"		"session"		# 1
 	else
 		enable_extension_with		"mm"			"sharedmem"		0
 		enable_extension_with		"msession"		"msession"		1
 	fi
 
 	if ! useq sqlite ; then
-		enable_extension_without	"sqlite"	"sqlite"	0
+		enable_extension_without	"sqlite"	"sqlite"	# 0
 	else
 		enable_extension_enable		"sqlite-utf8"	"nls"	0
 	fi
@@ -357,12 +357,12 @@
 	enable_extension_with		"bz2"			"bzlib"			1
 	enable_extension_enable		"calendar"		"calendar"		1
 	enable_extension_with		"cpdflib"		"cpdflib"		1 # depends on jpeg
-	enable_extension_disable	"ctype"			"ctype"			0
+	enable_extension_disable	"ctype"			"ctype"			# 0
 	enable_extension_with		"curl"			"curl"			1
 	enable_extension_with		"curlwrappers"	"curlwrappers"	1
 	enable_extension_enable		"dbase"			"dbase"			1
 	enable_extension_enable		"dio"			"dio"			1
-	enable_extension_disable	"dom"			"xml2"			0
+	enable_extension_disable	"dom"			"xml3"			# 0
 	enable_extension_enable		"exif"			"exif"			1
 	enable_extension_with		"fam"			"fam"			1
 	enable_extension_with		"fbsql"			"frontbase"		1
@@ -378,7 +378,7 @@
 	enable_extension_with		"interbase"		"interbase"		1
 	# ircg extension not supported on Gentoo at this time
 	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
-	enable_extension_disable	"libxml"		"xml2"			0
+	enable_extension_disable	"libxml"		"xml2"			# 0
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcrypt"		"crypt"			1
 	enable_extension_with		"mcve"			"mcve"			1
@@ -396,28 +396,28 @@
 	enable_extension_with		"openssl-dir"	"ssl"			0 "/usr"
 	enable_extension_with		"ovrimos"		"ovrimos"		1
 	enable_extension_enable		"pcntl" 		"pcntl" 		1
-	enable_extension_without	"pcre-regx"		"pcre"			1
+	enable_extension_without	"pcre-regx"		"pcre"			# 1
 	enable_extension_with		"pfpro"			"pfpro"			1
 	enable_extension_with		"pgsql"			"postgres"		1
-	enable_extension_disable	"posix"			"posix"			1
+	enable_extension_disable	"posix"			"posix"			# 1
 	enable_extension_with		"pspell"		"spell"			1
 	enable_extension_with		"recode"		"recode"		1
-	enable_extension_disable	"simplexml"		"simplexml"		1
+	enable_extension_disable	"simplexml"		"simplexml"		# 1
 	enable_extension_enable		"shmop"			"sharedmem"		0
 	enable_extension_with		"snmp"			"snmp"			1
 	enable_extension_enable		"soap"			"soap"			1
 	enable_extension_enable		"sockets"		"sockets"		1
-	enable_extension_disable	"spl"			"spl"			1
+	enable_extension_disable	"spl"			"spl"			# 1
 	enable_extension_with		"sybase"		"sybase"		1
 	enable_extension_with		"sybase-ct"		"sybase-ct"		1
 	enable_extension_enable		"sysvmsg"		"sysvipc"		1
 	enable_extension_enable		"sysvsem"		"sysvipc"		1
 	enable_extension_enable		"sysvshm"		"sysvipc"		1
 	enable_extension_with		"tidy"			"tidy"			1
-	enable_extension_disable	"tokenizer"		"tokenizer"		1
+	enable_extension_disable	"tokenizer"		"tokenizer"		# 1
 	enable_extension_enable		"wddx"			"wddx"			1
 	enable_extension_with		"xsl"			"xsl"			1
-	#enable_extension_disable	"xml"			"xml2"			1 # PEAR needs --enable-xml
+	#enable_extension_disable	"xml"			"xml2"			# 1 # PEAR needs --enable-xml
 	enable_extension_with		"xmlrpc"		"xmlrpc"		1
 	enable_extension_enable		"yp"			"nis"			1
 	enable_extension_with		"zlib"			"zlib"			1
@@ -448,7 +448,7 @@
 php5-sapi_src_install() {
 	addpredict /usr/share/snmp/mibs/.index
 	
-	useq shared && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
+	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
 	# annoyingly, we have to install the CLI by hand
@@ -474,7 +474,7 @@
 	einfo "Setting correct include_path"
 	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
-	if useq shared; then
+	if useq sharedext; then
 		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;