1 |
olemarkus 12/02/06 13:41:27 |
2 |
|
3 |
Modified: php-5.3.10.ebuild php-5.3.9.ebuild |
4 |
php-5.4.0_rc7.ebuild ChangeLog |
5 |
Added: php-5.3.10-r1.ebuild |
6 |
Removed: php-5.4.0_rc6.ebuild |
7 |
Log: |
8 |
Fixed compile fail against libpcre. Bug 402357 |
9 |
Non-fixed versions block libpcre-8.30+ |
10 |
|
11 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
12 |
|
13 |
Revision Changes Path |
14 |
1.5 dev-lang/php/php-5.3.10.ebuild |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.10.ebuild?rev=1.5&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.10.ebuild?rev=1.5&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.10.ebuild?r1=1.4&r2=1.5 |
19 |
|
20 |
Index: php-5.3.10.ebuild |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v |
23 |
retrieving revision 1.4 |
24 |
retrieving revision 1.5 |
25 |
diff -u -r1.4 -r1.5 |
26 |
--- php-5.3.10.ebuild 6 Feb 2012 01:15:38 -0000 1.4 |
27 |
+++ php-5.3.10.ebuild 6 Feb 2012 13:41:27 -0000 1.5 |
28 |
@@ -1,6 +1,6 @@ |
29 |
# Copyright 1999-2012 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.4 2012/02/06 01:15:38 jer Exp $ |
32 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.5 2012/02/06 13:41:27 olemarkus Exp $ |
33 |
|
34 |
EAPI=4 |
35 |
|
36 |
@@ -115,6 +115,7 @@ |
37 |
DEPEND="!dev-lang/php:5 |
38 |
>=app-admin/eselect-php-0.6.2 |
39 |
>=dev-libs/libpcre-8.12[unicode] |
40 |
+ <dev-libs/libpcre-8.30[unicode] |
41 |
apache2? ( www-servers/apache[threads=] ) |
42 |
berkdb? ( =sys-libs/db-4* ) |
43 |
bzip2? ( app-arch/bzip2 ) |
44 |
|
45 |
|
46 |
|
47 |
1.9 dev-lang/php/php-5.3.9.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.9.ebuild?rev=1.9&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.9.ebuild?rev=1.9&content-type=text/plain |
51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.9.ebuild?r1=1.8&r2=1.9 |
52 |
|
53 |
Index: php-5.3.9.ebuild |
54 |
=================================================================== |
55 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v |
56 |
retrieving revision 1.8 |
57 |
retrieving revision 1.9 |
58 |
diff -u -r1.8 -r1.9 |
59 |
--- php-5.3.9.ebuild 17 Jan 2012 05:18:51 -0000 1.8 |
60 |
+++ php-5.3.9.ebuild 6 Feb 2012 13:41:27 -0000 1.9 |
61 |
@@ -1,6 +1,6 @@ |
62 |
# Copyright 1999-2012 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.8 2012/01/17 05:18:51 jer Exp $ |
65 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.9 2012/02/06 13:41:27 olemarkus Exp $ |
66 |
|
67 |
EAPI=4 |
68 |
|
69 |
@@ -115,6 +115,7 @@ |
70 |
DEPEND="!dev-lang/php:5 |
71 |
>=app-admin/eselect-php-0.6.2 |
72 |
>=dev-libs/libpcre-8.12[unicode] |
73 |
+ <dev-libs/libpcre-8.30[unicode] |
74 |
apache2? ( www-servers/apache[threads=] ) |
75 |
berkdb? ( =sys-libs/db-4* ) |
76 |
bzip2? ( app-arch/bzip2 ) |
77 |
|
78 |
|
79 |
|
80 |
1.2 dev-lang/php/php-5.4.0_rc7.ebuild |
81 |
|
82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild?rev=1.2&view=markup |
83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild?rev=1.2&content-type=text/plain |
84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild?r1=1.1&r2=1.2 |
85 |
|
86 |
Index: php-5.4.0_rc7.ebuild |
87 |
=================================================================== |
88 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild,v |
89 |
retrieving revision 1.1 |
90 |
retrieving revision 1.2 |
91 |
diff -u -r1.1 -r1.2 |
92 |
--- php-5.4.0_rc7.ebuild 3 Feb 2012 09:51:09 -0000 1.1 |
93 |
+++ php-5.4.0_rc7.ebuild 6 Feb 2012 13:41:27 -0000 1.2 |
94 |
@@ -1,6 +1,6 @@ |
95 |
# Copyright 1999-2012 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild,v 1.1 2012/02/03 09:51:09 olemarkus Exp $ |
98 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild,v 1.2 2012/02/06 13:41:27 olemarkus Exp $ |
99 |
|
100 |
EAPI=4 |
101 |
|
102 |
@@ -118,6 +118,7 @@ |
103 |
DEPEND="!dev-lang/php:5 |
104 |
>=app-admin/eselect-php-0.6.2 |
105 |
>=dev-libs/libpcre-8.12[unicode] |
106 |
+ <dev-libs/libpcre-8.30[unicode] |
107 |
apache2? ( www-servers/apache[threads=] ) |
108 |
berkdb? ( =sys-libs/db-4* ) |
109 |
bzip2? ( app-arch/bzip2 ) |
110 |
|
111 |
|
112 |
|
113 |
1.552 dev-lang/php/ChangeLog |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.552&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.552&content-type=text/plain |
117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.551&r2=1.552 |
118 |
|
119 |
Index: ChangeLog |
120 |
=================================================================== |
121 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v |
122 |
retrieving revision 1.551 |
123 |
retrieving revision 1.552 |
124 |
diff -u -r1.551 -r1.552 |
125 |
--- ChangeLog 6 Feb 2012 01:15:38 -0000 1.551 |
126 |
+++ ChangeLog 6 Feb 2012 13:41:27 -0000 1.552 |
127 |
@@ -1,6 +1,14 @@ |
128 |
# ChangeLog for dev-lang/php |
129 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
130 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.551 2012/02/06 01:15:38 jer Exp $ |
131 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.552 2012/02/06 13:41:27 olemarkus Exp $ |
132 |
+ |
133 |
+*php-5.3.10-r1 (06 Feb 2012) |
134 |
+ |
135 |
+ 06 Feb 2012; Ole Markus With <olemarkus@g.o> +php-5.3.10-r1.ebuild, |
136 |
+ -php-5.4.0_rc6.ebuild, php-5.3.10.ebuild, php-5.3.9.ebuild, |
137 |
+ php-5.4.0_rc7.ebuild: |
138 |
+ Fixed compile fail against libpcre. Bug 402357 Non-fixed versions block |
139 |
+ libpcre-8.30+ |
140 |
|
141 |
06 Feb 2012; Jeroen Roovers <jer@g.o> php-5.3.10.ebuild: |
142 |
Stable for HPPA (bug #401997). |
143 |
|
144 |
|
145 |
|
146 |
1.1 dev-lang/php/php-5.3.10-r1.ebuild |
147 |
|
148 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.10-r1.ebuild?rev=1.1&view=markup |
149 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.10-r1.ebuild?rev=1.1&content-type=text/plain |
150 |
|
151 |
Index: php-5.3.10-r1.ebuild |
152 |
=================================================================== |
153 |
# Copyright 1999-2012 Gentoo Foundation |
154 |
# Distributed under the terms of the GNU General Public License v2 |
155 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10-r1.ebuild,v 1.1 2012/02/06 13:41:27 olemarkus Exp $ |
156 |
|
157 |
EAPI=4 |
158 |
|
159 |
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" |
160 |
|
161 |
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool |
162 |
|
163 |
SUHOSIN_VERSION="5.3.9-0.9.10" |
164 |
FPM_VERSION="builtin" |
165 |
EXPECTED_TEST_FAILURES="" |
166 |
|
167 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
168 |
|
169 |
function php_get_uri () |
170 |
{ |
171 |
case "${1}" in |
172 |
"php-pre") |
173 |
echo "http://downloads.php.net/johannes/${2}" |
174 |
;; |
175 |
"php") |
176 |
echo "http://www.php.net/distributions/${2}" |
177 |
;; |
178 |
"suhosin") |
179 |
echo "http://download.suhosin.org/${2}" |
180 |
;; |
181 |
"olemarkus") |
182 |
echo "http://olemarkus.org/~olemarkus/gentoo/${2}" |
183 |
;; |
184 |
"gentoo") |
185 |
echo "mirror://gentoo/${2}" |
186 |
;; |
187 |
*) |
188 |
die "unhandled case in php_get_uri" |
189 |
;; |
190 |
esac |
191 |
} |
192 |
|
193 |
PHP_MV="$(get_major_version)" |
194 |
|
195 |
# alias, so we can handle different types of releases (finals, rcs, alphas, |
196 |
# betas, ...) w/o changing the whole ebuild |
197 |
PHP_PV="${PV/_rc/RC}" |
198 |
PHP_RELEASE="php" |
199 |
PHP_P="${PN}-${PHP_PV}" |
200 |
|
201 |
PHP_PATCHSET_LOC="olemarkus" |
202 |
|
203 |
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" |
204 |
|
205 |
PHP_PATCHSET="1" |
206 |
PHP_PATCHSET_URI=" |
207 |
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" |
208 |
|
209 |
PHP_FPM_INIT_VER="4" |
210 |
PHP_FPM_CONF_VER="1" |
211 |
|
212 |
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then |
213 |
# in some cases we use our own suhosin patch (very recent version, |
214 |
# patch conflicts, etc.) |
215 |
SUHOSIN_TYPE="olemarkus" |
216 |
else |
217 |
SUHOSIN_TYPE="suhosin" |
218 |
fi |
219 |
|
220 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
221 |
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; |
222 |
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" |
223 |
fi |
224 |
|
225 |
SRC_URI=" |
226 |
${PHP_SRC_URI} |
227 |
${PHP_PATCHSET_URI}" |
228 |
|
229 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
230 |
SRC_URI="${SRC_URI} |
231 |
suhosin? ( ${SUHOSIN_URI} )" |
232 |
fi |
233 |
|
234 |
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." |
235 |
HOMEPAGE="http://php.net/" |
236 |
LICENSE="PHP-3" |
237 |
|
238 |
SLOT="$(get_version_component_range 1-2)" |
239 |
S="${WORKDIR}/${PHP_P}" |
240 |
|
241 |
# We can build the following SAPIs in the given order |
242 |
SAPIS="embed cli cgi fpm apache2" |
243 |
|
244 |
# Gentoo-specific, common features |
245 |
IUSE="kolab" |
246 |
|
247 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
248 |
IUSE="${IUSE} |
249 |
${SAPIS/cli/+cli} |
250 |
threads" |
251 |
|
252 |
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk |
253 |
crypt +ctype curl curlwrappers debug doc |
254 |
enchant exif frontbase +fileinfo +filter firebird |
255 |
flatfile ftp gd gdbm gmp +hash +iconv imap inifile |
256 |
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash |
257 |
mssql mysql mysqlnd mysqli nls |
258 |
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm |
259 |
readline recode +session sharedmem |
260 |
+simplexml snmp soap sockets spell sqlite sqlite3 ssl |
261 |
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx |
262 |
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" |
263 |
|
264 |
# Enable suhosin if available |
265 |
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" |
266 |
|
267 |
DEPEND="!dev-lang/php:5 |
268 |
>=app-admin/eselect-php-0.6.2 |
269 |
>=dev-libs/libpcre-8.12[unicode] |
270 |
apache2? ( www-servers/apache[threads=] ) |
271 |
berkdb? ( =sys-libs/db-4* ) |
272 |
bzip2? ( app-arch/bzip2 ) |
273 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
274 |
cjk? ( !gd? ( |
275 |
virtual/jpeg |
276 |
media-libs/libpng |
277 |
sys-libs/zlib |
278 |
) ) |
279 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
280 |
curl? ( >=net-misc/curl-7.10.5 ) |
281 |
enchant? ( app-text/enchant ) |
282 |
exif? ( !gd? ( |
283 |
virtual/jpeg |
284 |
media-libs/libpng |
285 |
sys-libs/zlib |
286 |
) ) |
287 |
firebird? ( dev-db/firebird ) |
288 |
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) |
289 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
290 |
gmp? ( >=dev-libs/gmp-4.1.2 ) |
291 |
iconv? ( virtual/libiconv ) |
292 |
imap? ( virtual/imap-c-client[ssl=] ) |
293 |
intl? ( dev-libs/icu ) |
294 |
iodbc? ( dev-db/libiodbc ) |
295 |
kerberos? ( virtual/krb5 ) |
296 |
kolab? ( >=net-libs/c-client-2004g-r1 ) |
297 |
ldap? ( >=net-nds/openldap-1.2.11 ) |
298 |
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) |
299 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
300 |
mssql? ( dev-db/freetds[mssql] ) |
301 |
!mysqlnd? ( |
302 |
mysql? ( virtual/mysql ) |
303 |
mysqli? ( >=virtual/mysql-4.1 ) |
304 |
) |
305 |
nls? ( sys-devel/gettext ) |
306 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
307 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
308 |
postgres? ( dev-db/postgresql-base ) |
309 |
qdbm? ( dev-db/qdbm ) |
310 |
readline? ( sys-libs/readline ) |
311 |
recode? ( app-text/recode ) |
312 |
sharedmem? ( dev-libs/mm ) |
313 |
simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
314 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
315 |
soap? ( >=dev-libs/libxml2-2.6.8 ) |
316 |
spell? ( >=app-text/aspell-0.50 ) |
317 |
sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) |
318 |
sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) |
319 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
320 |
sybase-ct? ( dev-db/freetds ) |
321 |
tidy? ( app-text/htmltidy ) |
322 |
truetype? ( |
323 |
=media-libs/freetype-2* |
324 |
>=media-libs/t1lib-5.0.0 |
325 |
!gd? ( |
326 |
virtual/jpeg media-libs/libpng sys-libs/zlib ) |
327 |
) |
328 |
unicode? ( dev-libs/oniguruma ) |
329 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
330 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
331 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
332 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
333 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
334 |
xpm? ( |
335 |
x11-libs/libXpm |
336 |
virtual/jpeg |
337 |
media-libs/libpng sys-libs/zlib |
338 |
) |
339 |
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
340 |
zip? ( sys-libs/zlib ) |
341 |
zlib? ( sys-libs/zlib ) |
342 |
virtual/mta |
343 |
" |
344 |
|
345 |
php="=${CATEGORY}/${PF}" |
346 |
|
347 |
REQUIRED_USE=" |
348 |
truetype? ( gd ) |
349 |
cjk? ( gd ) |
350 |
exif? ( gd ) |
351 |
|
352 |
xpm? ( gd ) |
353 |
gd? ( zlib ) |
354 |
simplexml? ( xml ) |
355 |
soap? ( xml ) |
356 |
wddx? ( xml ) |
357 |
xmlrpc? ( || ( xml iconv ) ) |
358 |
xmlreader? ( xml ) |
359 |
xsl? ( xml ) |
360 |
ldap-sasl? ( ldap ) |
361 |
kolab? ( imap ) |
362 |
mhash? ( hash ) |
363 |
phar? ( hash ) |
364 |
mysqlnd? ( || ( |
365 |
mysql |
366 |
mysqli |
367 |
pdo |
368 |
) ) |
369 |
|
370 |
qdbm? ( !gdbm ) |
371 |
readline? ( !libedit ) |
372 |
recode? ( !imap !mysql !mysqli ) |
373 |
sharedmem? ( !threads ) |
374 |
|
375 |
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" |
376 |
|
377 |
DEPEND="${DEPEND} |
378 |
enchant? ( !dev-php5/pecl-enchant ) |
379 |
fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) |
380 |
filter? ( !dev-php5/pecl-filter ) |
381 |
json? ( !dev-php5/pecl-json ) |
382 |
phar? ( !dev-php5/pecl-phar ) |
383 |
zip? ( !dev-php5/pecl-zip )" |
384 |
|
385 |
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( |
386 |
=${CATEGORY}/${PN}-${SLOT}*[unicode] )" |
387 |
|
388 |
RDEPEND="${DEPEND}" |
389 |
|
390 |
DEPEND="${DEPEND} |
391 |
sys-devel/flex |
392 |
>=sys-devel/m4-1.4.3 |
393 |
>=sys-devel/libtool-1.5.18" |
394 |
|
395 |
# They are in PDEPEND because we need PHP installed first! |
396 |
PDEPEND="doc? ( app-doc/php-docs )" |
397 |
|
398 |
# No longer depend on the extension. The suhosin USE flag only installs the |
399 |
# patch |
400 |
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" |
401 |
|
402 |
# Allow users to install production version if they want to |
403 |
|
404 |
case "${PHP_INI_VERSION}" in |
405 |
production|development) |
406 |
;; |
407 |
*) |
408 |
PHP_INI_VERSION="development" |
409 |
;; |
410 |
esac |
411 |
|
412 |
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" |
413 |
PHP_INI_FILE="php.ini" |
414 |
|
415 |
want_apache |
416 |
|
417 |
# eblit-core |
418 |
# Usage: <function> [version] [eval] |
419 |
# Main eblit engine |
420 |
eblit-core() { |
421 |
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" |
422 |
local e v func=$1 ver=$2 eval_=$3 |
423 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
424 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
425 |
if [[ -e ${e} ]] ; then |
426 |
. "${e}" |
427 |
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" |
428 |
return 0 |
429 |
fi |
430 |
done |
431 |
return 1 |
432 |
} |
433 |
|
434 |
# eblit-include |
435 |
# Usage: [--skip] <function> [version] |
436 |
# Includes an "eblit" -- a chunk of common code among ebuilds in a given |
437 |
# package so that its functions can be sourced and utilized within the |
438 |
# ebuild. |
439 |
eblit-include() { |
440 |
local skipable=false r=0 |
441 |
[[ $1 == "--skip" ]] && skipable=true && shift |
442 |
[[ $1 == pkg_* ]] && skipable=true |
443 |
|
444 |
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]" |
445 |
eblit-core $1 $2 |
446 |
r="$?" |
447 |
${skipable} && return 0 |
448 |
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" |
449 |
} |
450 |
|
451 |
# eblit-run-maybe |
452 |
# Usage: <function> |
453 |
# Runs a function if it is defined in an eblit |
454 |
eblit-run-maybe() { |
455 |
[[ $(type -t "$@") == "function" ]] && "$@" |
456 |
} |
457 |
|
458 |
# eblit-run |
459 |
# Usage: <function> [version] |
460 |
# Runs a function defined in an eblit |
461 |
eblit-run() { |
462 |
eblit-include --skip common "v2" |
463 |
eblit-include "$@" |
464 |
eblit-run-maybe eblit-$1-pre |
465 |
eblit-${PN}-$1 |
466 |
eblit-run-maybe eblit-$1-post |
467 |
} |
468 |
|
469 |
# eblit-pkg |
470 |
# Usage: <phase> [version] |
471 |
# Includes the given functions AND evals them so they're included in the binpkgs |
472 |
eblit-pkg() { |
473 |
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" |
474 |
eblit-core $1 $2 1 |
475 |
} |
476 |
|
477 |
eblit-pkg pkg_setup v3 |
478 |
|
479 |
src_prepare() { eblit-run src_prepare v3 ; } |
480 |
src_configure() { eblit-run src_configure v53 ; } |
481 |
src_compile() { eblit-run src_compile v1 ; } |
482 |
src_install() { eblit-run src_install v3 ; } |
483 |
src_test() { eblit-run src_test v1 ; } |
484 |
|
485 |
#Do not use eblit for this because it will not get sourced when installing from |
486 |
#binary package (bug #380845) |
487 |
pkg_postinst() { |
488 |
# Output some general info to the user |
489 |
if use apache2 ; then |
490 |
APACHE2_MOD_DEFINE="PHP5" |
491 |
APACHE2_MOD_CONF="70_mod_php5" |
492 |
apache-module_pkg_postinst |
493 |
fi |
494 |
|
495 |
# Create the symlinks for php |
496 |
for m in ${SAPIS}; do |
497 |
[[ ${m} == 'embed' ]] && continue; |
498 |
if use $m ; then |
499 |
local ci=$(eselect php show $m) |
500 |
if [[ -z $ci ]]; then |
501 |
eselect php set $m php${SLOT} |
502 |
einfo "Switched ${m} to use php:${SLOT}" |
503 |
einfo |
504 |
elif [[ $ci != "php${SLOT}" ]] ; then |
505 |
elog "To switch $m to use php:${SLOT}, run" |
506 |
elog " eselect php set $m php${SLOT}" |
507 |
elog |
508 |
fi |
509 |
fi |
510 |
done |
511 |
|
512 |
elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" |
513 |
elog "to compile extensions for the ${SLOT} ABI" |
514 |
elog |
515 |
if ! use readline && use cli ; then |
516 |
ewarn "Note that in order to use php interactivly, you need to enable" |
517 |
ewarn "the readline USE flag or php -a will hang" |
518 |
fi |
519 |
elog |
520 |
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." |
521 |
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" |
522 |
elog "'production' or 'development' in /etc/make.conf" |
523 |
ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" |
524 |
|
525 |
# check for not yet migrated old style config dirs |
526 |
ls "${ROOT}"/etc/php/*-php5 &>/dev/null |
527 |
if [[ $? -eq 0 ]]; then |
528 |
ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" |
529 |
ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" |
530 |
fi |
531 |
elog |
532 |
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" |
533 |
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" |
534 |
elog |
535 |
|
536 |
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then |
537 |
ewarn "The suhosin USE flag now only installs the suhosin patch!" |
538 |
ewarn "If you want the suhosin extension, make sure you install" |
539 |
ewarn " dev-php5/suhosin" |
540 |
ewarn |
541 |
fi |
542 |
} |