1 |
commit: 46e3bfa0e7adc1d2e5723403d8ec29aa8a01cd99 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 14:53:57 2021 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 14:57:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e3bfa0 |
7 |
|
8 |
dev-lang/php: new revisions with updated oracle dependencies. |
9 |
|
10 |
For a while, the dev-db/oracle-instantclient-basic package has been an |
11 |
"alias" for dev-db/oracle-instantclient[sdk], to ease migration to the |
12 |
latter. This commit adds revisions for the three supported PHP slots |
13 |
to finally update the dependency. I can't really test the Oracle |
14 |
client, but this should be at least as good as it was, given that |
15 |
oracle-instantclient-basic was just pulling in oracle-instantclient |
16 |
anyway. |
17 |
|
18 |
I've also added a REQUIRED_USE blocker for LDAP when building PHP with |
19 |
Oracle support. There are several reports that the instant client |
20 |
brings its own LDAP library, and that linking it against another one |
21 |
causes crashes. Again, who knows. Better safe than sorry? |
22 |
|
23 |
Closes: https://bugs.gentoo.org/765634 |
24 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
25 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
26 |
|
27 |
.../php/{php-8.0.1.ebuild => php-7.3.26-r1.ebuild} | 263 +++++++++++---------- |
28 |
.../php/{php-8.0.1.ebuild => php-7.4.14-r1.ebuild} | 33 ++- |
29 |
.../php/{php-8.0.1.ebuild => php-8.0.1-r1.ebuild} | 4 +- |
30 |
3 files changed, 162 insertions(+), 138 deletions(-) |
31 |
|
32 |
diff --git a/dev-lang/php/php-8.0.1.ebuild b/dev-lang/php/php-7.3.26-r1.ebuild |
33 |
similarity index 81% |
34 |
copy from dev-lang/php/php-8.0.1.ebuild |
35 |
copy to dev-lang/php/php-7.3.26-r1.ebuild |
36 |
index bda8c364a3e..7fbb614a6a3 100644 |
37 |
--- a/dev-lang/php/php-8.0.1.ebuild |
38 |
+++ b/dev-lang/php/php-7.3.26-r1.ebuild |
39 |
@@ -3,11 +3,9 @@ |
40 |
|
41 |
EAPI="7" |
42 |
|
43 |
-WANT_AUTOMAKE="none" |
44 |
- |
45 |
inherit flag-o-matic systemd autotools |
46 |
|
47 |
-MY_PV=${PV/_rc/rc} |
48 |
+MY_PV=${PV/_rc/RC} |
49 |
DESCRIPTION="The PHP language runtime engine" |
50 |
HOMEPAGE="https://www.php.net/" |
51 |
SRC_URI="https://www.php.net/distributions/${P}.tar.xz" |
52 |
@@ -35,47 +33,21 @@ IUSE="${IUSE} |
53 |
|
54 |
IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk |
55 |
coverage +ctype curl debug |
56 |
- enchant exif ffi +fileinfo +filter firebird |
57 |
- +flatfile ftp gd gdbm gmp +iconv imap inifile |
58 |
- intl iodbc ipv6 kerberos ldap ldap-sasl libedit libressl lmdb |
59 |
+ enchant exif +fileinfo +filter firebird |
60 |
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile |
61 |
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb |
62 |
mhash mssql mysql mysqli nls |
63 |
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm |
64 |
- readline selinux +session session-mm sharedmem |
65 |
+ readline recode selinux +session session-mm sharedmem |
66 |
+simplexml snmp soap sockets sodium spell sqlite ssl |
67 |
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp |
68 |
- +xml xmlreader xmlwriter xpm xslt zip zlib" |
69 |
- |
70 |
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
71 |
-REQUIRED_USE=" |
72 |
- || ( cli cgi fpm apache2 embed phpdbg ) |
73 |
- cli? ( ^^ ( readline libedit ) ) |
74 |
- !cli? ( ?? ( readline libedit ) ) |
75 |
- truetype? ( gd zlib ) |
76 |
- webp? ( gd zlib ) |
77 |
- cjk? ( gd zlib ) |
78 |
- exif? ( gd zlib ) |
79 |
- xpm? ( gd zlib ) |
80 |
- gd? ( zlib ) |
81 |
- simplexml? ( xml ) |
82 |
- soap? ( xml ) |
83 |
- xmlreader? ( xml ) |
84 |
- xmlwriter? ( xml ) |
85 |
- xslt? ( xml ) |
86 |
- ldap-sasl? ( ldap ) |
87 |
- qdbm? ( !gdbm ) |
88 |
- session-mm? ( session !threads ) |
89 |
- mysql? ( || ( mysqli pdo ) ) |
90 |
- firebird? ( pdo ) |
91 |
- mssql? ( pdo ) |
92 |
-" |
93 |
- |
94 |
-RESTRICT="!test? ( test )" |
95 |
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp |
96 |
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" |
97 |
|
98 |
# The supported (that is, autodetected) versions of BDB are listed in |
99 |
# the ./configure script. Other versions *work*, but we need to stick to |
100 |
# the ones that can be detected to avoid a repeat of bug #564824. |
101 |
COMMON_DEPEND=" |
102 |
- >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] |
103 |
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
104 |
>=dev-libs/libpcre2-10.30[unicode] |
105 |
fpm? ( acl? ( sys-apps/acl ) ) |
106 |
apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
107 |
@@ -89,30 +61,33 @@ COMMON_DEPEND=" |
108 |
bzip2? ( app-arch/bzip2:0= ) |
109 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
110 |
coverage? ( dev-util/lcov ) |
111 |
- curl? ( >=net-misc/curl-7.29.0 ) |
112 |
- enchant? ( app-text/enchant:2 ) |
113 |
- ffi? ( >=dev-libs/libffi-3.0.11 ) |
114 |
+ curl? ( >=net-misc/curl-7.10.5 ) |
115 |
+ enchant? ( <app-text/enchant-2.0:0 ) |
116 |
firebird? ( dev-db/firebird ) |
117 |
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) |
118 |
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) |
119 |
gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) |
120 |
gmp? ( dev-libs/gmp:0= ) |
121 |
iconv? ( virtual/libiconv ) |
122 |
imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) |
123 |
intl? ( dev-libs/icu:= ) |
124 |
+ iodbc? ( dev-db/libiodbc ) |
125 |
kerberos? ( virtual/krb5 ) |
126 |
ldap? ( >=net-nds/openldap-1.2.11 ) |
127 |
- ldap-sasl? ( dev-libs/cyrus-sasl ) |
128 |
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) |
129 |
libedit? ( dev-libs/libedit ) |
130 |
lmdb? ( dev-db/lmdb:= ) |
131 |
mssql? ( dev-db/freetds[mssql] ) |
132 |
nls? ( sys-devel/gettext ) |
133 |
- oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
134 |
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) |
135 |
- postgres? ( >=dev-db/postgresql-9.1:* ) |
136 |
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) |
137 |
+ odbc? ( >=dev-db/unixODBC-1.8.13 ) |
138 |
+ postgres? ( dev-db/postgresql:* ) |
139 |
qdbm? ( dev-db/qdbm ) |
140 |
readline? ( sys-libs/readline:0= ) |
141 |
+ recode? ( app-text/recode:0= ) |
142 |
session-mm? ( dev-libs/mm ) |
143 |
+ simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
144 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
145 |
+ soap? ( >=dev-libs/libxml2-2.6.8 ) |
146 |
sodium? ( dev-libs/libsodium:= ) |
147 |
spell? ( >=app-text/aspell-0.50 ) |
148 |
sqlite? ( >=dev-db/sqlite-3.7.6.3 ) |
149 |
@@ -124,11 +99,16 @@ COMMON_DEPEND=" |
150 |
tokyocabinet? ( dev-db/tokyocabinet ) |
151 |
truetype? ( =media-libs/freetype-2* ) |
152 |
unicode? ( dev-libs/oniguruma:= ) |
153 |
+ wddx? ( >=dev-libs/libxml2-2.6.8 ) |
154 |
webp? ( media-libs/libwebp:0= ) |
155 |
- xml? ( >=dev-libs/libxml2-2.9.0 ) |
156 |
+ xml? ( >=dev-libs/libxml2-2.6.8 ) |
157 |
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
158 |
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
159 |
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
160 |
xpm? ( x11-libs/libXpm ) |
161 |
- xslt? ( dev-libs/libxslt ) |
162 |
- zip? ( >=dev-libs/libzip-1.2.0:= ) |
163 |
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
164 |
+ zip? ( >=sys-libs/zlib-1.2.0.4:0= ) |
165 |
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) |
166 |
zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) |
167 |
" |
168 |
|
169 |
@@ -147,9 +127,42 @@ DEPEND="${COMMON_DEPEND} |
170 |
|
171 |
BDEPEND="virtual/pkgconfig" |
172 |
|
173 |
-PHP_MV="$(ver_cut 1)" |
174 |
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
175 |
+# The Oracle instant client provides its own incompatible ldap library. |
176 |
+REQUIRED_USE=" |
177 |
+ || ( cli cgi fpm apache2 embed phpdbg ) |
178 |
+ cli? ( ^^ ( readline libedit ) ) |
179 |
+ truetype? ( gd zlib ) |
180 |
+ webp? ( gd zlib ) |
181 |
+ cjk? ( gd zlib ) |
182 |
+ exif? ( gd zlib ) |
183 |
+ xpm? ( gd zlib ) |
184 |
+ gd? ( zlib ) |
185 |
+ simplexml? ( xml ) |
186 |
+ soap? ( xml ) |
187 |
+ wddx? ( xml ) |
188 |
+ xmlrpc? ( || ( xml iconv ) ) |
189 |
+ xmlreader? ( xml ) |
190 |
+ xslt? ( xml ) |
191 |
+ ldap-sasl? ( ldap ) |
192 |
+ mhash? ( hash ) |
193 |
+ oci8-instant-client? ( !ldap ) |
194 |
+ phar? ( hash ) |
195 |
+ qdbm? ( !gdbm ) |
196 |
+ readline? ( !libedit ) |
197 |
+ recode? ( !imap !mysqli !mysql ) |
198 |
+ session-mm? ( session !threads ) |
199 |
+ mysql? ( || ( mysqli pdo ) ) |
200 |
+ zip-encryption? ( zip ) |
201 |
+" |
202 |
+ |
203 |
+RESTRICT="!test? ( test )" |
204 |
|
205 |
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) |
206 |
+PATCHES=( |
207 |
+ "${FILESDIR}/php-freetype-2.9.1.patch" |
208 |
+) |
209 |
+ |
210 |
+PHP_MV="$(ver_cut 1)" |
211 |
|
212 |
php_install_ini() { |
213 |
local phpsapi="${1}" |
214 |
@@ -219,11 +232,10 @@ src_prepare() { |
215 |
sapi/fpm/php-fpm.conf.in \ |
216 |
|| die 'failed to move the include directory in php-fpm.conf' |
217 |
|
218 |
- # Emulate buildconf to support cross-compilation |
219 |
- rm -fr aclocal.m4 autom4te.cache config.cache \ |
220 |
- configure main/php_config.h.in || die |
221 |
- eautoconf --force |
222 |
- eautoheader |
223 |
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl |
224 |
+ # Force rebuilding aclocal.m4 |
225 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
226 |
+ eautoreconf |
227 |
} |
228 |
|
229 |
src_configure() { |
230 |
@@ -242,91 +254,101 @@ src_configure() { |
231 |
--with-libdir="$(get_libdir)" |
232 |
--localstatedir="${EPREFIX}/var" |
233 |
--without-pear |
234 |
- $(use_enable threads zts) |
235 |
+ $(use_enable threads maintainer-zts) |
236 |
) |
237 |
|
238 |
our_conf+=( |
239 |
$(use_with argon2 password-argon2 "${EPREFIX}/usr") |
240 |
- $(use_enable bcmath) |
241 |
+ $(use_enable bcmath bcmath) |
242 |
$(use_with bzip2 bz2 "${EPREFIX}/usr") |
243 |
- $(use_enable calendar) |
244 |
+ $(use_enable calendar calendar) |
245 |
$(use_enable coverage gcov) |
246 |
- $(use_enable ctype) |
247 |
- $(use_with curl) |
248 |
+ $(use_enable ctype ctype) |
249 |
+ $(use_with curl curl "${EPREFIX}/usr") |
250 |
$(use_enable xml dom) |
251 |
- $(use_with enchant) |
252 |
- $(use_enable exif) |
253 |
- $(use_with ffi) |
254 |
- $(use_enable fileinfo) |
255 |
- $(use_enable filter) |
256 |
- $(use_enable ftp) |
257 |
+ $(use_with enchant enchant "${EPREFIX}/usr") |
258 |
+ $(use_enable exif exif) |
259 |
+ $(use_enable fileinfo fileinfo) |
260 |
+ $(use_enable filter filter) |
261 |
+ $(use_enable ftp ftp) |
262 |
$(use_with nls gettext "${EPREFIX}/usr") |
263 |
$(use_with gmp gmp "${EPREFIX}/usr") |
264 |
+ $(use_enable hash hash) |
265 |
$(use_with mhash mhash "${EPREFIX}/usr") |
266 |
$(use_with iconv iconv \ |
267 |
$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) |
268 |
- $(use_enable intl) |
269 |
- $(use_enable ipv6) |
270 |
- $(use_with kerberos) |
271 |
- $(use_with xml libxml) |
272 |
+ $(use_enable intl intl) |
273 |
+ $(use_enable ipv6 ipv6) |
274 |
+ $(use_enable json json) |
275 |
+ $(use_with kerberos kerberos "${EPREFIX}/usr") |
276 |
+ $(use_enable xml libxml) |
277 |
+ $(use_with xml libxml-dir "${EPREFIX}/usr") |
278 |
$(use_enable unicode mbstring) |
279 |
- $(use_with ssl openssl) |
280 |
- $(use_enable pcntl) |
281 |
- $(use_enable phar) |
282 |
- $(use_enable pdo) |
283 |
- $(use_enable opcache) |
284 |
+ $(use_with unicode onig "${EPREFIX}/usr") |
285 |
+ $(use_with ssl openssl "${EPREFIX}/usr") |
286 |
+ $(use_with ssl openssl-dir "${EPREFIX}/usr") |
287 |
+ $(use_enable pcntl pcntl) |
288 |
+ $(use_enable phar phar) |
289 |
+ $(use_enable pdo pdo) |
290 |
+ $(use_enable opcache opcache) |
291 |
$(use_with postgres pgsql "${EPREFIX}/usr") |
292 |
- $(use_enable posix) |
293 |
+ $(use_enable posix posix) |
294 |
$(use_with spell pspell "${EPREFIX}/usr") |
295 |
- $(use_enable simplexml) |
296 |
+ $(use_with recode recode "${EPREFIX}/usr") |
297 |
+ $(use_enable simplexml simplexml) |
298 |
$(use_enable sharedmem shmop) |
299 |
$(use_with snmp snmp "${EPREFIX}/usr") |
300 |
- $(use_enable soap) |
301 |
- $(use_enable sockets) |
302 |
- $(use_with sodium) |
303 |
- $(use_with sqlite sqlite3) |
304 |
+ $(use_enable soap soap) |
305 |
+ $(use_enable sockets sockets) |
306 |
+ $(use_with sodium sodium "${EPREFIX}/usr") |
307 |
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr") |
308 |
$(use_enable sysvipc sysvmsg) |
309 |
$(use_enable sysvipc sysvsem) |
310 |
$(use_enable sysvipc sysvshm) |
311 |
$(use_with tidy tidy "${EPREFIX}/usr") |
312 |
- $(use_enable tokenizer) |
313 |
- $(use_enable xml) |
314 |
- $(use_enable xmlreader) |
315 |
- $(use_enable xmlwriter) |
316 |
- $(use_with xslt xsl) |
317 |
- $(use_with zip) |
318 |
+ $(use_enable tokenizer tokenizer) |
319 |
+ $(use_enable wddx wddx) |
320 |
+ $(use_enable xml xml) |
321 |
+ $(use_enable xmlreader xmlreader) |
322 |
+ $(use_enable xmlwriter xmlwriter) |
323 |
+ $(use_with xmlrpc xmlrpc) |
324 |
+ $(use_with xslt xsl "${EPREFIX}/usr") |
325 |
+ $(use_enable zip zip) |
326 |
+ $(use_with zip-encryption libzip "${EPREFIX}/usr") |
327 |
$(use_with zlib zlib "${EPREFIX}/usr") |
328 |
- $(use_enable debug) |
329 |
+ $(use_enable debug debug) |
330 |
) |
331 |
|
332 |
# DBA support |
333 |
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ |
334 |
|| use qdbm || use lmdb || use tokyocabinet ; then |
335 |
- our_conf+=( "--enable-dba" ) |
336 |
+ our_conf+=( "--enable-dba${shared}" ) |
337 |
fi |
338 |
|
339 |
# DBA drivers support |
340 |
our_conf+=( |
341 |
- $(use_with cdb) |
342 |
+ $(use_with cdb cdb) |
343 |
$(use_with berkdb db4 "${EPREFIX}/usr") |
344 |
- $(use_enable flatfile) |
345 |
+ $(use_enable flatfile flatfile) |
346 |
$(use_with gdbm gdbm "${EPREFIX}/usr") |
347 |
- $(use_enable inifile) |
348 |
+ $(use_enable inifile inifile) |
349 |
$(use_with qdbm qdbm "${EPREFIX}/usr") |
350 |
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr") |
351 |
$(use_with lmdb lmdb "${EPREFIX}/usr") |
352 |
) |
353 |
|
354 |
# Support for the GD graphics library |
355 |
our_conf+=( |
356 |
- $(use_with truetype freetype) |
357 |
+ $(use_with truetype freetype-dir "${EPREFIX}/usr") |
358 |
$(use_enable cjk gd-jis-conv) |
359 |
- $(use_with gd jpeg) |
360 |
- $(use_with xpm) |
361 |
- $(use_with webp) |
362 |
+ $(use_with gd jpeg-dir "${EPREFIX}/usr") |
363 |
+ $(use_with gd png-dir "${EPREFIX}/usr") |
364 |
+ $(use_with xpm xpm-dir "${EPREFIX}/usr") |
365 |
) |
366 |
+ if use webp; then |
367 |
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) |
368 |
+ fi |
369 |
# enable gd last, so configure can pick up the previous settings |
370 |
- our_conf+=( $(use_enable gd) ) |
371 |
+ our_conf+=( $(use_with gd gd) ) |
372 |
|
373 |
# IMAP support |
374 |
if use imap ; then |
375 |
@@ -336,11 +358,14 @@ src_configure() { |
376 |
) |
377 |
fi |
378 |
|
379 |
+ # Interbase/firebird support |
380 |
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) |
381 |
+ |
382 |
# LDAP support |
383 |
if use ldap ; then |
384 |
our_conf+=( |
385 |
$(use_with ldap ldap "${EPREFIX}/usr") |
386 |
- $(use_with ldap-sasl) |
387 |
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") |
388 |
) |
389 |
fi |
390 |
|
391 |
@@ -356,25 +381,10 @@ src_configure() { |
392 |
fi |
393 |
|
394 |
# ODBC support |
395 |
- if use odbc && use iodbc ; then |
396 |
- our_conf+=( |
397 |
- --without-unixODBC |
398 |
- --with-iodbc |
399 |
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") |
400 |
- ) |
401 |
- elif use odbc ; then |
402 |
- our_conf+=( |
403 |
- --with-unixODBC="${EPREFIX}/usr" |
404 |
- --without-iodbc |
405 |
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") |
406 |
- ) |
407 |
- else |
408 |
- our_conf+=( |
409 |
- --without-unixODBC |
410 |
- --without-iodbc |
411 |
- --without-pdo-odbc |
412 |
- ) |
413 |
- fi |
414 |
+ our_conf+=( |
415 |
+ $(use_with odbc unixODBC "${EPREFIX}/usr") |
416 |
+ $(use_with iodbc iodbc "${EPREFIX}/usr") |
417 |
+ ) |
418 |
|
419 |
# Oracle support |
420 |
our_conf+=( $(use_with oci8-instant-client oci8) ) |
421 |
@@ -385,8 +395,9 @@ src_configure() { |
422 |
$(use_with mssql pdo-dblib "${EPREFIX}/usr") |
423 |
$(use_with mysql pdo-mysql "${mysqllib}") |
424 |
$(use_with postgres pdo-pgsql) |
425 |
- $(use_with sqlite pdo-sqlite) |
426 |
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") |
427 |
$(use_with firebird pdo-firebird "${EPREFIX}/usr") |
428 |
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") |
429 |
$(use_with oci8-instant-client pdo-oci) |
430 |
) |
431 |
fi |
432 |
@@ -394,24 +405,28 @@ src_configure() { |
433 |
# readline/libedit support |
434 |
our_conf+=( |
435 |
$(use_with readline readline "${EPREFIX}/usr") |
436 |
- $(use_with libedit) |
437 |
+ $(use_with libedit libedit "${EPREFIX}/usr") |
438 |
) |
439 |
|
440 |
# Session support |
441 |
if use session ; then |
442 |
our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) |
443 |
else |
444 |
- our_conf+=( $(use_enable session) ) |
445 |
+ our_conf+=( $(use_enable session session) ) |
446 |
fi |
447 |
|
448 |
# Use pic for shared modules such as apache2's mod_php |
449 |
our_conf+=( --with-pic ) |
450 |
|
451 |
# we use the system copy of pcre |
452 |
- # --with-external-pcre affects ext/pcre |
453 |
+ # --with-pcre-regex affects ext/pcre |
454 |
+ # --with-pcre-dir affects ext/filter and ext/zip |
455 |
+ # --with-pcre-valgrind cannot be enabled with system pcre |
456 |
# Many arches don't support pcre-jit |
457 |
our_conf+=( |
458 |
- --with-external-pcre |
459 |
+ --with-pcre-regex="${EPREFIX}/usr" |
460 |
+ --with-pcre-dir="${EPREFIX}/usr" |
461 |
+ --without-pcre-valgrind |
462 |
--without-pcre-jit |
463 |
) |
464 |
|
465 |
@@ -538,7 +553,7 @@ src_install() { |
466 |
# We're specifically not using emake install-sapi as libtool |
467 |
# may cause unnecessary relink failures (see bug #351266) |
468 |
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" |
469 |
- newins ".libs/libphp$(get_libname)" \ |
470 |
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \ |
471 |
"libphp${PHP_MV}$(get_libname)" |
472 |
keepdir "/usr/$(get_libdir)/apache2/modules" |
473 |
else |
474 |
@@ -561,7 +576,7 @@ src_install() { |
475 |
source="sapi/fpm/php-fpm" |
476 |
;; |
477 |
embed) |
478 |
- source="libs/libphp$(get_libname)" |
479 |
+ source="libs/libphp${PHP_MV}$(get_libname)" |
480 |
;; |
481 |
phpdbg) |
482 |
source="sapi/phpdbg/phpdbg" |
483 |
|
484 |
diff --git a/dev-lang/php/php-8.0.1.ebuild b/dev-lang/php/php-7.4.14-r1.ebuild |
485 |
similarity index 96% |
486 |
copy from dev-lang/php/php-8.0.1.ebuild |
487 |
copy to dev-lang/php/php-7.4.14-r1.ebuild |
488 |
index bda8c364a3e..b2e7b3262c0 100644 |
489 |
--- a/dev-lang/php/php-8.0.1.ebuild |
490 |
+++ b/dev-lang/php/php-7.4.14-r1.ebuild |
491 |
@@ -7,7 +7,7 @@ WANT_AUTOMAKE="none" |
492 |
|
493 |
inherit flag-o-matic systemd autotools |
494 |
|
495 |
-MY_PV=${PV/_rc/rc} |
496 |
+MY_PV=${PV/_rc/RC} |
497 |
DESCRIPTION="The PHP language runtime engine" |
498 |
HOMEPAGE="https://www.php.net/" |
499 |
SRC_URI="https://www.php.net/distributions/${P}.tar.xz" |
500 |
@@ -37,15 +37,16 @@ IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk |
501 |
coverage +ctype curl debug |
502 |
enchant exif ffi +fileinfo +filter firebird |
503 |
+flatfile ftp gd gdbm gmp +iconv imap inifile |
504 |
- intl iodbc ipv6 kerberos ldap ldap-sasl libedit libressl lmdb |
505 |
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb |
506 |
mhash mssql mysql mysqli nls |
507 |
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm |
508 |
readline selinux +session session-mm sharedmem |
509 |
+simplexml snmp soap sockets sodium spell sqlite ssl |
510 |
sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp |
511 |
- +xml xmlreader xmlwriter xpm xslt zip zlib" |
512 |
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" |
513 |
|
514 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
515 |
+# The Oracle instant client provides its own incompatible ldap library. |
516 |
REQUIRED_USE=" |
517 |
|| ( cli cgi fpm apache2 embed phpdbg ) |
518 |
cli? ( ^^ ( readline libedit ) ) |
519 |
@@ -58,10 +59,12 @@ REQUIRED_USE=" |
520 |
gd? ( zlib ) |
521 |
simplexml? ( xml ) |
522 |
soap? ( xml ) |
523 |
+ xmlrpc? ( xml iconv ) |
524 |
xmlreader? ( xml ) |
525 |
xmlwriter? ( xml ) |
526 |
xslt? ( xml ) |
527 |
ldap-sasl? ( ldap ) |
528 |
+ oci8-instant-client? ( !ldap ) |
529 |
qdbm? ( !gdbm ) |
530 |
session-mm? ( session !threads ) |
531 |
mysql? ( || ( mysqli pdo ) ) |
532 |
@@ -75,7 +78,7 @@ RESTRICT="!test? ( test )" |
533 |
# the ./configure script. Other versions *work*, but we need to stick to |
534 |
# the ones that can be detected to avoid a repeat of bug #564824. |
535 |
COMMON_DEPEND=" |
536 |
- >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] |
537 |
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] |
538 |
>=dev-libs/libpcre2-10.30[unicode] |
539 |
fpm? ( acl? ( sys-apps/acl ) ) |
540 |
apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) |
541 |
@@ -89,8 +92,8 @@ COMMON_DEPEND=" |
542 |
bzip2? ( app-arch/bzip2:0= ) |
543 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
544 |
coverage? ( dev-util/lcov ) |
545 |
- curl? ( >=net-misc/curl-7.29.0 ) |
546 |
- enchant? ( app-text/enchant:2 ) |
547 |
+ curl? ( >=net-misc/curl-7.10.5 ) |
548 |
+ enchant? ( <app-text/enchant-2.0:0 ) |
549 |
ffi? ( >=dev-libs/libffi-3.0.11 ) |
550 |
firebird? ( dev-db/firebird ) |
551 |
gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) |
552 |
@@ -106,9 +109,9 @@ COMMON_DEPEND=" |
553 |
lmdb? ( dev-db/lmdb:= ) |
554 |
mssql? ( dev-db/freetds[mssql] ) |
555 |
nls? ( sys-devel/gettext ) |
556 |
- oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
557 |
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) |
558 |
odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) |
559 |
- postgres? ( >=dev-db/postgresql-9.1:* ) |
560 |
+ postgres? ( dev-db/postgresql:* ) |
561 |
qdbm? ( dev-db/qdbm ) |
562 |
readline? ( sys-libs/readline:0= ) |
563 |
session-mm? ( dev-libs/mm ) |
564 |
@@ -125,7 +128,7 @@ COMMON_DEPEND=" |
565 |
truetype? ( =media-libs/freetype-2* ) |
566 |
unicode? ( dev-libs/oniguruma:= ) |
567 |
webp? ( media-libs/libwebp:0= ) |
568 |
- xml? ( >=dev-libs/libxml2-2.9.0 ) |
569 |
+ xml? ( >=dev-libs/libxml2-2.7.6 ) |
570 |
xpm? ( x11-libs/libXpm ) |
571 |
xslt? ( dev-libs/libxslt ) |
572 |
zip? ( >=dev-libs/libzip-1.2.0:= ) |
573 |
@@ -149,7 +152,9 @@ BDEPEND="virtual/pkgconfig" |
574 |
|
575 |
PHP_MV="$(ver_cut 1)" |
576 |
|
577 |
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) |
578 |
+PATCHES=( |
579 |
+ "${FILESDIR}"/php-iodbc-header-location.patch |
580 |
+) |
581 |
|
582 |
php_install_ini() { |
583 |
local phpsapi="${1}" |
584 |
@@ -242,7 +247,7 @@ src_configure() { |
585 |
--with-libdir="$(get_libdir)" |
586 |
--localstatedir="${EPREFIX}/var" |
587 |
--without-pear |
588 |
- $(use_enable threads zts) |
589 |
+ $(use_enable threads maintainer-zts) |
590 |
) |
591 |
|
592 |
our_conf+=( |
593 |
@@ -267,6 +272,7 @@ src_configure() { |
594 |
$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) |
595 |
$(use_enable intl) |
596 |
$(use_enable ipv6) |
597 |
+ $(use_enable json) |
598 |
$(use_with kerberos) |
599 |
$(use_with xml libxml) |
600 |
$(use_enable unicode mbstring) |
601 |
@@ -293,6 +299,7 @@ src_configure() { |
602 |
$(use_enable xml) |
603 |
$(use_enable xmlreader) |
604 |
$(use_enable xmlwriter) |
605 |
+ $(use_with xmlrpc) |
606 |
$(use_with xslt xsl) |
607 |
$(use_with zip) |
608 |
$(use_with zlib zlib "${EPREFIX}/usr") |
609 |
@@ -538,7 +545,7 @@ src_install() { |
610 |
# We're specifically not using emake install-sapi as libtool |
611 |
# may cause unnecessary relink failures (see bug #351266) |
612 |
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" |
613 |
- newins ".libs/libphp$(get_libname)" \ |
614 |
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \ |
615 |
"libphp${PHP_MV}$(get_libname)" |
616 |
keepdir "/usr/$(get_libdir)/apache2/modules" |
617 |
else |
618 |
@@ -561,7 +568,7 @@ src_install() { |
619 |
source="sapi/fpm/php-fpm" |
620 |
;; |
621 |
embed) |
622 |
- source="libs/libphp$(get_libname)" |
623 |
+ source="libs/libphp${PHP_MV}$(get_libname)" |
624 |
;; |
625 |
phpdbg) |
626 |
source="sapi/phpdbg/phpdbg" |
627 |
|
628 |
diff --git a/dev-lang/php/php-8.0.1.ebuild b/dev-lang/php/php-8.0.1-r1.ebuild |
629 |
similarity index 99% |
630 |
rename from dev-lang/php/php-8.0.1.ebuild |
631 |
rename to dev-lang/php/php-8.0.1-r1.ebuild |
632 |
index bda8c364a3e..cdcf7cd4d0c 100644 |
633 |
--- a/dev-lang/php/php-8.0.1.ebuild |
634 |
+++ b/dev-lang/php/php-8.0.1-r1.ebuild |
635 |
@@ -46,6 +46,7 @@ IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk |
636 |
+xml xmlreader xmlwriter xpm xslt zip zlib" |
637 |
|
638 |
# Without USE=readline or libedit, the interactive "php -a" CLI will hang. |
639 |
+# The Oracle instant client provides its own incompatible ldap library. |
640 |
REQUIRED_USE=" |
641 |
|| ( cli cgi fpm apache2 embed phpdbg ) |
642 |
cli? ( ^^ ( readline libedit ) ) |
643 |
@@ -62,6 +63,7 @@ REQUIRED_USE=" |
644 |
xmlwriter? ( xml ) |
645 |
xslt? ( xml ) |
646 |
ldap-sasl? ( ldap ) |
647 |
+ oci8-instant-client? ( !ldap ) |
648 |
qdbm? ( !gdbm ) |
649 |
session-mm? ( session !threads ) |
650 |
mysql? ( || ( mysqli pdo ) ) |
651 |
@@ -106,7 +108,7 @@ COMMON_DEPEND=" |
652 |
lmdb? ( dev-db/lmdb:= ) |
653 |
mssql? ( dev-db/freetds[mssql] ) |
654 |
nls? ( sys-devel/gettext ) |
655 |
- oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
656 |
+ oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) |
657 |
odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) |
658 |
postgres? ( >=dev-db/postgresql-9.1:* ) |
659 |
qdbm? ( dev-db/qdbm ) |