From: Michael Orlitzky <mjo@gentoo.org>
Date: Sat, 31 Oct 2015 01:00:24 +0000 (-0400)
Subject: dev-lang/php: remove redundant "if use oci8-instant-client" check.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=19f4690494e4d8e38a0d555f589ccc55392edcad;p=gentoo.git

dev-lang/php: remove redundant "if use oci8-instant-client" 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
---

diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
index dd6915cc5b3b..3f663ec5d28c 100644
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15.ebuild
@@ -468,10 +468,8 @@ src_configure() {
 	$(use_with iodbc iodbc ${EPREFIX}/usr)"
 
 	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
+	my_conf+="
+	$(use_with oci8-instant-client oci8)"
 
 	# PDO support
 	if use pdo ; then
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild
index f0e475acbe94..8043ddf17b06 100644
--- a/dev-lang/php/php-7.0.0_rc5.ebuild
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild
@@ -445,10 +445,8 @@ src_configure() {
 	$(use_with iodbc iodbc ${EPREFIX}/usr)"
 
 	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
+	my_conf+="
+	$(use_with oci8-instant-client oci8)"
 
 	# PDO support
 	if use pdo ; then