1 |
commit: 0d0600e7964554d89843666b8315c16e9ac99e3b |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 31 00:48:17 2015 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 02:21:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0600e7 |
7 |
|
8 |
dev-lang/php: remove redundant "if use firebird" check. |
9 |
|
10 |
The use_with function doesn't do anything if its USE flag is disabled, |
11 |
so there's no reason to wrap use_with in "if use...". |
12 |
|
13 |
Gentoo-Bug: 551526 |
14 |
|
15 |
Package-Manager: portage-2.2.20.1 |
16 |
|
17 |
dev-lang/php/php-5.6.15.ebuild | 7 ++----- |
18 |
dev-lang/php/php-7.0.0_rc5.ebuild | 7 ++----- |
19 |
2 files changed, 4 insertions(+), 10 deletions(-) |
20 |
|
21 |
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild |
22 |
index 2b0ca18..43c6335 100644 |
23 |
--- a/dev-lang/php/php-5.6.15.ebuild |
24 |
+++ b/dev-lang/php/php-5.6.15.ebuild |
25 |
@@ -436,11 +436,8 @@ src_configure() { |
26 |
fi |
27 |
|
28 |
# Interbase/firebird support |
29 |
- |
30 |
- if use firebird ; then |
31 |
- my_conf+=" |
32 |
- $(use_with firebird interbase ${EPREFIX}/usr)" |
33 |
- fi |
34 |
+ my_conf+=" |
35 |
+ $(use_with firebird interbase ${EPREFIX}/usr)" |
36 |
|
37 |
# LDAP support |
38 |
if use ldap ; then |
39 |
|
40 |
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild |
41 |
index 37a3015..12bfcee 100644 |
42 |
--- a/dev-lang/php/php-7.0.0_rc5.ebuild |
43 |
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild |
44 |
@@ -416,11 +416,8 @@ src_configure() { |
45 |
fi |
46 |
|
47 |
# Interbase/firebird support |
48 |
- |
49 |
- if use firebird ; then |
50 |
- my_conf+=" |
51 |
- $(use_with firebird interbase ${EPREFIX}/usr)" |
52 |
- fi |
53 |
+ my_conf+=" |
54 |
+ $(use_with firebird interbase ${EPREFIX}/usr)" |
55 |
|
56 |
# LDAP support |
57 |
if use ldap ; then |