Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: ChangeLog php-5.2.14-r1.ebuild php-5.3.3-r2.ebuild
Date: Sat, 30 Oct 2010 21:41:18
Message-Id: 20101030214110.C856120051@flycatcher.gentoo.org
1 olemarkus 10/10/30 21:41:10
2
3 Modified: ChangeLog php-5.2.14-r1.ebuild php-5.3.3-r2.ebuild
4 Log:
5 Added cgi support to minor version slotted ebuilds and made it possible to chose which version of php.ini to use
6
7 (Portage version: 2.1.9.11/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.429 dev-lang/php/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.429&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.429&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.428&r2=1.429
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
19 retrieving revision 1.428
20 retrieving revision 1.429
21 diff -u -r1.428 -r1.429
22 --- ChangeLog 27 Oct 2010 10:33:18 -0000 1.428
23 +++ ChangeLog 30 Oct 2010 21:41:10 -0000 1.429
24 @@ -1,6 +1,12 @@
25 # ChangeLog for dev-lang/php
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.428 2010/10/27 10:33:18 olemarkus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.429 2010/10/30 21:41:10 olemarkus Exp $
29 +
30 + 30 Oct 2010; <olemarkus@g.o> files/eblits/pkg_postinst-v2.eblit,
31 + php-5.2.14-r1.ebuild, files/eblits/src_install-v2.eblit,
32 + php-5.3.3-r2.ebuild:
33 + Changed ebuild to use php.ini-development by default
34 + Also made ebuilds add symlink to php-cgi if the cgi SAPI is installed
35
36 27 Oct 2010; <olemarkus@g.o> files/eblits/src_install-v1.eblit,
37 files/eblits/src_install-v2.eblit:
38
39
40
41 1.2 dev-lang/php/php-5.2.14-r1.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild?r1=1.1&r2=1.2
46
47 Index: php-5.2.14-r1.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- php-5.2.14-r1.ebuild 8 Oct 2010 18:25:10 -0000 1.1
54 +++ php-5.2.14-r1.ebuild 30 Oct 2010 21:41:10 -0000 1.2
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild,v 1.1 2010/10/08 18:25:10 olemarkus Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14-r1.ebuild,v 1.2 2010/10/30 21:41:10 olemarkus Exp $
60
61 EAPI=2
62
63 @@ -78,7 +78,7 @@
64 # SAPIs and SAPI-specific USE flags (cli SAPI is default on):
65 IUSE="${IUSE}
66 ${SAPIS/cli/+cli}
67 - threads"
68 + threads force-cgi-redirect discard-path"
69
70 IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
71 crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress
72 @@ -238,8 +238,24 @@
73 SLOT="$(get_version_component_range 1-2)"
74 S="${WORKDIR}/${PHP_P}"
75
76 +# Allow users to install production version if they want to
77 +# PHP 5.2 has other filenames for prod and dev versions
78 +
79 +case "${PHP_INI_VERSION}" in
80 + production)
81 + PHP_INI_UPSTREAM="php.ini-recommended"
82 + ;;
83 + development)
84 + PHP_INI_UPSTREAM="php.ini-dist"
85 + ;;
86 + *)
87 + PHP_INI_VERSION="development"
88 + PHP_INI_UPSTREAM="php.ini-dist"
89 + ;;
90 +esac
91 +
92 +
93 PHP_INI_FILE="php.ini"
94 -PHP_INI_UPSTREAM="php.ini-dist"
95
96 want_apache
97
98
99
100
101 1.2 dev-lang/php/php-5.3.3-r2.ebuild
102
103 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild?rev=1.2&view=markup
104 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild?rev=1.2&content-type=text/plain
105 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild?r1=1.1&r2=1.2
106
107 Index: php-5.3.3-r2.ebuild
108 ===================================================================
109 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild,v
110 retrieving revision 1.1
111 retrieving revision 1.2
112 diff -u -r1.1 -r1.2
113 --- php-5.3.3-r2.ebuild 8 Oct 2010 18:25:10 -0000 1.1
114 +++ php-5.3.3-r2.ebuild 30 Oct 2010 21:41:10 -0000 1.2
115 @@ -1,6 +1,6 @@
116 # Copyright 1999-2010 Gentoo Foundation
117 # Distributed under the terms of the GNU General Public License v2
118 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild,v 1.1 2010/10/08 18:25:10 olemarkus Exp $
119 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r2.ebuild,v 1.2 2010/10/30 21:41:10 olemarkus Exp $
120
121 EAPI=2
122
123 @@ -262,8 +262,19 @@
124 SLOT="$(get_version_component_range 1-2)"
125 S="${WORKDIR}/${PHP_P}"
126
127 +# Allow users to install production version if they want to
128 +
129 +case "${PHP_INI_VERSION}" in
130 + production|development)
131 + ;;
132 + *)
133 + PHP_INI_VERSION="development"
134 + ;;
135 +esac
136 +
137 +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
138 PHP_INI_FILE="php.ini"
139 -PHP_INI_UPSTREAM="php.ini-production"
140 +
141
142 want_apache
Report Message
Find on MARC Find on Google Groups