[patch] Simple patch that implements the pcre-external use flag for dev-lang/php-5.1.*

pcre-external.patch (text/plain), 3.26 KB, created by Rodrigo Severo on 2006-08-28 14:14:06 UTC

--- /usr/portage/eclass/php5_1-sapi.eclass	2006-08-06 20:05:29.000000000 -0300
+++ /usr/local/portage/eclass/php5_1-sapi.eclass	2006-08-28 18:07:53.000000000 -0300
@@ -38,7 +38,16 @@
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hash hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pdo-external pic posix postgres qdbm readline reflection recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode vm-goto vm-switch wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl
+curlwrappers db2 dbase dbmaker debug doc empress empress-bcs esoob exif
+frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp
+hardenedphp hash hyperwave-api iconv imap informix inifile interbase iodbc ipv6
+java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql
+mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pcre-external pdo 
+pdo-external pic posix postgres qdbm readline reflection recode sapdb sasl 
+session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite 
+ssl sybase sybase-ct sysvipc tidy tokenizer truetype unicode vm-goto vm-switch 
+wddx xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
@@ -77,6 +86,7 @@
 		nls? ( sys-devel/gettext )
 		oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 		odbc? ( >=dev-db/unixODBC-1.8.13 )
+		pcre-external? ( dev-libs/libpcre )
 		postgres? ( >=dev-db/libpq-7.1 )
 		qdbm? ( dev-db/qdbm )
 		readline? ( sys-libs/readline )
@@ -187,6 +197,7 @@
 	# Direct USE conflicts
 	phpconfutils_use_conflict "gd" "gd-external"
 	phpconfutils_use_conflict "oci8" "oci8-instant-client"
+	phpconfutils_use_conflict "pcre" "pcre-external"
 	phpconfutils_use_conflict "pdo" "pdo-external"
 	phpconfutils_use_conflict "qdbm" "gdbm"
 	phpconfutils_use_conflict "readline" "libedit"
@@ -386,7 +397,6 @@
 	phpconfutils_extension_with		"openssl"		"ssl"			0
 	phpconfutils_extension_with		"openssl-dir"	"ssl"			0 "/usr"
 	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
-	phpconfutils_extension_without	"pcre-regex"	"pcre"			0
 	phpconfutils_extension_disable	"pdo"			"pdo"			0
 	phpconfutils_extension_with		"pgsql"			"postgres"		1
 	phpconfutils_extension_disable	"posix"			"posix"			0
@@ -501,6 +511,12 @@
 		phpconfutils_extension_with		"oci8"			"oci8-instant-client"	1	"instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
 	fi
 
+	if useq pcre-external || phpconfutils_usecheck pcre-external ; then
+		phpconfutils_extension_with     "pcre-regex"	"pcre-external"   1 "/usr"
+	else
+		phpconfutils_extension_without	"pcre-regex"	"pcre"			0
+	fi											
+
 	# PDO support
 	if useq pdo || phpconfutils_usecheck pdo ; then
 		phpconfutils_extension_with		"pdo-dblib"		"mssql"			1