1 |
commit: 4769b13edaf5ab12fe62bc0b546557540a772a5e |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 2 23:48:37 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 23:49:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4769b13e |
7 |
|
8 |
dev-lang/php: Revbump each release to have better subslot deps |
9 |
|
10 |
Closes: https://bugs.gentoo.org/643186 |
11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
12 |
|
13 |
.../{php-7.0.26.ebuild => php-5.6.32-r1.ebuild} | 138 +++++++++++++-------- |
14 |
.../{php-7.0.26.ebuild => php-7.0.26-r1.ebuild} | 28 ++--- |
15 |
.../{php-7.1.12.ebuild => php-7.1.12-r1.ebuild} | 18 +-- |
16 |
.../php/{php-7.2.0.ebuild => php-7.2.0-r1.ebuild} | 16 +-- |
17 |
4 files changed, 116 insertions(+), 84 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/php/php-7.0.26.ebuild b/dev-lang/php/php-5.6.32-r1.ebuild |
20 |
similarity index 86% |
21 |
copy from dev-lang/php/php-7.0.26.ebuild |
22 |
copy to dev-lang/php/php-5.6.32-r1.ebuild |
23 |
index 947d712ca81..82ff27ece5c 100644 |
24 |
--- a/dev-lang/php/php-7.0.26.ebuild |
25 |
+++ b/dev-lang/php/php-5.6.32-r1.ebuild |
26 |
@@ -1,13 +1,13 @@ |
27 |
-# Copyright 1999-2017 Gentoo Foundation |
28 |
+# Copyright 1999-2018 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI=6 |
32 |
|
33 |
-inherit flag-o-matic versionator systemd |
34 |
+inherit autotools flag-o-matic versionator systemd |
35 |
|
36 |
DESCRIPTION="The PHP language runtime engine" |
37 |
HOMEPAGE="https://secure.php.net/" |
38 |
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz" |
39 |
+SRC_URI="https://php.net/distributions/${P}.tar.xz" |
40 |
|
41 |
LICENSE="PHP-3.01 |
42 |
BSD |
43 |
@@ -21,7 +21,7 @@ SLOT="$(get_version_component_range 1-2)" |
44 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
45 |
|
46 |
# We can build the following SAPIs in the given order |
47 |
-SAPIS="embed cli cgi fpm apache2 phpdbg" |
48 |
+SAPIS="embed cli cgi fpm apache2" |
49 |
|
50 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
51 |
IUSE="${IUSE} |
52 |
@@ -33,11 +33,11 @@ IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk |
53 |
enchant exif +fileinfo +filter firebird |
54 |
flatfile ftp gd gdbm gmp +hash +iconv imap inifile |
55 |
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl |
56 |
- mhash mssql mysql mysqli nls |
57 |
+ mhash mssql mysql libmysqlclient mysqli nls |
58 |
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm |
59 |
readline recode selinux +session sharedmem |
60 |
+simplexml snmp soap sockets spell sqlite ssl |
61 |
- sysvipc systemd tidy +tokenizer truetype unicode wddx webp |
62 |
+ sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx |
63 |
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" |
64 |
|
65 |
# The supported (that is, autodetected) versions of BDB are listed in |
66 |
@@ -49,18 +49,18 @@ COMMON_DEPEND=" |
67 |
acl? ( sys-apps/acl ) |
68 |
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] |
69 |
<www-servers/apache-2.4[threads=] ) ) |
70 |
- berkdb? ( || ( sys-libs/db:5.3 |
71 |
+ berkdb? ( || ( sys-libs/db:5.3 |
72 |
sys-libs/db:5.1 |
73 |
sys-libs/db:4.8 |
74 |
sys-libs/db:4.7 |
75 |
sys-libs/db:4.6 |
76 |
sys-libs/db:4.5 ) ) |
77 |
- bzip2? ( app-arch/bzip2 ) |
78 |
+ bzip2? ( app-arch/bzip2:0= ) |
79 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
80 |
cjk? ( !gd? ( |
81 |
virtual/jpeg:0 |
82 |
media-libs/libpng:0= |
83 |
- sys-libs/zlib |
84 |
+ sys-libs/zlib:0= |
85 |
) ) |
86 |
coverage? ( dev-util/lcov ) |
87 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
88 |
@@ -69,12 +69,12 @@ COMMON_DEPEND=" |
89 |
exif? ( !gd? ( |
90 |
virtual/jpeg:0 |
91 |
media-libs/libpng:0= |
92 |
- sys-libs/zlib |
93 |
+ sys-libs/zlib:0= |
94 |
) ) |
95 |
firebird? ( dev-db/firebird ) |
96 |
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
97 |
- gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
98 |
- gmp? ( dev-libs/gmp:0 ) |
99 |
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) |
100 |
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
101 |
+ gmp? ( dev-libs/gmp:0= ) |
102 |
iconv? ( virtual/libiconv ) |
103 |
imap? ( virtual/imap-c-client[kerberos=,ssl=] ) |
104 |
intl? ( dev-libs/icu:= ) |
105 |
@@ -84,6 +84,10 @@ COMMON_DEPEND=" |
106 |
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) |
107 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
108 |
mssql? ( dev-db/freetds[mssql] ) |
109 |
+ libmysqlclient? ( |
110 |
+ mysql? ( virtual/libmysqlclient:= ) |
111 |
+ mysqli? ( virtual/libmysqlclient:= ) |
112 |
+ ) |
113 |
nls? ( sys-devel/gettext ) |
114 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
115 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
116 |
@@ -98,18 +102,20 @@ COMMON_DEPEND=" |
117 |
spell? ( >=app-text/aspell-0.50 ) |
118 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
119 |
ssl? ( |
120 |
- !libressl? ( dev-libs/openssl:0 ) |
121 |
- libressl? ( dev-libs/libressl ) |
122 |
+ !libressl? ( dev-libs/openssl:0= ) |
123 |
+ libressl? ( dev-libs/libressl:0= ) |
124 |
) |
125 |
+ sybase-ct? ( dev-db/freetds ) |
126 |
tidy? ( app-text/htmltidy ) |
127 |
truetype? ( |
128 |
=media-libs/freetype-2* |
129 |
+ >=media-libs/t1lib-5.0.0 |
130 |
!gd? ( |
131 |
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
132 |
+ virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) |
133 |
) |
134 |
unicode? ( dev-libs/oniguruma:= ) |
135 |
+ vpx? ( media-libs/libvpx:0= ) |
136 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
137 |
- webp? ( media-libs/libwebp ) |
138 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
139 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
140 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
141 |
@@ -117,11 +123,11 @@ COMMON_DEPEND=" |
142 |
xpm? ( |
143 |
x11-libs/libXpm |
144 |
virtual/jpeg:0 |
145 |
- media-libs/libpng:0= sys-libs/zlib |
146 |
+ media-libs/libpng:0= sys-libs/zlib:0= |
147 |
) |
148 |
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
149 |
- zip? ( sys-libs/zlib ) |
150 |
- zlib? ( sys-libs/zlib ) |
151 |
+ zip? ( sys-libs/zlib:0= ) |
152 |
+ zlib? ( sys-libs/zlib:0= ) |
153 |
" |
154 |
|
155 |
RDEPEND="${COMMON_DEPEND} |
156 |
@@ -139,10 +145,10 @@ DEPEND="${COMMON_DEPEND} |
157 |
|
158 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
159 |
REQUIRED_USE=" |
160 |
- || ( cli cgi fpm apache2 embed phpdbg ) |
161 |
+ || ( cli cgi fpm apache2 embed ) |
162 |
cli? ( ^^ ( readline libedit ) ) |
163 |
truetype? ( gd ) |
164 |
- webp? ( gd ) |
165 |
+ vpx? ( gd ) |
166 |
cjk? ( gd ) |
167 |
exif? ( gd ) |
168 |
xpm? ( gd ) |
169 |
@@ -156,11 +162,16 @@ REQUIRED_USE=" |
170 |
ldap-sasl? ( ldap ) |
171 |
mhash? ( hash ) |
172 |
phar? ( hash ) |
173 |
+ recode? ( !imap !mysql !mysqli !libmysqlclient ) |
174 |
+ libmysqlclient? ( || ( |
175 |
+ mysql |
176 |
+ mysqli |
177 |
+ pdo |
178 |
+ ) ) |
179 |
+ |
180 |
qdbm? ( !gdbm ) |
181 |
readline? ( !libedit ) |
182 |
- recode? ( !imap !mysqli !mysql ) |
183 |
sharedmem? ( !threads ) |
184 |
- mysql? ( || ( mysqli pdo ) ) |
185 |
" |
186 |
|
187 |
PHP_MV="$(get_major_version)" |
188 |
@@ -205,11 +216,9 @@ php_install_ini() { |
189 |
|
190 |
# SAPI-specific handling |
191 |
if [[ "${sapi}" == "fpm" ]] ; then |
192 |
- einfo "Installing FPM config files php-fpm.conf and www.conf" |
193 |
+ einfo "Installing FPM config file php-fpm.conf" |
194 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
195 |
doins sapi/fpm/php-fpm.conf |
196 |
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" |
197 |
- doins sapi/fpm/www.conf |
198 |
fi |
199 |
|
200 |
dodoc php.ini-{development,production} |
201 |
@@ -222,17 +231,43 @@ php_set_ini_dir() { |
202 |
} |
203 |
|
204 |
src_prepare() { |
205 |
- default |
206 |
- |
207 |
- # In php-7.x, the FPM pool configuration files have been split off |
208 |
- # of the main config. By default the pool config files go in |
209 |
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the |
210 |
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later |
211 |
- # we'll install the pool configuration file "www.conf" there. |
212 |
- php_set_ini_dir fpm |
213 |
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ |
214 |
- sapi/fpm/php-fpm.conf.in \ |
215 |
- || die 'failed to move the include directory in php-fpm.conf' |
216 |
+ eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch" |
217 |
+ |
218 |
+ # Change PHP branding |
219 |
+ # Get the alpha/beta/rc version |
220 |
+ sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ |
221 |
+ -i configure.in || die "Unable to change PHP branding" |
222 |
+ |
223 |
+ # Patch PHP to show Gentoo as the server platform |
224 |
+ sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ |
225 |
+ -i configure.in || die "Failed to fix server platform name" |
226 |
+ |
227 |
+ # Prevent PHP from activating the Apache config, |
228 |
+ # as we will do that ourselves |
229 |
+ sed -i \ |
230 |
+ -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ |
231 |
+ -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ |
232 |
+ configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ |
233 |
+ || die |
234 |
+ |
235 |
+ # Patch PHP to support heimdal instead of mit-krb5 |
236 |
+ if has_version "app-crypt/heimdal" ; then |
237 |
+ sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ |
238 |
+ || die "Failed to fix heimdal libname" |
239 |
+ sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ |
240 |
+ || die "Failed to fix heimdal crypt library reference" |
241 |
+ fi |
242 |
+ |
243 |
+ eapply_user |
244 |
+ |
245 |
+ # Force rebuilding aclocal.m4 |
246 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
247 |
+ eautoreconf |
248 |
+ |
249 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
250 |
+ # http://bugs.php.net/bug.php?id=48795, bug #343481 |
251 |
+ sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die |
252 |
+ fi |
253 |
} |
254 |
|
255 |
src_configure() { |
256 |
@@ -282,6 +317,7 @@ src_configure() { |
257 |
$(use_with xml libxml-dir "${EPREFIX}/usr") |
258 |
$(use_enable unicode mbstring) |
259 |
$(use_with crypt mcrypt "${EPREFIX}/usr") |
260 |
+ $(use_with mssql mssql "${EPREFIX}/usr") |
261 |
$(use_with unicode onig "${EPREFIX}/usr") |
262 |
$(use_with ssl openssl "${EPREFIX}/usr") |
263 |
$(use_with ssl openssl-dir "${EPREFIX}/usr") |
264 |
@@ -299,6 +335,7 @@ src_configure() { |
265 |
$(use_enable soap soap) |
266 |
$(use_enable sockets sockets) |
267 |
$(use_with sqlite sqlite3 "${EPREFIX}/usr") |
268 |
+ $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") |
269 |
$(use_enable sysvipc sysvmsg) |
270 |
$(use_enable sysvipc sysvsem) |
271 |
$(use_enable sysvipc sysvshm) |
272 |
@@ -335,14 +372,13 @@ src_configure() { |
273 |
# Support for the GD graphics library |
274 |
our_conf+=( |
275 |
$(use_with truetype freetype-dir "${EPREFIX}/usr") |
276 |
+ $(use_with truetype t1lib "${EPREFIX}/usr") |
277 |
$(use_enable cjk gd-jis-conv) |
278 |
$(use_with gd jpeg-dir "${EPREFIX}/usr") |
279 |
$(use_with gd png-dir "${EPREFIX}/usr") |
280 |
$(use_with xpm xpm-dir "${EPREFIX}/usr") |
281 |
+ $(use_with vpx vpx-dir "${EPREFIX}/usr") |
282 |
) |
283 |
- if use webp; then |
284 |
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) |
285 |
- fi |
286 |
# enable gd last, so configure can pick up the previous settings |
287 |
our_conf+=( $(use_with gd gd) ) |
288 |
|
289 |
@@ -368,7 +404,10 @@ src_configure() { |
290 |
# MySQL support |
291 |
local mysqllib="mysqlnd" |
292 |
local mysqlilib="mysqlnd" |
293 |
+ use libmysqlclient && mysqllib="${EPREFIX}/usr" |
294 |
+ use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" |
295 |
|
296 |
+ our_conf+=( $(use_with mysql mysql "${mysqllib}") ) |
297 |
our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) |
298 |
|
299 |
local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" |
300 |
@@ -388,7 +427,7 @@ src_configure() { |
301 |
# PDO support |
302 |
if use pdo ; then |
303 |
our_conf+=( |
304 |
- $(use_with mssql pdo-dblib "${EPREFIX}/usr") |
305 |
+ $(use_with mssql pdo-dblib) |
306 |
$(use_with mysql pdo-mysql "${mysqllib}") |
307 |
$(use_with postgres pdo-pgsql) |
308 |
$(use_with sqlite pdo-sqlite "${EPREFIX}/usr") |
309 |
@@ -455,7 +494,7 @@ src_configure() { |
310 |
|
311 |
for sapi in $SAPIS ; do |
312 |
case "$sapi" in |
313 |
- cli|cgi|embed|fpm|phpdbg) |
314 |
+ cli|cgi|embed|fpm) |
315 |
if [[ "${one_sapi}" == "${sapi}" ]] ; then |
316 |
sapi_conf+=( "--enable-${sapi}" ) |
317 |
else |
318 |
@@ -536,7 +575,7 @@ src_install() { |
319 |
# We're specifically not using emake install-sapi as libtool |
320 |
# may cause unnecessary relink failures (see bug #351266) |
321 |
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" |
322 |
- newins ".libs/libphp${PHP_MV}$(get_libname)" \ |
323 |
+ newins ".libs/libphp5$(get_libname)" \ |
324 |
"libphp${PHP_MV}$(get_libname)" |
325 |
keepdir "/usr/$(get_libdir)/apache2/modules" |
326 |
else |
327 |
@@ -556,9 +595,6 @@ src_install() { |
328 |
embed) |
329 |
source="libs/libphp${PHP_MV}$(get_libname)" |
330 |
;; |
331 |
- phpdbg) |
332 |
- source="sapi/phpdbg/phpdbg" |
333 |
- ;; |
334 |
*) |
335 |
die "unhandled sapi in src_install" |
336 |
;; |
337 |
@@ -621,12 +657,8 @@ src_test() { |
338 |
export TEST_PHP_EXECUTABLE="${PHP_BIN}" |
339 |
fi |
340 |
|
341 |
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then |
342 |
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" |
343 |
- fi |
344 |
- |
345 |
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then |
346 |
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" |
347 |
+ if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then |
348 |
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" |
349 |
fi |
350 |
|
351 |
REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ |
352 |
|
353 |
diff --git a/dev-lang/php/php-7.0.26.ebuild b/dev-lang/php/php-7.0.26-r1.ebuild |
354 |
similarity index 97% |
355 |
rename from dev-lang/php/php-7.0.26.ebuild |
356 |
rename to dev-lang/php/php-7.0.26-r1.ebuild |
357 |
index 947d712ca81..dde911b26c6 100644 |
358 |
--- a/dev-lang/php/php-7.0.26.ebuild |
359 |
+++ b/dev-lang/php/php-7.0.26-r1.ebuild |
360 |
@@ -1,4 +1,4 @@ |
361 |
-# Copyright 1999-2017 Gentoo Foundation |
362 |
+# Copyright 1999-2018 Gentoo Foundation |
363 |
# Distributed under the terms of the GNU General Public License v2 |
364 |
|
365 |
EAPI=6 |
366 |
@@ -55,12 +55,12 @@ COMMON_DEPEND=" |
367 |
sys-libs/db:4.7 |
368 |
sys-libs/db:4.6 |
369 |
sys-libs/db:4.5 ) ) |
370 |
- bzip2? ( app-arch/bzip2 ) |
371 |
+ bzip2? ( app-arch/bzip2:0= ) |
372 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
373 |
cjk? ( !gd? ( |
374 |
virtual/jpeg:0 |
375 |
media-libs/libpng:0= |
376 |
- sys-libs/zlib |
377 |
+ sys-libs/zlib:0= |
378 |
) ) |
379 |
coverage? ( dev-util/lcov ) |
380 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
381 |
@@ -69,12 +69,12 @@ COMMON_DEPEND=" |
382 |
exif? ( !gd? ( |
383 |
virtual/jpeg:0 |
384 |
media-libs/libpng:0= |
385 |
- sys-libs/zlib |
386 |
+ sys-libs/zlib:0= |
387 |
) ) |
388 |
firebird? ( dev-db/firebird ) |
389 |
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
390 |
- gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
391 |
- gmp? ( dev-libs/gmp:0 ) |
392 |
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) |
393 |
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
394 |
+ gmp? ( dev-libs/gmp:0= ) |
395 |
iconv? ( virtual/libiconv ) |
396 |
imap? ( virtual/imap-c-client[kerberos=,ssl=] ) |
397 |
intl? ( dev-libs/icu:= ) |
398 |
@@ -98,18 +98,18 @@ COMMON_DEPEND=" |
399 |
spell? ( >=app-text/aspell-0.50 ) |
400 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
401 |
ssl? ( |
402 |
- !libressl? ( dev-libs/openssl:0 ) |
403 |
- libressl? ( dev-libs/libressl ) |
404 |
+ !libressl? ( dev-libs/openssl:0= ) |
405 |
+ libressl? ( dev-libs/libressl:0= ) |
406 |
) |
407 |
tidy? ( app-text/htmltidy ) |
408 |
truetype? ( |
409 |
=media-libs/freetype-2* |
410 |
!gd? ( |
411 |
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
412 |
+ virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) |
413 |
) |
414 |
unicode? ( dev-libs/oniguruma:= ) |
415 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
416 |
- webp? ( media-libs/libwebp ) |
417 |
+ webp? ( media-libs/libwebp:0= ) |
418 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
419 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
420 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
421 |
@@ -117,11 +117,11 @@ COMMON_DEPEND=" |
422 |
xpm? ( |
423 |
x11-libs/libXpm |
424 |
virtual/jpeg:0 |
425 |
- media-libs/libpng:0= sys-libs/zlib |
426 |
+ media-libs/libpng:0= sys-libs/zlib:0= |
427 |
) |
428 |
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
429 |
- zip? ( sys-libs/zlib ) |
430 |
- zlib? ( sys-libs/zlib ) |
431 |
+ zip? ( sys-libs/zlib:0= ) |
432 |
+ zlib? ( sys-libs/zlib:0= ) |
433 |
" |
434 |
|
435 |
RDEPEND="${COMMON_DEPEND} |
436 |
|
437 |
diff --git a/dev-lang/php/php-7.1.12.ebuild b/dev-lang/php/php-7.1.12-r1.ebuild |
438 |
similarity index 98% |
439 |
rename from dev-lang/php/php-7.1.12.ebuild |
440 |
rename to dev-lang/php/php-7.1.12-r1.ebuild |
441 |
index 36bff5fe6f1..5430dc1231b 100644 |
442 |
--- a/dev-lang/php/php-7.1.12.ebuild |
443 |
+++ b/dev-lang/php/php-7.1.12-r1.ebuild |
444 |
@@ -1,4 +1,4 @@ |
445 |
-# Copyright 1999-2017 Gentoo Foundation |
446 |
+# Copyright 1999-2018 Gentoo Foundation |
447 |
# Distributed under the terms of the GNU General Public License v2 |
448 |
|
449 |
EAPI=6 |
450 |
@@ -55,7 +55,7 @@ COMMON_DEPEND=" |
451 |
sys-libs/db:4.7 |
452 |
sys-libs/db:4.6 |
453 |
sys-libs/db:4.5 ) ) |
454 |
- bzip2? ( app-arch/bzip2 ) |
455 |
+ bzip2? ( app-arch/bzip2:0= ) |
456 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
457 |
coverage? ( dev-util/lcov ) |
458 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
459 |
@@ -63,8 +63,8 @@ COMMON_DEPEND=" |
460 |
enchant? ( app-text/enchant ) |
461 |
firebird? ( dev-db/firebird ) |
462 |
gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
463 |
- gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
464 |
- gmp? ( dev-libs/gmp:0 ) |
465 |
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
466 |
+ gmp? ( dev-libs/gmp:0= ) |
467 |
iconv? ( virtual/libiconv ) |
468 |
imap? ( virtual/imap-c-client[kerberos=,ssl=] ) |
469 |
intl? ( dev-libs/icu:= ) |
470 |
@@ -88,22 +88,22 @@ COMMON_DEPEND=" |
471 |
spell? ( >=app-text/aspell-0.50 ) |
472 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
473 |
ssl? ( |
474 |
- !libressl? ( dev-libs/openssl:0 ) |
475 |
- libressl? ( dev-libs/libressl ) |
476 |
+ !libressl? ( dev-libs/openssl:0= ) |
477 |
+ libressl? ( dev-libs/libressl:0= ) |
478 |
) |
479 |
tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) |
480 |
truetype? ( =media-libs/freetype-2* ) |
481 |
unicode? ( dev-libs/oniguruma:= ) |
482 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
483 |
- webp? ( media-libs/libwebp ) |
484 |
+ webp? ( media-libs/libwebp:0= ) |
485 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
486 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
487 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
488 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
489 |
xpm? ( x11-libs/libXpm ) |
490 |
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
491 |
- zip? ( sys-libs/zlib ) |
492 |
- zlib? ( sys-libs/zlib ) |
493 |
+ zip? ( sys-libs/zlib:0= ) |
494 |
+ zlib? ( sys-libs/zlib:0= ) |
495 |
" |
496 |
|
497 |
RDEPEND="${COMMON_DEPEND} |
498 |
|
499 |
diff --git a/dev-lang/php/php-7.2.0.ebuild b/dev-lang/php/php-7.2.0-r1.ebuild |
500 |
similarity index 98% |
501 |
rename from dev-lang/php/php-7.2.0.ebuild |
502 |
rename to dev-lang/php/php-7.2.0-r1.ebuild |
503 |
index fd201e4c1c5..ec498c6c441 100644 |
504 |
--- a/dev-lang/php/php-7.2.0.ebuild |
505 |
+++ b/dev-lang/php/php-7.2.0-r1.ebuild |
506 |
@@ -56,15 +56,15 @@ COMMON_DEPEND=" |
507 |
sys-libs/db:4.7 |
508 |
sys-libs/db:4.6 |
509 |
sys-libs/db:4.5 ) ) |
510 |
- bzip2? ( app-arch/bzip2 ) |
511 |
+ bzip2? ( app-arch/bzip2:0= ) |
512 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
513 |
coverage? ( dev-util/lcov ) |
514 |
curl? ( >=net-misc/curl-7.10.5 ) |
515 |
enchant? ( app-text/enchant ) |
516 |
firebird? ( dev-db/firebird ) |
517 |
gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) |
518 |
- gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
519 |
- gmp? ( dev-libs/gmp:0 ) |
520 |
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
521 |
+ gmp? ( dev-libs/gmp:0= ) |
522 |
iconv? ( virtual/libiconv ) |
523 |
imap? ( virtual/imap-c-client[kerberos=,ssl=] ) |
524 |
intl? ( dev-libs/icu:= ) |
525 |
@@ -90,24 +90,24 @@ COMMON_DEPEND=" |
526 |
spell? ( >=app-text/aspell-0.50 ) |
527 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
528 |
ssl? ( |
529 |
- !libressl? ( dev-libs/openssl:0 ) |
530 |
- libressl? ( dev-libs/libressl ) |
531 |
+ !libressl? ( dev-libs/openssl:0= ) |
532 |
+ libressl? ( dev-libs/libressl:0= ) |
533 |
) |
534 |
tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) |
535 |
tokyocabinet? ( dev-db/tokyocabinet ) |
536 |
truetype? ( =media-libs/freetype-2* ) |
537 |
unicode? ( dev-libs/oniguruma:= ) |
538 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
539 |
- webp? ( media-libs/libwebp ) |
540 |
+ webp? ( media-libs/libwebp:0= ) |
541 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
542 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
543 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
544 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
545 |
xpm? ( x11-libs/libXpm ) |
546 |
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
547 |
- zip? ( sys-libs/zlib ) |
548 |
+ zip? ( sys-libs/zlib:0= ) |
549 |
zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) |
550 |
- zlib? ( sys-libs/zlib ) |
551 |
+ zlib? ( sys-libs/zlib:0= ) |
552 |
" |
553 |
|
554 |
RDEPEND="${COMMON_DEPEND} |