commit: a8ec177bc04cd7de2814c680b089177a4a15dc84
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 00:56:26 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=a8ec177b
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
dev-lang/php/php-5.6.15.ebuild | 8 ++------
dev-lang/php/php-7.0.0_rc5.ebuild | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
index b886802..dd6915c 100644
--- 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 4819893..f0e475a 100644
--- 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
