--- /usr/portage/eclass/php5_2-sapi.eclass 2009-11-13 17:05:57.000000000 +0100 +++ php5_2-sapi.eclass 2009-11-28 10:37:44.000000000 +0100 @@ -43,7 +43,7 @@ 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 filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode 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 filter firebird flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile interbase iodbc ipv6 java-external json kerberos ldap ldap-sasl libedit mcve mhash msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc pcntl pcre pdo pic posix postgres qdbm readline reflection recode sapdb session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite sqlite3 ssl suhosin sybase sybase-ct sysvipc tidy tokenizer truetype unicode 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 ) @@ -95,6 +95,7 @@ solid? ( >=dev-db/unixODBC-1.8.13 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) ) + sqlite3? ( =dev-db/sqlite-3* ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) @@ -614,6 +615,15 @@ phpconfutils_extension_enable "sqlite-utf8" "unicode" 0 fi + # SQLite 3 support + if ! use sqlite3 && ! phpconfutils_usecheck sqlite3 ; then + phpconfutils_extension_without "sqlite3" "sqlite3" 0 + else + phpconfutils_extension_with "sqlite3" "sqlite3" 0 "/usr" + phpconfutils_extension_enable "sqlite3-utf8" "unicode" 0 + fi + + # Fix ELF-related problems if use pic || phpconfutils_usecheck pic ; then einfo "Enabling PIC support"