1 |
commit: 7b94eef39a96b72dbf1d2249a2937a5fd075b991 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 28 00:37:32 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 28 14:45:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b94eef3 |
7 |
|
8 |
dev-lang/php: revision the 5.6 and 7.0 series to add sys-libs/db:5.3 support. |
9 |
|
10 |
We had to leave db:5.3 out of our dependency string until now because |
11 |
the upstream build system couldn't detect it. The latest v5.6.17 and |
12 |
v7.0.2 will find it, though, so we add it as an option. |
13 |
|
14 |
Gentoo-Bug: 564824 |
15 |
|
16 |
Package-Manager: portage-2.2.26 |
17 |
|
18 |
dev-lang/php/{php-5.6.17-r2.ebuild => php-5.6.17-r3.ebuild} | 3 ++- |
19 |
dev-lang/php/{php-7.0.2-r2.ebuild => php-7.0.2-r3.ebuild} | 3 ++- |
20 |
2 files changed, 4 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/dev-lang/php/php-5.6.17-r2.ebuild b/dev-lang/php/php-5.6.17-r3.ebuild |
23 |
similarity index 99% |
24 |
rename from dev-lang/php/php-5.6.17-r2.ebuild |
25 |
rename to dev-lang/php/php-5.6.17-r3.ebuild |
26 |
index df8096c..7d9db68 100644 |
27 |
--- a/dev-lang/php/php-5.6.17-r2.ebuild |
28 |
+++ b/dev-lang/php/php-5.6.17-r3.ebuild |
29 |
@@ -85,7 +85,8 @@ DEPEND=" |
30 |
# the ./configure script. Other versions *work*, but we need to stick to |
31 |
# the ones that can be detected to avoid a repeat of bug #564824. |
32 |
DEPEND="${DEPEND} |
33 |
- berkdb? ( || ( sys-libs/db:5.1 |
34 |
+ berkdb? ( || ( sys-libs/db:5.3 |
35 |
+ sys-libs/db:5.1 |
36 |
sys-libs/db:4.8 |
37 |
sys-libs/db:4.7 |
38 |
sys-libs/db:4.6 |
39 |
|
40 |
diff --git a/dev-lang/php/php-7.0.2-r2.ebuild b/dev-lang/php/php-7.0.2-r3.ebuild |
41 |
similarity index 99% |
42 |
rename from dev-lang/php/php-7.0.2-r2.ebuild |
43 |
rename to dev-lang/php/php-7.0.2-r3.ebuild |
44 |
index 6ecf27a..8d8f27c 100644 |
45 |
--- a/dev-lang/php/php-7.0.2-r2.ebuild |
46 |
+++ b/dev-lang/php/php-7.0.2-r3.ebuild |
47 |
@@ -85,7 +85,8 @@ DEPEND=" |
48 |
# the ./configure script. Other versions *work*, but we need to stick to |
49 |
# the ones that can be detected to avoid a repeat of bug #564824. |
50 |
DEPEND="${DEPEND} |
51 |
- berkdb? ( || ( sys-libs/db:5.1 |
52 |
+ berkdb? ( || ( sys-libs/db:5.3 |
53 |
+ sys-libs/db:5.1 |
54 |
sys-libs/db:4.8 |
55 |
sys-libs/db:4.7 |
56 |
sys-libs/db:4.6 |