Converted phpconfutils_extension_* to use_*

2 files changed, 120 insertions, 98 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f0289f889ad1..74be76920298 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,6 +15,7 @@ AUX eblits/src_configure-snapshots.eblit 10639 RMD160 b46a407286aa32077662fa4f75
 AUX eblits/src_configure-v1.eblit 10979 RMD160 c20ce6476380cf1b355f1c957f8e0bfdf166e220 SHA1 bd2f51283e01bf838bbb1946a9879ac337c6e90c SHA256 dc769b7c5846248fdd5d1a930a3e9b614d550bfcc78f09ecd1c08607796f0206
 AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a
 AUX eblits/src_configure-v3.eblit 9393 RMD160 a2ed939df5ac9051dc3dcccd7c43732fb2c02db3 SHA1 6bddcaab3506ea781f1324f9025ab8ede5c427df SHA256 df8aff916e7c9b41e7f2504de7b48734df520d59746ce891b1dc89685b8404d3
+AUX eblits/src_configure-v4.eblit 6507 RMD160 d4ea143a2bd32b57d204d49fd96918c85ed1ae15 SHA1 f6e5133ebf898a78f80d0e61b1b30f8ada5916ba SHA256 3bdaebcbe000a9a00eb9ae1686bce8a9e1c6bed2a3bc2ca67e553c8d17245091
 AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d
 AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedffed2 SHA1 36ab2648abaae12d1a86c97db82cd2ea86497b2d SHA256 3bddd375764b0ed00cb30e65036c67f96c56ea0ebfd70bcdc61b7465d1500d36
 AUX eblits/src_install-v2.eblit 5302 RMD160 a6e89565235f6baf14ee38326f94a0ed39f54183 SHA1 83b461036b1fd7170e3966399f4110a2e9363f41 SHA256 466e7350126a2c27814c693c7c7fcc45ee53eb4d267846d5b27a02c377b5407d
@@ -48,6 +49,6 @@ EBUILD php-5.2.17.ebuild 9485 RMD160 3c6079bff58c1cb97302a03a207dfe1d0ad5a64f SH
 EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d SHA1 ccdd5c0fdcd169b4819d924ff0f5f5a6caaf934b SHA256 97ffbe697c6d607b748b89044baed1b4a91fc7a09790d0abfce6acc47ca45703
 EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
 EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
-EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68
+EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 41d5518f92072a5bb7d86096c4ab6474f9792988 SHA1 97160414531295c55dc3b5db7c28fffe3bf15e97 SHA256 eef2b837466bacef9e64155628098fd5ab0e1ae252f569400715274674b0e997
 MISC ChangeLog 85731 RMD160 33a7efcce5962eb68b9cd6bf9e1f787bef6bf939 SHA1 5558e3b63e95d3903e0cafee29fba1ebf7a18c42 SHA256 06297e9560f4d09f563cab3c527393cb90f01be98d98c91cb94982a77142f226
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
diff --git a/dev-lang/php/files/eblits/src_configure-v3.eblit b/dev-lang/php/files/eblits/src_configure-v3.eblit
index 7765c58a3982..c99ed8888f68 100644
--- a/dev-lang/php/files/eblits/src_configure-v3.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v3.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.3 2011/07/02 15:14:41 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.4 2011/08/22 13:32:38 olemarkus Exp $
 
 eblit-php-src_configure() {
     addpredict /usr/share/snmp/mibs/.index
@@ -20,62 +20,63 @@ eblit-php-src_configure() {
 		$(use_enable threads maintainer-zts)"
 
 	#                             extension	      USE flag        shared
-	phpconfutils_extension_enable  "bcmath"       "bcmath"           1
-	phpconfutils_extension_with    "bz2"          "bzip2"            1
-	phpconfutils_extension_enable  "calendar"     "calendar"         1
-	phpconfutils_extension_disable "ctype"        "ctype"            0
-	phpconfutils_extension_with    "curl"         "curl"             1
-	phpconfutils_extension_with    "curlwrappers" "curlwrappers"     0
-	phpconfutils_extension_disable "dom"          "xml"              0
-	phpconfutils_extension_with    "enchant"      "enchant"          1 "/usr"
-	phpconfutils_extension_enable  "exif"         "exif"             1
-	phpconfutils_extension_disable "fileinfo"     "fileinfo"         1
-	phpconfutils_extension_disable "filter"       "filter"           0
-	phpconfutils_extension_enable  "ftp"          "ftp"              1
-	phpconfutils_extension_with    "gettext"      "nls"              1
-	phpconfutils_extension_with    "gmp"          "gmp"              1
-	phpconfutils_extension_disable "hash"         "hash"             0
-	phpconfutils_extension_with    "mhash"        "mhash"            0
-	phpconfutils_extension_without "iconv"        "iconv"            0
-	phpconfutils_extension_enable  "intl"         "intl"             1
-	phpconfutils_extension_disable "ipv6"         "ipv6"             0
-	phpconfutils_extension_disable "json"         "json"             0
-	phpconfutils_extension_with    "kerberos"     "kerberos"         0 "/usr"
-	phpconfutils_extension_disable "libxml"       "xml"              0
-	phpconfutils_extension_enable  "mbstring"     "unicode"          1
-	phpconfutils_extension_with    "mcrypt"       "crypt"            1
-	phpconfutils_extension_with    "mssql"        "mssql"            1
-	phpconfutils_extension_with    "onig"         "unicode"          0 "/usr"
-	phpconfutils_extension_with    "openssl"      "ssl"              0
-	phpconfutils_extension_with    "openssl-dir"  "ssl"              0 "/usr"
-	phpconfutils_extension_enable  "pcntl"        "pcntl"            1
-	phpconfutils_extension_disable "phar"         "phar"             1
-	phpconfutils_extension_disable "pdo"          "pdo"              0
-	phpconfutils_extension_with    "pgsql"        "postgres"         1
-	phpconfutils_extension_disable "posix"        "posix"            0
-	phpconfutils_extension_with    "pspell"       "spell"            1
-	phpconfutils_extension_with    "recode"       "recode"           1
-	phpconfutils_extension_disable "simplexml"    "simplexml"        0
-	phpconfutils_extension_enable  "shmop"        "sharedmem"        0
-	phpconfutils_extension_with    "snmp"         "snmp"             1
-	phpconfutils_extension_enable  "soap"         "soap"             1
-	phpconfutils_extension_enable  "sockets"      "sockets"          1
-	phpconfutils_extension_without "sqlite3"      "sqlite3"          1 "/usr"
-	phpconfutils_extension_with    "sybase-ct"    "sybase-ct"        1 "/usr"
-	phpconfutils_extension_enable  "sysvmsg"      "sysvipc"          1
-	phpconfutils_extension_enable  "sysvsem"      "sysvipc"          1
-	phpconfutils_extension_enable  "sysvshm"      "sysvipc"          1
-	phpconfutils_extension_with    "tidy"         "tidy"             1
-	phpconfutils_extension_disable "tokenizer"    "tokenizer"        0
-	phpconfutils_extension_enable  "wddx"         "wddx"             1
-	phpconfutils_extension_disable "xml"          "xml"              0
-	phpconfutils_extension_disable "xmlreader"    "xmlreader"        0
-	phpconfutils_extension_disable "xmlwriter"    "xmlwriter"        0
-	phpconfutils_extension_with    "xmlrpc"       "xmlrpc"           1
-	phpconfutils_extension_with    "xsl"          "xsl"              1
-	phpconfutils_extension_enable  "zip"          "zip"              1
-	phpconfutils_extension_with    "zlib"         "zlib"             1
-	phpconfutils_extension_enable  "debug"        "debug"            0
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 )
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl )
+	$(use_with curlwrappers curlwrappers )
+	$(use_enable xml dom )
+	$(use_with enchant enchant /usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext )
+	$(use_with gmp gmp )
+	$(use_enable hash hash )
+	$(use_with mhash mhash )
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos /usr)
+	$(use_enable xml libxml )
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt )
+	$(use_with mssql mssql )
+	$(use_with unicode onig /usr)
+	$(use_with ssl openssl )
+	$(use_with ssl openssl-dir /usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql )
+	$(use_enable posix posix )
+	$(use_with spell pspell )
+	$(use_with recode recode )
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp )
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite3 sqlite3 /usr)
+	$(use_with sybase-ct sybase-ct /usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy )
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc )
+	$(use_with xsl xsl )
+	$(use_enable zip zip )
+	$(use_with zlib zlib )
+	$(use_enable debug debug )"
 
 	# DBA support
 	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
@@ -84,65 +85,78 @@ eblit-php-src_configure() {
 	fi
 
 	# DBA drivers support
-	phpconfutils_extension_with   "cdb"        "cdb"      0
-	phpconfutils_extension_with   "db4"        "berkdb"   0
-	phpconfutils_extension_enable "flatfile"   "flatfile" 0
-	phpconfutils_extension_with   "gdbm"       "gdbm"     0
-	phpconfutils_extension_enable "inifile"    "inifile"  0
-	phpconfutils_extension_with   "qdbm"       "qdbm"     0
+	my_conf+="
+	$(use_with cdb cdb )
+	$(use_with berkdb db4 )
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm )
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm )"
 
 	# Support for the GD graphics library
