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

dev-lang/php: remove redundant "if use firebird" 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 2b0ca18203b0..43c63358dfd4 100644
--- a/dev-lang/php/php-5.6.15.ebuild
+++ b/dev-lang/php/php-5.6.15.ebuild
@@ -436,11 +436,8 @@ src_configure() {
 	fi
 
 	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
+	my_conf+="
+	$(use_with firebird interbase ${EPREFIX}/usr)"
 
 	# LDAP support
 	if use ldap ; then
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild
index 37a3015babce..12bfcee2595e 100644
--- a/dev-lang/php/php-7.0.0_rc5.ebuild
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild
@@ -416,11 +416,8 @@ src_configure() {
 	fi
 
 	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
+	my_conf+="
+	$(use_with firebird interbase ${EPREFIX}/usr)"
 
 	# LDAP support
 	if use ldap ; then