| 1 |
commit: 6df250126b847ab873cbe0e7fa8ce0de794d2697 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 4 16:23:30 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 4 16:23:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df25012 |
| 7 |
|
| 8 |
dev-lang/php: Convert apache dependency to work on all versions |
| 9 |
|
| 10 |
The conditional dependency on www-servers/apache can be simplifed |
| 11 |
so that it works on all versions and still be equal in existing installed VDB |
| 12 |
|
| 13 |
Modify all current ebuilds to close the bug |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/692090 |
| 16 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 17 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-lang/php/php-5.6.40-r6.ebuild | 3 +-- |
| 20 |
dev-lang/php/php-7.1.31.ebuild | 3 +-- |
| 21 |
dev-lang/php/php-7.1.32.ebuild | 3 +-- |
| 22 |
dev-lang/php/php-7.2.21.ebuild | 3 +-- |
| 23 |
dev-lang/php/php-7.2.22.ebuild | 3 +-- |
| 24 |
dev-lang/php/php-7.2.23.ebuild | 3 +-- |
| 25 |
dev-lang/php/php-7.3.10.ebuild | 3 +-- |
| 26 |
dev-lang/php/php-7.3.8.ebuild | 3 +-- |
| 27 |
dev-lang/php/php-7.3.9.ebuild | 3 +-- |
| 28 |
9 files changed, 9 insertions(+), 18 deletions(-) |
| 29 |
|
| 30 |
diff --git a/dev-lang/php/php-5.6.40-r6.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild |
| 31 |
index 9a3ebaa2a5f..8f5ff1a11f2 100644 |
| 32 |
--- a/dev-lang/php/php-5.6.40-r6.ebuild |
| 33 |
+++ b/dev-lang/php/php-5.6.40-r6.ebuild |
| 34 |
@@ -50,8 +50,7 @@ COMMON_DEPEND=" |
| 35 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 36 |
>=dev-libs/libpcre-8.32[unicode] |
| 37 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 38 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 39 |
- <www-servers/apache-2.4[threads=] ) ) |
| 40 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 41 |
berkdb? ( || ( sys-libs/db:5.3 |
| 42 |
sys-libs/db:5.1 |
| 43 |
sys-libs/db:4.8 |
| 44 |
|
| 45 |
diff --git a/dev-lang/php/php-7.1.31.ebuild b/dev-lang/php/php-7.1.31.ebuild |
| 46 |
index 139472d572c..896a587ccae 100644 |
| 47 |
--- a/dev-lang/php/php-7.1.31.ebuild |
| 48 |
+++ b/dev-lang/php/php-7.1.31.ebuild |
| 49 |
@@ -47,8 +47,7 @@ COMMON_DEPEND=" |
| 50 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 51 |
>=dev-libs/libpcre-8.32[unicode] |
| 52 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 53 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 54 |
- <www-servers/apache-2.4[threads=] ) ) |
| 55 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 56 |
berkdb? ( || ( sys-libs/db:5.3 |
| 57 |
sys-libs/db:5.1 |
| 58 |
sys-libs/db:4.8 |
| 59 |
|
| 60 |
diff --git a/dev-lang/php/php-7.1.32.ebuild b/dev-lang/php/php-7.1.32.ebuild |
| 61 |
index 592ae19fd67..915a7b43320 100644 |
| 62 |
--- a/dev-lang/php/php-7.1.32.ebuild |
| 63 |
+++ b/dev-lang/php/php-7.1.32.ebuild |
| 64 |
@@ -47,8 +47,7 @@ COMMON_DEPEND=" |
| 65 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 66 |
>=dev-libs/libpcre-8.32[unicode] |
| 67 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 68 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 69 |
- <www-servers/apache-2.4[threads=] ) ) |
| 70 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 71 |
berkdb? ( || ( sys-libs/db:5.3 |
| 72 |
sys-libs/db:5.1 |
| 73 |
sys-libs/db:4.8 |
| 74 |
|
| 75 |
diff --git a/dev-lang/php/php-7.2.21.ebuild b/dev-lang/php/php-7.2.21.ebuild |
| 76 |
index f659c39ce48..bb2a85f0ab1 100644 |
| 77 |
--- a/dev-lang/php/php-7.2.21.ebuild |
| 78 |
+++ b/dev-lang/php/php-7.2.21.ebuild |
| 79 |
@@ -47,8 +47,7 @@ COMMON_DEPEND=" |
| 80 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 81 |
>=dev-libs/libpcre-8.32[unicode] |
| 82 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 83 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 84 |
- <www-servers/apache-2.4[threads=] ) ) |
| 85 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 86 |
argon2? ( app-crypt/argon2:= ) |
| 87 |
berkdb? ( || ( sys-libs/db:5.3 |
| 88 |
sys-libs/db:5.1 |
| 89 |
|
| 90 |
diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild |
| 91 |
index 7a2281bfaf8..89901d2eae4 100644 |
| 92 |
--- a/dev-lang/php/php-7.2.22.ebuild |
| 93 |
+++ b/dev-lang/php/php-7.2.22.ebuild |
| 94 |
@@ -47,8 +47,7 @@ COMMON_DEPEND=" |
| 95 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 96 |
>=dev-libs/libpcre-8.32[unicode] |
| 97 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 98 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 99 |
- <www-servers/apache-2.4[threads=] ) ) |
| 100 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 101 |
argon2? ( app-crypt/argon2:= ) |
| 102 |
berkdb? ( || ( sys-libs/db:5.3 |
| 103 |
sys-libs/db:5.1 |
| 104 |
|
| 105 |
diff --git a/dev-lang/php/php-7.2.23.ebuild b/dev-lang/php/php-7.2.23.ebuild |
| 106 |
index 4156c8c952e..e2ba43e8033 100644 |
| 107 |
--- a/dev-lang/php/php-7.2.23.ebuild |
| 108 |
+++ b/dev-lang/php/php-7.2.23.ebuild |
| 109 |
@@ -47,8 +47,7 @@ COMMON_DEPEND=" |
| 110 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 111 |
>=dev-libs/libpcre-8.32[unicode] |
| 112 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 113 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 114 |
- <www-servers/apache-2.4[threads=] ) ) |
| 115 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 116 |
argon2? ( app-crypt/argon2:= ) |
| 117 |
berkdb? ( || ( sys-libs/db:5.3 |
| 118 |
sys-libs/db:5.1 |
| 119 |
|
| 120 |
diff --git a/dev-lang/php/php-7.3.10.ebuild b/dev-lang/php/php-7.3.10.ebuild |
| 121 |
index eb9e3727c51..78a431dfe12 100644 |
| 122 |
--- a/dev-lang/php/php-7.3.10.ebuild |
| 123 |
+++ b/dev-lang/php/php-7.3.10.ebuild |
| 124 |
@@ -50,8 +50,7 @@ COMMON_DEPEND=" |
| 125 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 126 |
>=dev-libs/libpcre2-10.30[unicode] |
| 127 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 128 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 129 |
- <www-servers/apache-2.4[threads=] ) ) |
| 130 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 131 |
argon2? ( app-crypt/argon2:= ) |
| 132 |
berkdb? ( || ( sys-libs/db:5.3 |
| 133 |
sys-libs/db:5.1 |
| 134 |
|
| 135 |
diff --git a/dev-lang/php/php-7.3.8.ebuild b/dev-lang/php/php-7.3.8.ebuild |
| 136 |
index 315d2b5d013..9281a98c7f0 100644 |
| 137 |
--- a/dev-lang/php/php-7.3.8.ebuild |
| 138 |
+++ b/dev-lang/php/php-7.3.8.ebuild |
| 139 |
@@ -50,8 +50,7 @@ COMMON_DEPEND=" |
| 140 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 141 |
>=dev-libs/libpcre2-10.30[unicode] |
| 142 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 143 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 144 |
- <www-servers/apache-2.4[threads=] ) ) |
| 145 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 146 |
argon2? ( app-crypt/argon2:= ) |
| 147 |
berkdb? ( || ( sys-libs/db:5.3 |
| 148 |
sys-libs/db:5.1 |
| 149 |
|
| 150 |
diff --git a/dev-lang/php/php-7.3.9.ebuild b/dev-lang/php/php-7.3.9.ebuild |
| 151 |
index b382e3aec78..e9097d23973 100644 |
| 152 |
--- a/dev-lang/php/php-7.3.9.ebuild |
| 153 |
+++ b/dev-lang/php/php-7.3.9.ebuild |
| 154 |
@@ -50,8 +50,7 @@ COMMON_DEPEND=" |
| 155 |
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
| 156 |
>=dev-libs/libpcre2-10.30[unicode] |
| 157 |
fpm? ( acl? ( sys-apps/acl ) ) |
| 158 |
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
| 159 |
- <www-servers/apache-2.4[threads=] ) ) |
| 160 |
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
| 161 |
argon2? ( app-crypt/argon2:= ) |
| 162 |
berkdb? ( || ( sys-libs/db:5.3 |
| 163 |
sys-libs/db:5.1 |
Archives