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

[Michael Orlitzky]

commit:     594654d60dffccc3bc6bacbe1e02aeaf976ecb9d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 00:51:16 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 02:21:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594654d6

dev-lang/php: remove redundant "if use odbc" check.

The use_with function doesn't do anything if its USE flag is disabled,
so there's no reason to wrap use_with in "if use...".

Gentoo-Bug: 551526

Package-Manager: portage-2.2.20.1

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

diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
index 43c6335..b886802 100644
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15.ebuild
@@ -463,10 +463,8 @@ src_configure() {
        fi
 
        # ODBC support
-       if use odbc ; then
-               my_conf+="
-               $(use_with odbc unixODBC ${EPREFIX}/usr)"
-       fi
+       my_conf+="
+       $(use_with odbc unixODBC ${EPREFIX}/usr)"
 
        if use iodbc ; then
                my_conf+="

diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild 
b/dev-lang/php/php-7.0.0_rc5.ebuild
index 12bfcee..4819893 100644
--- a/dev-lang/php/php-7.0.0_rc5.ebuild
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild
@@ -440,10 +440,8 @@ src_configure() {
        fi
 
        # ODBC support
-       if use odbc ; then
-               my_conf+="
-               $(use_with odbc unixODBC ${EPREFIX}/usr)"
-       fi
+       my_conf+="
+       $(use_with odbc unixODBC ${EPREFIX}/usr)"
 
        if use iodbc ; then
                my_conf+="