[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

[Michael Orlitzky]

commit:     24cc464d62edb689021380d2573f107512b5371f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 01:06:46 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 02:21:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cc464d

dev-lang/php: remove second redundant "if use oci8-instant-client" check.

This fixes the same issue as 7c05e6f, but in another spot in the ebuild.

Gentoo-Bug: 551526

Package-Manager: portage-2.2.20.1

 dev-lang/php/php-5.6.15.ebuild    | 7 ++-----
 dev-lang/php/php-7.0.0_rc5.ebuild | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
index 3f663ec..7fc954c 100644
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15.ebuild
@@ -478,11 +478,8 @@ src_configure() {
                $(use_with mysql pdo-mysql ${mysqllib})
                $(use_with postgres pdo-pgsql )
                $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-               if use oci8-instant-client ; then
-                       my_conf+="
-                       $(use_with oci8-instant-client pdo-oci)"
-               fi
+               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)
+               $(use_with oci8-instant-client pdo-oci)"
        fi
 
        # readline/libedit support

diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild 
b/dev-lang/php/php-7.0.0_rc5.ebuild
index 8043ddf..41ebf46 100644
--- a/dev-lang/php/php-7.0.0_rc5.ebuild
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild
@@ -454,11 +454,8 @@ src_configure() {
                $(use_with mysql pdo-mysql ${mysqllib})
                $(use_with postgres pdo-pgsql )
                $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-               if use oci8-instant-client ; then
-                       my_conf+="
-                       $(use_with oci8-instant-client pdo-oci)"
-               fi
+               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)
+               $(use_with oci8-instant-client pdo-oci)"
        fi
 
        # readline/libedit support