Add the pdo-odbc USE flag.

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index c05a42478808f9c88c23648b2394fa816571e57f..662f6b66fd512cc549933031ae603c6c5ed09435 100644 (file)
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -19,6 +19,7 @@
                <flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
                <flag name='pdo'>Enable the bundled PDO extensions</flag>
                <flag name='pdo-dblib'>Enable the DBLIB (MSSQL) PDO driver</flag>
                <flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
                <flag name='pdo'>Enable the bundled PDO extensions</flag>
                <flag name='pdo-dblib'>Enable the DBLIB (MSSQL) PDO driver</flag>

+               <flag name='pdo-odbc'>Enable the ODBC PDO driver</flag>

                <flag name='pdo-pgsql'>Enable the PostgreSQL PDO driver</flag>
                <flag name='pdo-sqlite'>Enable the SQLite PDO driver</flag>
                <flag name='phar'>Enables the phar extension to provide phar archive support</flag>
                <flag name='pdo-pgsql'>Enable the PostgreSQL PDO driver</flag>
                <flag name='pdo-sqlite'>Enable the SQLite PDO driver</flag>
                <flag name='phar'>Enables the phar extension to provide phar archive support</flag>

diff --git a/dev-lang/php/php-5.6.4-r1.ebuild b/dev-lang/php/php-5.6.4-r1.ebuild
index ee5945936a8d34751e4eab0ec54d81dd21fbcbbb..1f6d8e35b74e8e0d038c0255b241cdcc8846eafc 100644 (file)
--- a/dev-lang/php/php-5.6.4-r1.ebuild
+++ b/dev-lang/php/php-5.6.4-r1.ebuild
@@ -69,9 +69,9 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
        flatfile ftp gd gdbm gmp +hash +iconv imap inifile
        intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
        mssql mysql libmysqlclient mysqli nls
        flatfile ftp gd gdbm gmp +hash +iconv imap inifile
        intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
        mssql mysql libmysqlclient mysqli nls

-       oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-pgsql pdo-sqlite
-       +phar +posix postgres qdbm readline recode selinux +session sharedmem
-       +simplexml snmp soap sockets spell sqlite ssl
+       oci8-instant-client odbc +opcache pcntl pdo pdo-dblib pdo-odbc
+       pdo-pgsql pdo-sqlite+phar +posix postgres qdbm readline recode selinux
+       +session sharedmem +simplexml snmp soap sockets spell sqlite ssl

        sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
        +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 
        sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
        +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
 


@@ -179,6 +179,7 @@ REQUIRED_USE="
        ) )
 
        pdo-dblib? ( mssql )
        ) )
 
        pdo-dblib? ( mssql )

+       pdo-odbc? ( odbc )

        pdo-pgsql? ( postgres )
        pdo-sqlite? ( sqlite )
        qdbm? ( !gdbm )
        pdo-pgsql? ( postgres )
        pdo-sqlite? ( sqlite )
        qdbm? ( !gdbm )


@@ -378,6 +379,7 @@ src_configure() {
        $(use_enable pcntl pcntl )
        $(use_enable pdo pdo )
        $(use_with   pdo-dblib pdo-dblib )
        $(use_enable pcntl pcntl )
        $(use_enable pdo pdo )
        $(use_with   pdo-dblib pdo-dblib )

+       $(use_with   pdo-odbc pdo-odbc unixODBC,"${EPREFIX}"/usr)

        $(use_with   pdo-pgsql pdo-pgsql )
        $(use_with   pdo-sqlite pdo-sqlite "${EPREFIX}"/usr)
        $(use_enable phar phar )
        $(use_with   pdo-pgsql pdo-pgsql )
        $(use_with   pdo-sqlite pdo-sqlite "${EPREFIX}"/usr)
        $(use_enable phar phar )


@@ -466,9 +468,7 @@ src_configure() {
 
        # PDO support
        if use pdo ; then
 
        # PDO support
        if use pdo ; then

-               my_conf+="
-               $(use_with mysql pdo-mysql ${mysqllib})
-               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+               my_conf+="$(use_with mysql pdo-mysql ${mysqllib})"

                if use oci8-instant-client ; then
                        my_conf+="
                        $(use_with oci8-instant-client pdo-oci)"
                if use oci8-instant-client ; then
                        my_conf+="
                        $(use_with oci8-instant-client pdo-oci)"