1 |
olemarkus 11/07/01 11:45:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: php-5.3.7_rc2.ebuild |
5 |
Removed: php-5.3.7_rc1.ebuild |
6 |
Log: |
7 |
Bumped 5.3.7 rc version |
8 |
|
9 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.494 dev-lang/php/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.494&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.494&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.493&r2=1.494 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v |
21 |
retrieving revision 1.493 |
22 |
retrieving revision 1.494 |
23 |
diff -u -r1.493 -r1.494 |
24 |
--- ChangeLog 29 Jun 2011 06:45:45 -0000 1.493 |
25 |
+++ ChangeLog 1 Jul 2011 11:45:01 -0000 1.494 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for dev-lang/php |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.493 2011/06/29 06:45:45 olemarkus Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.494 2011/07/01 11:45:01 olemarkus Exp $ |
31 |
+ |
32 |
+*php-5.3.7_rc2 (01 Jul 2011) |
33 |
+ |
34 |
+ 01 Jul 2011; Ole Markus With <olemarkus@g.o> -php-5.3.7_rc1.ebuild, |
35 |
+ +php-5.3.7_rc2.ebuild: |
36 |
+ Bumped 5.3.7 rc version |
37 |
|
38 |
29 Jun 2011; Ole Markus With <olemarkus@g.o> -php-5.3.5.ebuild, |
39 |
-php-5.3.5-r1.ebuild, -php-5.4.0_pre201105211430.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-lang/php/php-5.3.7_rc2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.7_rc2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.7_rc2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: php-5.3.7_rc2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.7_rc2.ebuild,v 1.1 2011/07/01 11:45:01 olemarkus Exp $ |
53 |
|
54 |
EAPI=4 |
55 |
|
56 |
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" |
57 |
|
58 |
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool |
59 |
|
60 |
SUHOSIN_VERSION="" |
61 |
FPM_VERSION="builtin" |
62 |
EXPECTED_TEST_FAILURES="" |
63 |
|
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
65 |
|
66 |
function php_get_uri () |
67 |
{ |
68 |
case "${1}" in |
69 |
"php-pre") |
70 |
echo "http://downloads.php.net/ilia/${2}" |
71 |
;; |
72 |
"php") |
73 |
echo "http://www.php.net/distributions/${2}" |
74 |
;; |
75 |
"suhosin") |
76 |
echo "http://download.suhosin.org/${2}" |
77 |
;; |
78 |
"olemarkus") |
79 |
echo "http://olemarkus.org/~olemarkus/gentoo/${2}" |
80 |
;; |
81 |
"gentoo") |
82 |
echo "mirror://gentoo/${2}" |
83 |
;; |
84 |
*) |
85 |
die "unhandled case in php_get_uri" |
86 |
;; |
87 |
esac |
88 |
} |
89 |
|
90 |
PHP_MV="$(get_major_version)" |
91 |
|
92 |
# alias, so we can handle different types of releases (finals, rcs, alphas, |
93 |
# betas, ...) w/o changing the whole ebuild |
94 |
PHP_PV="${PV/_rc/RC}" |
95 |
PHP_RELEASE="php-pre" |
96 |
PHP_P="${PN}-${PHP_PV}" |
97 |
|
98 |
PHP_PATCHSET_LOC="olemarkus" |
99 |
|
100 |
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" |
101 |
|
102 |
PHP_PATCHSET="0" |
103 |
PHP_PATCHSET_URI=" |
104 |
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" |
105 |
|
106 |
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then |
107 |
# in some cases we use our own suhosin patch (very recent version, |
108 |
# patch conflicts, etc.) |
109 |
SUHOSIN_TYPE="gentoo" |
110 |
else |
111 |
SUHOSIN_TYPE="suhosin" |
112 |
fi |
113 |
|
114 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
115 |
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; |
116 |
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" |
117 |
fi |
118 |
|
119 |
SRC_URI=" |
120 |
${PHP_SRC_URI} |
121 |
${PHP_PATCHSET_URI}" |
122 |
|
123 |
if [[ -n ${SUHOSIN_VERSION} ]]; then |
124 |
SRC_URI="${SRC_URI} |
125 |
suhosin? ( ${SUHOSIN_URI} )" |
126 |
fi |
127 |
|
128 |
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." |
129 |
HOMEPAGE="http://php.net/" |
130 |
LICENSE="PHP-3" |
131 |
|
132 |
SLOT="$(get_version_component_range 1-2)" |
133 |
S="${WORKDIR}/${PHP_P}" |
134 |
|
135 |
# We can build the following SAPIs in the given order |
136 |
SAPIS="embed cli cgi fpm apache2" |
137 |
|
138 |
# Gentoo-specific, common features |
139 |
IUSE="kolab" |
140 |
|
141 |
# SAPIs and SAPI-specific USE flags (cli SAPI is default on): |
142 |
IUSE="${IUSE} |
143 |
${SAPIS/cli/+cli} |
144 |
threads" |
145 |
|
146 |
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk |
147 |
crypt +ctype curl curlwrappers db2 dbmaker debug doc empress |
148 |
empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird |
149 |
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile |
150 |
interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash |
151 |
mssql mysql mysqlnd mysqli nls oci8 |
152 |
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm |
153 |
readline recode sapdb +session sharedext sharedmem |
154 |
+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl |
155 |
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx |
156 |
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" |
157 |
|
158 |
# Enable suhosin if available |
159 |
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" |
160 |
|
161 |
DEPEND="!dev-lang/php:5 |
162 |
>=app-admin/eselect-php-0.6.2 |
163 |
>=dev-libs/libpcre-8.12[unicode] |
164 |
adabas? ( >=dev-db/unixODBC-1.8.13 ) |
165 |
apache2? ( www-servers/apache[threads=] ) |
166 |
berkdb? ( =sys-libs/db-4* ) |
167 |
birdstep? ( >=dev-db/unixODBC-1.8.13 ) |
168 |
bzip2? ( app-arch/bzip2 ) |
169 |
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) |
170 |
cjk? ( !gd? ( !gd-external? ( |
171 |
virtual/jpeg |
172 |
media-libs/libpng |
173 |
sys-libs/zlib |
174 |
) ) ) |
175 |
crypt? ( >=dev-libs/libmcrypt-2.4 ) |
176 |
curl? ( >=net-misc/curl-7.10.5 ) |
177 |
db2? ( >=dev-db/unixODBC-1.8.13 ) |
178 |
dbmaker? ( >=dev-db/unixODBC-1.8.13 ) |
179 |
empress? ( >=dev-db/unixODBC-1.8.13 ) |
180 |
empress-bcs? ( >=dev-db/unixODBC-1.8.13 ) |
181 |
enchant? ( app-text/enchant ) |
182 |
esoob? ( >=dev-db/unixODBC-1.8.13 ) |
183 |
exif? ( !gd? ( !gd-external? ( |
184 |
virtual/jpeg |
185 |
media-libs/libpng |
186 |
sys-libs/zlib |
187 |
) ) ) |
188 |
firebird? ( dev-db/firebird ) |
189 |
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) |
190 |
gd-external? ( media-libs/gd ) |
191 |
gdbm? ( >=sys-libs/gdbm-1.8.0 ) |
192 |
gmp? ( >=dev-libs/gmp-4.1.2 ) |
193 |
iconv? ( virtual/libiconv ) |
194 |
imap? ( virtual/imap-c-client[ssl=] ) |
195 |
intl? ( dev-libs/icu ) |
196 |
iodbc? ( dev-db/libiodbc ) |
197 |
kerberos? ( virtual/krb5 ) |
198 |
kolab? ( >=net-libs/c-client-2004g-r1 ) |
199 |
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) ) |
200 |
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) ) |
201 |
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) |
202 |
mssql? ( dev-db/freetds[mssql] ) |
203 |
!mysqlnd? ( |
204 |
mysql? ( virtual/mysql ) |
205 |
mysqli? ( >=virtual/mysql-4.1 ) |
206 |
) |
207 |
nls? ( sys-devel/gettext ) |
208 |
oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
209 |
odbc? ( >=dev-db/unixODBC-1.8.13 ) |
210 |
postgres? ( dev-db/postgresql-base ) |
211 |
qdbm? ( dev-db/qdbm ) |
212 |
readline? ( sys-libs/readline ) |
213 |
recode? ( app-text/recode ) |
214 |
sapdb? ( >=dev-db/unixODBC-1.8.13 ) |
215 |
sharedmem? ( dev-libs/mm ) |
216 |
simplexml? ( >=dev-libs/libxml2-2.6.8 ) |
217 |
snmp? ( >=net-analyzer/net-snmp-5.2 ) |
218 |
soap? ( >=dev-libs/libxml2-2.6.8 ) |
219 |
solid? ( >=dev-db/unixODBC-1.8.13 ) |
220 |
spell? ( >=app-text/aspell-0.50 ) |
221 |
sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.6.3 ) ) |
222 |
sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) |
223 |
ssl? ( >=dev-libs/openssl-0.9.7 ) |
224 |
sybase-ct? ( dev-db/freetds ) |
225 |
tidy? ( app-text/htmltidy ) |
226 |
truetype? ( |
227 |
=media-libs/freetype-2* |
228 |
>=media-libs/t1lib-5.0.0 |
229 |
!gd? ( !gd-external? ( |
230 |
virtual/jpeg media-libs/libpng sys-libs/zlib ) ) |
231 |
) |
232 |
unicode? ( dev-libs/oniguruma ) |
233 |
wddx? ( >=dev-libs/libxml2-2.6.8 ) |
234 |
xml? ( >=dev-libs/libxml2-2.6.8 ) |
235 |
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) |
236 |
xmlreader? ( >=dev-libs/libxml2-2.6.8 ) |
237 |
xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) |
238 |
xpm? ( |
239 |
x11-libs/libXpm |
240 |
virtual/jpeg |
241 |
media-libs/libpng sys-libs/zlib |
242 |
) |
243 |
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) |
244 |
zip? ( sys-libs/zlib ) |
245 |
zlib? ( sys-libs/zlib ) |
246 |
virtual/mta |
247 |
" |
248 |
|
249 |
php="=${CATEGORY}/${PF}" |
250 |
|
251 |
REQUIRED_USE=" |
252 |
truetype? ( || ( gd gd-external ) ) |
253 |
cjk? ( || ( gd gd-external ) ) |
254 |
exif? ( || ( gd gd-external ) ) |
255 |
|
256 |
xpm? ( gd ) |
257 |
gd? ( zlib !gd-external ) |
258 |
gd-external? ( !gd ) |
259 |
simplexml? ( xml ) |
260 |
soap? ( xml ) |
261 |
wddx? ( xml ) |
262 |
xmlrpc? ( || ( xml iconv ) ) |
263 |
xmlreader? ( xml ) |
264 |
xsl? ( xml ) |
265 |
ldap-sasl? ( ldap !oci8 ) |
266 |
adabas? ( odbc ) |
267 |
birdstep? ( odbc ) |
268 |
dbmaker? ( odbc ) |
269 |
empress-bcs? ( empress ) |
270 |
empress? ( odbc ) |
271 |
esoob? ( odbc ) |
272 |
db2? ( odbc ) |
273 |
sapdb? ( odbc ) |
274 |
solid? ( odbc ) |
275 |
kolab? ( imap ) |
276 |
mhash? ( hash ) |
277 |
phar? ( hash ) |
278 |
mysqlnd? ( || ( |
279 |
mysql |
280 |
mysqli |
281 |
pdo |
282 |
) ) |
283 |
|
284 |
oci8? ( !oci8-instant-client !ldap-sasl ) |
285 |
oci8-instant-client? ( !oci8 ) |
286 |
|
287 |
qdbm? ( !gdbm ) |
288 |
readline? ( !libedit ) |
289 |
recode? ( !imap !mysql !mysqli ) |
290 |
firebird? ( !interbase ) |
291 |
sharedmem? ( !threads ) |
292 |
|
293 |
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" |
294 |
|
295 |
DEPEND="${DEPEND} |
296 |
enchant? ( !dev-php5/pecl-enchant ) |
297 |
fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) |
298 |
filter? ( !dev-php5/pecl-filter ) |
299 |
json? ( !dev-php5/pecl-json ) |
300 |
phar? ( !dev-php5/pecl-phar ) |
301 |
zip? ( !dev-php5/pecl-zip )" |
302 |
|
303 |
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( |
304 |
=${CATEGORY}/${PN}-${SLOT}*[unicode] )" |
305 |
|
306 |
DEPEND="${DEPEND} |
307 |
sys-devel/flex |
308 |
>=sys-devel/m4-1.4.3 |
309 |
>=sys-devel/libtool-1.5.18" |
310 |
|
311 |
# They are in PDEPEND because we need PHP installed first! |
312 |
PDEPEND="doc? ( app-doc/php-docs )" |
313 |
|
314 |
# No longer depend on the extension. The suhosin USE flag only installs the |
315 |
# patch |
316 |
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" |
317 |
|
318 |
# Allow users to install production version if they want to |
319 |
|
320 |
case "${PHP_INI_VERSION}" in |
321 |
production|development) |
322 |
;; |
323 |
*) |
324 |
PHP_INI_VERSION="development" |
325 |
;; |
326 |
esac |
327 |
|
328 |
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" |
329 |
PHP_INI_FILE="php.ini" |
330 |
|
331 |
want_apache |
332 |
|
333 |
# eblit-core |
334 |
# Usage: <function> [version] [eval] |
335 |
# Main eblit engine |
336 |
eblit-core() { |
337 |
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" |
338 |
local e v func=$1 ver=$2 eval_=$3 |
339 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
340 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
341 |
if [[ -e ${e} ]] ; then |
342 |
. "${e}" |
343 |
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" |
344 |
return 0 |
345 |
fi |
346 |
done |
347 |
return 1 |
348 |
} |
349 |
|
350 |
# eblit-include |
351 |
# Usage: [--skip] <function> [version] |
352 |
# Includes an "eblit" -- a chunk of common code among ebuilds in a given |
353 |
# package so that its functions can be sourced and utilized within the |
354 |
# ebuild. |
355 |
eblit-include() { |
356 |
local skipable=false r=0 |
357 |
[[ $1 == "--skip" ]] && skipable=true && shift |
358 |
[[ $1 == pkg_* ]] && skipable=true |
359 |
|
360 |
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]" |
361 |
eblit-core $1 $2 |
362 |
r="$?" |
363 |
${skipable} && return 0 |
364 |
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" |
365 |
} |
366 |
|
367 |
# eblit-run-maybe |
368 |
# Usage: <function> |
369 |
# Runs a function if it is defined in an eblit |
370 |
eblit-run-maybe() { |
371 |
[[ $(type -t "$@") == "function" ]] && "$@" |
372 |
} |
373 |
|
374 |
# eblit-run |
375 |
# Usage: <function> [version] |
376 |
# Runs a function defined in an eblit |
377 |
eblit-run() { |
378 |
eblit-include --skip common "${*:2}" |
379 |
eblit-include "$@" |
380 |
eblit-run-maybe eblit-$1-pre |
381 |
eblit-${PN}-$1 |
382 |
eblit-run-maybe eblit-$1-post |
383 |
} |
384 |
|
385 |
# eblit-pkg |
386 |
# Usage: <phase> [version] |
387 |
# Includes the given functions AND evals them so they're included in the binpkgs |
388 |
eblit-pkg() { |
389 |
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" |
390 |
eblit-core $1 $2 1 |
391 |
} |
392 |
|
393 |
eblit-pkg pkg_setup v2 |
394 |
|
395 |
src_prepare() { eblit-run src_prepare v3 ; } |
396 |
src_configure() { eblit-run src_configure v2 ; } |
397 |
src_compile() { eblit-run src_compile v1 ; } |
398 |
src_install() { eblit-run src_install v2 ; } |
399 |
src_test() { eblit-run src_test v1 ; } |
400 |
pkg_postinst() { eblit-run pkg_postinst v2 ; } |