Gentoo Archives: gentoo-commits

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