1 |
olemarkus 10/10/31 19:01:55 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: php-5.3.3-r3.ebuild php-5.2.14-r2.ebuild |
5 |
Removed: php-5.2.14-r1.ebuild php-5.3.3-r2.ebuild |
6 |
Log: |
7 |
Revbumping with a new patchset (bug 342397) |
8 |
|
9 |
(Portage version: 2.1.9.23/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.432 dev-lang/php/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.432&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.432&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.431&r2=1.432 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v |
21 |
retrieving revision 1.431 |
22 |
retrieving revision 1.432 |
23 |
diff -u -r1.431 -r1.432 |
24 |
--- ChangeLog 31 Oct 2010 17:24:34 -0000 1.431 |
25 |
+++ ChangeLog 31 Oct 2010 19:01:55 -0000 1.432 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for dev-lang/php |
28 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.431 2010/10/31 17:24:34 mabi Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.432 2010/10/31 19:01:55 olemarkus Exp $ |
31 |
+ |
32 |
+*php-5.3.3-r3 (31 Oct 2010) |
33 |
+*php-5.2.14-r2 (31 Oct 2010) |
34 |
+ |
35 |
+ 31 Oct 2010; <olemarkus@g.o> -php-5.2.14-r1.ebuild, |
36 |
+ +php-5.2.14-r2.ebuild, -php-5.3.3-r2.ebuild, +php-5.3.3-r3.ebuild: |
37 |
+ Revbumping with a new patchset (bug 342397) |
38 |
|
39 |
31 Oct 2010; Matti Bickel <mabi@g.o> |
40 |
files/eblits/src_configure-v2.eblit: |
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-lang/php/php-5.3.3-r3.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.3-r3.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.3-r3.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: php-5.3.3-r3.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2010 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r3.ebuild,v 1.1 2010/10/31 19:01:55 olemarkus Exp $ |
54 |
|
55 |
EAPI=2 |
56 |
|
57 |
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" |
58 |
|
59 |
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool |
60 |
|
61 |
SUHOSIN_VERSION="${PV}-0.9.10" |
62 |
FPM_VERSION="builtin" |
63 |
EXPECTED_TEST_FAILURES="" |
64 |
|
65 |
KEYWORDS="~amd64 ~x86" |
66 |
|
67 |
function php_get_uri () |
68 |
{ |
69 |
case "${1}" in |
70 |
"php-pre") |
71 |
echo "http://downloads.php.net/johannes/${2}" |
72 |
;; |
73 |
"php") |
74 |
echo "http://www.php.net/distributions/${2}" |
75 |
;; |
76 |
"suhosin") |
77 |
echo "http://download.suhosin.org/${2}" |
78 |
;; |
79 |
"ntnu") |
80 |
echo "http://folk.ntnu.no/olemarku/gentoo/${2}" |
81 |
;; |
82 |
"gentoo") |
83 |
echo "mirror://gentoo/${2}" |
84 |
;; |
85 |
*) |
86 |
die "unhandled case in php_get_uri" |
87 |
;; |
88 |
esac |
89 |
} |
90 |
|
91 |
PHP_MV="$(get_major_version)" |
92 |
|
93 |
# alias, so we can handle different types of releases (finals, rcs, alphas, |
94 |
# betas, ...) w/o changing the whole ebuild |
95 |
PHP_PV="${PV/_rc/RC}" |
96 |
PHP_RELEASE="php" |
97 |
PHP_P="${PN}-${PHP_PV}" |
98 |
|
99 |
PHP_PATCHSET_LOC="gentoo" |
100 |
|
101 |
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" |
102 |
|
103 |
PHP_PATCHSET="3" |
104 |
PHP_PATCHSET_URI=" |
105 |
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" |
106 |
|
107 |
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then |
108 |
# in some cases we use our own suhosin patch (very recent version, |
109 |
# patch conflicts, etc.) |
110 |
SUHOSIN_TYPE="gentoo" |
111 |
else |
112 |
SUHOSIN_TYPE="suhosin" |
113 |
fi |
114 |
|
115 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
116 |
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; |
117 |
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" |
118 |
fi |
119 |
|
120 |
SRC_URI=" |
121 |
${PHP_SRC_URI} |
122 |
${PHP_PATCHSET_URI}" |
123 |
|
124 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
125 |
SRC_URI="${SRC_URI} |
126 |
suhosin? ( ${SUHOSIN_URI} )" |
127 |
fi |
128 |
|
129 |
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." |
130 |
HOMEPAGE="http://php.net/" |
131 |
LICENSE="PHP-3" |
132 |
|
133 |
# We can build the following SAPIs in the given order |
134 |
SAPIS="cli cgi fpm embed apache2" |
135 |
|
136 |
# Gentoo-specific, common features |
137 |
IUSE="kolab" |
138 |
|
139 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
140 |
IUSE="${IUSE} |
141 |
${SAPIS/cli/+cli} |
142 |
threads" |
143 |
|
144 |
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk |
145 |
crypt +ctype curl curlwrappers db2 dbmaker debug doc empress |
146 |
empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird |
147 |
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile |
148 |
interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit |
149 |
mssql mysql mysqlnd mysqli nls oci8 |
150 |
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm |
151 |
readline recode sapdb +session sharedext sharedmem |
152 |
+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin |
153 |
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx |
154 |
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" |
155 |
|
156 |
DEPEND="!dev-lang/php:5 |
157 |
>=app-admin/eselect-php-0.6 |
158 |
>=dev-libs/libpcre-7.9[unicode] |
159 |
adabas? ( >=dev-db/unixODBC-1.8.13 ) |
160 |
apache2? ( www-servers/apache[threads=] ) |
161 |
berkdb? ( =sys-libs/db-4* ) |
162 |
birdstep? ( >=dev-db/unixODBC-1.8.13 ) |
163 |
bzip2? ( app-arch/bzip2 ) |
164 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
165 |
cjk? ( !gd? ( !gd-external? ( |
166 |
>=media-libs/jpeg-6b |
167 |
media-libs/libpng |
168 |
sys-libs/zlib |
169 |
) ) ) |
170 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
171 |
curl? ( >=net-misc/curl-7.10.5 ) |
172 |
db2? ( >=dev-db/unixODBC-1.8.13 ) |
173 |
dbmaker? ( >=dev-db/unixODBC-1.8.13 ) |
174 |
empress? ( >=dev-db/unixODBC-1.8.13 ) |
175 |
empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) |
176 |
enchant? ( app-text/enchant ) |
177 |
esoob? ( >=dev-db/unixODBC-1.8.13 ) |
178 |
exif? ( !gd? ( !gd-external? ( |
179 |
>=media-libs/jpeg-6b |
180 |
media-libs/libpng |
181 |
sys-libs/zlib |
182 |
) ) ) |
183 |
firebird? ( dev-db/firebird ) |
184 |
fpm? ( >=dev-libs/libevent-1.4.12 ) |
185 |
gd? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) |
186 |
gd-external? ( media-libs/gd ) |
187 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
188 |
gmp? ( >=dev-libs/gmp-4.1.2 ) |
189 |
iconv? ( virtual/libiconv ) |
190 |
imap? ( virtual/imap-c-client ) |
191 |
intl? ( dev-libs/icu ) |
192 |
iodbc? ( dev-db/libiodbc ) |
193 |
kerberos? ( virtual/krb5 ) |
194 |
kolab? ( >=net-libs/c-client-2004g-r1 ) |
195 |
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) |
196 |
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) |
197 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
198 |
mssql? ( dev-db/freetds[mssql] ) |
199 |
!mysqlnd? ( |
200 |
mysql? ( virtual/mysql ) |
201 |
mysqli? ( >=virtual/mysql-4.1 ) |
202 |
) |
203 |
nls? ( sys-devel/gettext ) |
204 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
205 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
206 |
postgres? ( dev-db/postgresql-base ) |
207 |
qdbm? ( dev-db/qdbm ) |
208 |
readline? ( sys-libs/readline ) |
209 |
recode? ( app-text/recode ) |
210 |
sapdb? ( >=dev-db/unixODBC-1.8.13 ) |
211 |
sharedmem? ( dev-libs/mm ) |
212 |
simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
213 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
214 |
soap? ( >=dev-libs/libxml2-2.6.8 ) |
215 |
solid? ( >=dev-db/unixODBC-1.8.13 ) |
216 |
spell? ( >=app-text/aspell-0.50 ) |
217 |
sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) ) |
218 |
sqlite3? ( =dev-db/sqlite-3* ) |
219 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
220 |
sybase-ct? ( dev-db/freetds ) |
221 |
tidy? ( app-text/htmltidy ) |
222 |
truetype? ( |
223 |
=media-libs/freetype-2* |
224 |
>=media-libs/t1lib-5.0.0 |
225 |
!gd? ( !gd-external? ( |
226 |
>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) |
227 |
) |
228 |
unicode? ( dev-libs/oniguruma ) |
229 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
230 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
231 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
232 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
233 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
234 |
xpm? ( |
235 |
x11-libs/libXpm |
236 |
>=media-libs/jpeg-6b |
237 |
media-libs/libpng sys-libs/zlib |
238 |
) |
239 |
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
240 |
zip? ( sys-libs/zlib ) |
241 |
zlib? ( sys-libs/zlib ) |
242 |
virtual/mta |
243 |
" |
244 |
|
245 |
php="=${CATEGORY}/${PF}" |
246 |
RDEPEND="${DEPEND} |
247 |
truetype? ( || ( $php[gd] $php[gd-external] ) ) |
248 |
cjk? ( || ( $php[gd] $php[gd-external] ) ) |
249 |
exif? ( || ( $php[gd] $php[gd-external] ) ) |
250 |
|
251 |
xpm? ( $php[gd] ) |
252 |
gd? ( $php[zlib,-gd-external] ) |
253 |
gd-external? ( $php[-gd] ) |
254 |
simplexml? ( $php[xml] ) |
255 |
soap? ( $php[xml] ) |
256 |
wddx? ( $php[xml] ) |
257 |
xmlrpc? ( || ( $php[xml] $php[iconv] ) ) |
258 |
xmlreader? ( $php[xml] ) |
259 |
xsl? ( $php[xml] ) |
260 |
ldap-sasl? ( $php[ldap,-oci8] ) |
261 |
suhosin? ( $php[unicode] ) |
262 |
adabas? ( $php[odbc] ) |
263 |
birdstep? ( $php[odbc] ) |
264 |
dbmaker? ( $php[odbc] ) |
265 |
empress-bcs? ( $php[empress] ) |
266 |
empress? ( $php[odbc] ) |
267 |
esoob? ( $php[odbc] ) |
268 |
db2? ( $php[odbc] ) |
269 |
sapdb? ( $php[odbc] ) |
270 |
solid? ( $php[odbc] ) |
271 |
kolab? ( $php[imap] ) |
272 |
phar? ( $php[hash] ) |
273 |
mysqlnd? ( || ( |
274 |
$php[mysql] |
275 |
$php[mysqli] |
276 |
$php[pdo] |
277 |
) ) |
278 |
|
279 |
oci8? ( $php[-oci8-instant-client,-ldap-sasl] ) |
280 |
oci8-instant-client? ( $php[-oci8] ) |
281 |
|
282 |
qdbm? ( $php[-gdbm] ) |
283 |
readline? ( $php[-libedit] ) |
284 |
recode? ( $php[-imap,-mysql,-mysqli] ) |
285 |
firebird? ( $php[-interbase] ) |
286 |
sharedmem? ( $php[-threads] ) |
287 |
|
288 |
!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) |
289 |
|
290 |
enchant? ( !dev-php${PHP_MV}/pecl-enchant ) |
291 |
fileinfo? ( !dev-php${PHP_MV}/pecl-fileinfo ) |
292 |
filter? ( !dev-php${PHP_MV}/pecl-filter ) |
293 |
json? ( !dev-php${PHP_MV}/pecl-json ) |
294 |
phar? ( !dev-php${PHP_MV}/pecl-phar ) |
295 |
zip? ( !dev-php${PHP_MV}/pecl-zip )" |
296 |
|
297 |
DEPEND="${DEPEND} |
298 |
sys-devel/flex |
299 |
>=sys-devel/m4-1.4.3 |
300 |
>=sys-devel/libtool-1.5.18" |
301 |
|
302 |
# They are in PDEPEND because we need PHP installed first! |
303 |
PDEPEND="doc? ( app-doc/php-docs ) |
304 |
suhosin? ( dev-php${PHP_MV}/suhosin )" |
305 |
|
306 |
# Portage doesn't support setting PROVIDE based on the USE flags that |
307 |
# have been enabled, so we have to PROVIDE everything for now and hope |
308 |
# for the best |
309 |
PROVIDE="virtual/php" |
310 |
|
311 |
SLOT="$(get_version_component_range 1-2)" |
312 |
S="${WORKDIR}/${PHP_P}" |
313 |
|
314 |
# Allow users to install production version if they want to |
315 |
|
316 |
case "${PHP_INI_VERSION}" in |
317 |
production|development) |
318 |
;; |
319 |
*) |
320 |
PHP_INI_VERSION="development" |
321 |
;; |
322 |
esac |
323 |
|
324 |
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" |
325 |
PHP_INI_FILE="php.ini" |
326 |
|
327 |
want_apache |
328 |
|
329 |
# eblit-core |
330 |
# Usage: <function> [version] [eval] |
331 |
# Main eblit engine |
332 |
eblit-core() { |
333 |
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" |
334 |
local e v func=$1 ver=$2 eval_=$3 |
335 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
336 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
337 |
if [[ -e ${e} ]] ; then |
338 |
. "${e}" |
339 |
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" |
340 |
return 0 |
341 |
fi |
342 |
done |
343 |
return 1 |
344 |
} |
345 |
|
346 |
# eblit-include |
347 |
# Usage: [--skip] <function> [version] |
348 |
# Includes an "eblit" -- a chunk of common code among ebuilds in a given |
349 |
# package so that its functions can be sourced and utilized within the |
350 |
# ebuild. |
351 |
eblit-include() { |
352 |
local skipable=false r=0 |
353 |
[[ $1 == "--skip" ]] && skipable=true && shift |
354 |
[[ $1 == pkg_* ]] && skipable=true |
355 |
|
356 |
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]" |
357 |
eblit-core $1 $2 |
358 |
r="$?" |
359 |
${skipable} && return 0 |
360 |
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" |
361 |
} |
362 |
|
363 |
# eblit-run-maybe |
364 |
# Usage: <function> |
365 |
# Runs a function if it is defined in an eblit |
366 |
eblit-run-maybe() { |
367 |
[[ $(type -t "$@") == "function" ]] && "$@" |
368 |
} |
369 |
|
370 |
# eblit-run |
371 |
# Usage: <function> [version] |
372 |
# Runs a function defined in an eblit |
373 |
eblit-run() { |
374 |
eblit-include --skip common "${*:2}" |
375 |
eblit-include "$@" |
376 |
eblit-run-maybe eblit-$1-pre |
377 |
eblit-${PN}-$1 |
378 |
eblit-run-maybe eblit-$1-post |
379 |
} |
380 |
|
381 |
# eblit-pkg |
382 |
# Usage: <phase> [version] |
383 |
# Includes the given functions AND evals them so they're included in the binpkgs |
384 |
eblit-pkg() { |
385 |
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" |
386 |
eblit-core $1 $2 1 |
387 |
} |
388 |
|
389 |
eblit-pkg pkg_setup v2 |
390 |
|
391 |
src_prepare() { eblit-run src_prepare v2 ; } |
392 |
src_configure() { eblit-run src_configure v2 ; } |
393 |
src_compile() { eblit-run src_compile v1 ; } |
394 |
src_install() { eblit-run src_install v2 ; } |
395 |
src_test() { eblit-run src_test v1 ; } |
396 |
pkg_postinst() { eblit-run pkg_postinst v2 ; } |
397 |
|
398 |
|
399 |
|
400 |
1.1 dev-lang/php/php-5.2.14-r2.ebuild |
401 |
|
402 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.14-r2.ebuild?rev=1.1&view=markup |
403 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.14-r2.ebuild?rev=1.1&content-type=text/plain |
404 |
|
405 |
Index: php-5.2.14-r2.ebuild |
406 |
=================================================================== |
407 |
# Copyright 1999-2010 Gentoo Foundation |
408 |
# Distributed under the terms of the GNU General Public License v2 |
409 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14-r2.ebuild,v 1.1 2010/10/31 19:01:55 olemarkus Exp $ |
410 |
|
411 |
EAPI=2 |
412 |
|
413 |
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob |
414 |
interbase msql oci8 sapdb solid" |
415 |
|
416 |
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool |
417 |
|
418 |
SUHOSIN_VERSION="$PV-0.9.7" |
419 |
EXPECTED_TEST_FAILURES="" |
420 |
|
421 |
KEYWORDS="~amd64 ~x86" |
422 |
|
423 |
function php_get_uri () |
424 |
{ |
425 |
case "${1}" in |
426 |
"php-pre") |
427 |
echo "http://downloads.php.net/johannes/${2}" |
428 |
;; |
429 |
"php") |
430 |
echo "http://www.php.net/distributions/${2}" |
431 |
;; |
432 |
"suhosin") |
433 |
echo "http://download.suhosin.org/${2}" |
434 |
;; |
435 |
"gentoo") |
436 |
echo "mirror://gentoo/${2}" |
437 |
;; |
438 |
*) |
439 |
die "unhandled case in php_get_uri" |
440 |
;; |
441 |
esac |
442 |
} |
443 |
|
444 |
PHP_MV="$(get_major_version)" |
445 |
|
446 |
# alias, so we can handle different types of releases (finals, rcs, alphas, |
447 |
# betas, ...) w/o changing the whole ebuild |
448 |
PHP_PV="${PV/_rc/RC}" |
449 |
PHP_RELEASE="php" |
450 |
PHP_P="${PN}-${PHP_PV}" |
451 |
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" |
452 |
|
453 |
PHP_PATCHSET="2" |
454 |
PHP_PATCHSET_URI=" |
455 |
$(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" |
456 |
|
457 |
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then |
458 |
# in some cases we use our own suhosin patch (very recent version, |
459 |
# patch conflicts, etc.) |
460 |
SUHOSIN_TYPE="gentoo" |
461 |
else |
462 |
SUHOSIN_TYPE="suhosin" |
463 |
fi |
464 |
|
465 |
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch" |
466 |
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" |
467 |
|
468 |
SRC_URI=" |
469 |
${PHP_SRC_URI} |
470 |
${PHP_PATCHSET_URI} |
471 |
suhosin? ( ${SUHOSIN_URI} )" |
472 |
|
473 |
DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs." |
474 |
HOMEPAGE="http://php.net/" |
475 |
LICENSE="PHP-3" |
476 |
|
477 |
# We can build the following SAPIs in the given order |
478 |
SAPIS="cli cgi embed apache2" |
479 |
|
480 |
# Gentoo-specific, common features |
481 |
IUSE="kolab" |
482 |
|
483 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
484 |
IUSE="${IUSE} |
485 |
${SAPIS/cli/+cli} |
486 |
threads force-cgi-redirect discard-path" |
487 |
|
488 |
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk |
489 |
crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress |
490 |
empress-bcs esoob exif fdftk frontbase +filter firebird |
491 |
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile |
492 |
interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit |
493 |
mcve mhash msql mssql mysql mysqli ncurses nls oci8 |
494 |
oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm |
495 |
readline recode reflection sapdb +session sharedext sharedmem |
496 |
+simplexml snmp soap sockets solid spell spl sqlite ssl suhosin |
497 |
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx |
498 |
xml xmlreader xmlwriter xmlrpc xpm xsl yaz zip zlib" |
499 |
|
500 |
DEPEND="app-admin/eselect-php |
501 |
pcre? ( >=dev-libs/libpcre-7.9[unicode] ) |
502 |
adabas? ( >=dev-db/unixODBC-1.8.13 ) |
503 |
apache2? ( www-servers/apache[threads=] ) |
504 |
berkdb? ( =sys-libs/db-4* ) |
505 |
birdstep? ( >=dev-db/unixODBC-1.8.13 ) |
506 |
bzip2? ( app-arch/bzip2 ) |
507 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
508 |
cjk? ( !gd? ( !gd-external? ( |
509 |
>=media-libs/jpeg-6b |
510 |
media-libs/libpng |
511 |
sys-libs/zlib |
512 |
) ) ) |
513 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
514 |
curl? ( >=net-misc/curl-7.10.5 ) |
515 |
db2? ( >=dev-db/unixODBC-1.8.13 ) |
516 |
dbmaker? ( >=dev-db/unixODBC-1.8.13 ) |
517 |
empress? ( >=dev-db/unixODBC-1.8.13 ) |
518 |
empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) |
519 |
esoob? ( >=dev-db/unixODBC-1.8.13 ) |
520 |
exif? ( !gd? ( !gd-external? ( |
521 |
>=media-libs/jpeg-6b |
522 |
media-libs/libpng |
523 |
sys-libs/zlib |
524 |
) ) ) |
525 |
fdftk? ( app-text/fdftk ) |
526 |
firebird? ( dev-db/firebird ) |
527 |
gd? ( >=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) |
528 |
gd-external? ( media-libs/gd ) |
529 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
530 |
gmp? ( >=dev-libs/gmp-4.1.2 ) |
531 |
iconv? ( virtual/libiconv ) |
532 |
imap? ( virtual/imap-c-client ) |
533 |
iodbc? ( dev-db/libiodbc ) |
534 |
kerberos? ( virtual/krb5 ) |
535 |
kolab? ( >=net-libs/c-client-2004g-r1 ) |
536 |
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) |
537 |
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) |
538 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
539 |
mhash? ( app-crypt/mhash ) |
540 |
mssql? ( dev-db/freetds[mssql] ) |
541 |
mysql? ( virtual/mysql ) |
542 |
mysqli? ( >=virtual/mysql-4.1 ) |
543 |
ncurses? ( sys-libs/ncurses ) |
544 |
nls? ( sys-devel/gettext ) |
545 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
546 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
547 |
postgres? ( dev-db/postgresql-base ) |
548 |
qdbm? ( dev-db/qdbm ) |
549 |
readline? ( sys-libs/readline ) |
550 |
recode? ( app-text/recode ) |
551 |
sapdb? ( >=dev-db/unixODBC-1.8.13 ) |
552 |
sharedmem? ( dev-libs/mm ) |
553 |
simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
554 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
555 |
soap? ( >=dev-libs/libxml2-2.6.8 ) |
556 |
solid? ( >=dev-db/unixODBC-1.8.13 ) |
557 |
spell? ( >=app-text/aspell-0.50 ) |
558 |
sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) ) |
559 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
560 |
sybase-ct? ( dev-db/freetds ) |
561 |
tidy? ( app-text/htmltidy ) |
562 |
truetype? ( |
563 |
=media-libs/freetype-2* |
564 |
>=media-libs/t1lib-5.0.0 |
565 |
!gd? ( !gd-external? ( |
566 |
>=media-libs/jpeg-6b media-libs/libpng sys-libs/zlib ) ) |
567 |
) |
568 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
569 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
570 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
571 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
572 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
573 |
xpm? ( |
574 |
x11-libs/libXpm |
575 |
>=media-libs/jpeg-6b |
576 |
media-libs/libpng sys-libs/zlib |
577 |
) |
578 |
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
579 |
zip? ( sys-libs/zlib ) |
580 |
zlib? ( sys-libs/zlib ) |
581 |
virtual/mta |
582 |
" |
583 |
|
584 |
php="=${CATEGORY}/${PF}" |
585 |
RDEPEND="${DEPEND} |
586 |
truetype? ( || ( $php[gd] $php[gd-external] ) ) |
587 |
cjk? ( || ( $php[gd] $php[gd-external] ) ) |
588 |
exif? ( || ( $php[gd] $php[gd-external] ) ) |
589 |
|
590 |
xpm? ( $php[gd] ) |
591 |
gd? ( $php[zlib,-gd-external] ) |
592 |
gd-external? ( $php[-gd] ) |
593 |
simplexml? ( $php[xml] ) |
594 |
soap? ( $php[xml] ) |
595 |
wddx? ( $php[xml] ) |
596 |
xmlrpc? ( || ( $php[xml] $php[iconv] ) ) |
597 |
xmlreader? ( $php[xml] ) |
598 |
xsl? ( $php[xml] ) |
599 |
ldap-sasl? ( $php[ldap,-oci8] ) |
600 |
suhosin? ( $php[unicode] ) |
601 |
adabas? ( $php[odbc] ) |
602 |
birdstep? ( $php[odbc] ) |
603 |
dbmaker? ( $php[odbc] ) |
604 |
empress-bcs? ( $php[empress] ) |
605 |
empress? ( $php[odbc] ) |
606 |
esoob? ( $php[odbc] ) |
607 |
db2? ( $php[odbc] ) |
608 |
sapdb? ( $php[odbc] ) |
609 |
solid? ( $php[odbc] ) |
610 |
kolab? ( $php[imap] ) |
611 |
|
612 |
oci8? ( $php[-oci8-instant-client,-ldap-sasl] ) |
613 |
oci8-instant-client? ( $php[-oci8] ) |
614 |
|
615 |
qdbm? ( $php[-gdbm] ) |
616 |
readline? ( $php[-libedit] ) |
617 |
recode? ( $php[-imap,-mysql,-mysqli] ) |
618 |
firebird? ( $php[-interbase] ) |
619 |
sharedmem? ( $php[-threads] ) |
620 |
|
621 |
!cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) ) |
622 |
|
623 |
filter? ( !dev-php${PHP_MV}/pecl-filter ) |
624 |
json? ( !dev-php${PHP_MV}/pecl-json ) |
625 |
zip? ( !dev-php${PHP_MV}/pecl-zip )" |
626 |
|
627 |
DEPEND="${DEPEND} |
628 |
sys-devel/flex |
629 |
>=sys-devel/m4-1.4.3 |
630 |
>=sys-devel/libtool-1.5.18" |
631 |
|
632 |
# They are in PDEPEND because we need PHP installed first! |
633 |
PDEPEND="doc? ( app-doc/php-docs ) |
634 |
suhosin? ( dev-php${PHP_MV}/suhosin ) |
635 |
mcve? ( dev-php${PHP_MV}/pecl-mcve ) |
636 |
yaz? ( dev-php${PHP_MV}/pecl-yaz )" |
637 |
|
638 |
# Portage doesn't support setting PROVIDE based on the USE flags that |
639 |
# have been enabled, so we have to PROVIDE everything for now and hope |
640 |
# for the best |
641 |
PROVIDE="virtual/php" |
642 |
|
643 |
SLOT="$(get_version_component_range 1-2)" |
644 |
S="${WORKDIR}/${PHP_P}" |
645 |
|
646 |
# Allow users to install production version if they want to |
647 |
# PHP 5.2 has other filenames for prod and dev versions |
648 |
|
649 |
case "${PHP_INI_VERSION}" in |
650 |
production) |
651 |
PHP_INI_UPSTREAM="php.ini-recommended" |
652 |
;; |
653 |
development) |
654 |
PHP_INI_UPSTREAM="php.ini-dist" |
655 |
;; |
656 |
*) |
657 |
PHP_INI_VERSION="development" |
658 |
PHP_INI_UPSTREAM="php.ini-dist" |
659 |
;; |
660 |
esac |
661 |
|
662 |
PHP_INI_FILE="php.ini" |
663 |
|
664 |
want_apache |
665 |
|
666 |
# eblit-core |
667 |
# Usage: <function> [version] [eval] |
668 |
# Main eblit engine |
669 |
eblit-core() { |
670 |
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" |
671 |
local e v func=$1 ver=$2 eval_=$3 |
672 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
673 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
674 |
if [[ -e ${e} ]] ; then |
675 |
. "${e}" |
676 |
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" |
677 |
return 0 |
678 |
fi |
679 |
done |
680 |
return 1 |
681 |
} |
682 |
|
683 |
# eblit-include |
684 |
# Usage: [--skip] <function> [version] |
685 |
# Includes an "eblit" -- a chunk of common code among ebuilds in a given |
686 |
# package so that its functions can be sourced and utilized within the |
687 |
# ebuild. |
688 |
eblit-include() { |
689 |
local skipable=false r=0 |
690 |
[[ $1 == "--skip" ]] && skipable=true && shift |
691 |
[[ $1 == pkg_* ]] && skipable=true |
692 |
|
693 |
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]" |
694 |
eblit-core $1 $2 |
695 |
r="$?" |
696 |
${skipable} && return 0 |
697 |
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" |
698 |
} |
699 |
|
700 |
# eblit-run-maybe |
701 |
# Usage: <function> |
702 |
# Runs a function if it is defined in an eblit |
703 |
eblit-run-maybe() { |
704 |
[[ $(type -t "$@") == "function" ]] && "$@" |
705 |
} |
706 |
|
707 |
# eblit-run |
708 |
# Usage: <function> [version] |
709 |
# Runs a function defined in an eblit |
710 |
eblit-run() { |
711 |
eblit-include --skip common "${*:2}" |
712 |
eblit-include "$@" |
713 |
eblit-run-maybe eblit-$1-pre |
714 |
eblit-${PN}-$1 |
715 |
eblit-run-maybe eblit-$1-post |
716 |
} |
717 |
|
718 |
# eblit-pkg |
719 |
# Usage: <phase> [version] |
720 |
# Includes the given functions AND evals them so they're included in the binpkgs |
721 |
eblit-pkg() { |
722 |
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" |
723 |
eblit-core $1 $2 1 |
724 |
} |
725 |
|
726 |
eblit-pkg pkg_setup v2 |
727 |
|
728 |
src_prepare() { eblit-run src_prepare v2 ; } |
729 |
src_configure() { eblit-run src_configure v521 ; } |
730 |
src_compile() { eblit-run src_compile v1 ; } |
731 |
src_install() { eblit-run src_install v2 ; } |
732 |
src_test() { eblit-run src_test v1 ; } |
733 |
pkg_postinst() { eblit-run pkg_postinst v2 ; } |