dev-lang/php: remove redundant "if use iodbc" 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...". This use_with
block was also merged with the one for USE=odbc.

Gentoo-Bug: 551526

Package-Manager: portage-2.2.20.1

diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
index b886802fc3d3915d24c69dc5e99c275baacb5b7f..dd6915cc5b3b7f7db013cfcc2296ec010e128771 100644 (file)
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15.ebuild
@@ -464,12 +464,8 @@ src_configure() {
 
        # ODBC support
        my_conf+="
-       $(use_with odbc unixODBC ${EPREFIX}/usr)"
-
-       if use iodbc ; then
-               my_conf+="
-               $(use_with iodbc iodbc ${EPREFIX}/usr)"
-       fi
+       $(use_with odbc unixODBC ${EPREFIX}/usr)
+       $(use_with iodbc iodbc ${EPREFIX}/usr)"
 
        # Oracle support
        if use oci8-instant-client ; then

diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild
index 481989304c68aa982395f29c28aff865bd7d0fa0..f0e475acbe9470aa176c58d30f60062eea3ebe2c 100644 (file)
--- a/dev-lang/php/php-7.0.0_rc5.ebuild
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild
@@ -441,12 +441,8 @@ src_configure() {
 
        # ODBC support
        my_conf+="
-       $(use_with odbc unixODBC ${EPREFIX}/usr)"
-
-       if use iodbc ; then
-               my_conf+="
-               $(use_with iodbc iodbc ${EPREFIX}/usr)"
-       fi
+       $(use_with odbc unixODBC ${EPREFIX}/usr)
+       $(use_with iodbc iodbc ${EPREFIX}/usr)"
 
        # Oracle support
        if use oci8-instant-client ; then