-	phpconfutils_extension_with   "freetype-dir" "truetype"    0 "/usr"
-	phpconfutils_extension_with   "t1lib"        "truetype"    0 "/usr"
-	phpconfutils_extension_enable "gd-jis-conv"  "cjk"         0
-	phpconfutils_extension_with   "jpeg-dir"     "gd"          0 "/usr"
-	phpconfutils_extension_with   "png-dir"      "gd"          0 "/usr"
-	phpconfutils_extension_with   "xpm-dir"      "xpm"         0 "/usr"
+	my_conf+="
+	$(use_with truetype freetype-dir /usr)
+	$(use_with truetype t1lib /usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir /usr)
+	$(use_with gd png-dir /usr)
+	$(use_with xpm xpm-dir /usr)"
 	# enable gd last, so configure can pick up the previous settings
-	phpconfutils_extension_with   "gd"           "gd"          0
+	my_conf+="
+	$(use_with gd gd )"
 
 	# IMAP support
 	if use imap ; then
-		phpconfutils_extension_with "imap"     "imap" 1
-		phpconfutils_extension_with "imap-ssl" "ssl"  0
+	    my_conf+="
+		$(use_with imap imap )
+		$(use_with ssl imap-ssl )"
 	fi
 
 	# Interbase/firebird support
 	
 	if use firebird ; then
-		phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	    my_conf+="
+		$(use_with firebird interbase /usr)"
 	fi
 
 	# LDAP support
 	if use ldap ; then
-		phpconfutils_extension_with "ldap"      "ldap"      1
-		phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
+	    my_conf+="
+		$(use_with ldap ldap )
+		$(use_with ldap-sasl ldap-sasl )"
 	fi
 
 	# MySQL support
 	if use mysql ; then
 		if use mysqlnd ; then
-			phpconfutils_extension_with "mysql"      "mysql" 1 "mysqlnd"
+	        my_conf+="
+			$(use_with mysql mysql mysqlnd)"
 		else
-			phpconfutils_extension_with "mysql"      "mysql" 1 "/usr"
+	        my_conf+="
+			$(use_with mysql mysql /usr)"
 		fi
-		phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
+	    my_conf+="
+		$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
 	fi
 
 	# MySQLi support
 	if use mysqlnd ; then
-		phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd"
+	    my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
 	else
-		phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
+	    my_conf+="
+		$(use_with mysqli mysqli /usr/bin/mysql_config)"
 	fi
 
 	# ODBC support
 	if use odbc ; then
-		phpconfutils_extension_with "unixODBC" "odbc"     1 "/usr"
+	    my_conf+="
+		$(use_with odbc unixODBC /usr)"
 	fi
 
 	if use iodbc ; then
-		phpconfutils_extension_with "iodbc"   "iodbc" 1 "/usr"
+	    my_conf+="
+		$(use_with iodbc iodbc /usr)"
 	fi
 
 	# Oracle support
@@ -150,37 +164,44 @@ eblit-php-src_configure() {
 		OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
 			sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
 			sed -e 's|-r.*||g')"
-
-		phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
-			"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
+    
+	    my_conf+="
+		$(use_with oci8-instant-client oci8 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib")"
 	fi
 
 	# PDO support
 	if use pdo ; then
-		phpconfutils_extension_with "pdo-dblib"  "mssql"    1
+	    my_conf+="
+		$(use_with mssql pdo-dblib )"
 		if use mysqlnd ; then
-			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "mysqlnd"
+	        my_conf+="
+			$(use_with mysql pdo-mysql mysqlnd)"
 		else
-			phpconfutils_extension_with "pdo-mysql"  "mysql"    1 "/usr"
+	        my_conf+="
+			$(use_with mysql pdo-mysql /usr)"
 		fi
-		phpconfutils_extension_with "pdo-pgsql"  "postgres"	1
-		phpconfutils_extension_with "pdo-sqlite" "sqlite3"   1 "/usr"
-		phpconfutils_extension_with "pdo-odbc"   "odbc"     1 "unixODBC,/usr"
+	    my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite3 pdo-sqlite /usr)
+		$(use_with odbc pdo-odbc unixODBC,/usr)"
 		if use oci8-instant-client ; then
-			phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
-				"instantclient,/usr,${OCI8IC_PKG}"
+	        my_conf+="
+			$(use_with oci8-instant-client pdo-oci "instantclient,/usr,${OCI8IC_PKG}" )"
 		fi
 	fi
 
 	# readline/libedit support
-	phpconfutils_extension_with "readline" "readline" 0
-	phpconfutils_extension_with "libedit"  "libedit"  0
+	my_conf+="
+	$(use_with readline readline )
+	$(use_with libedit libedit )"
 
 	# Session support
 	if use session ; then
-		phpconfutils_extension_with "mm" "sharedmem" 0
+	    my_conf+="
+		$(use_with sharedmem mm )"
 	else
-		phpconfutils_extension_disable "session" "session" 0
+	    my_conf+="
+		$(use_enable session session )"
 	fi
 
 	if use pic ; then