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

Gentoo Archives: gentoo-commits

From: "Matti Bickel (mabi)" <mabi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/php: metadata.xml ChangeLog php-5.3.2.ebuild
Date: Tue, 01 Jun 2010 16:17:12
Message-Id: 20100601161706.087342CF2B@corvid.gentoo.org
1 mabi 10/06/01 16:17:05
2
3 Modified: metadata.xml ChangeLog php-5.3.2.ebuild
4 Log:
5 fix use desc, add mbstring, fix file versioning
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.10 dev-lang/php/metadata.xml
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.10&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.10&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?r1=1.9&r2=1.10
14
15 Index: metadata.xml
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/metadata.xml,v
18 retrieving revision 1.9
19 retrieving revision 1.10
20 diff -u -r1.9 -r1.10
21 --- metadata.xml 27 May 2010 23:05:04 -0000 1.9
22 +++ metadata.xml 1 Jun 2010 16:17:05 -0000 1.10
23 @@ -18,6 +18,7 @@
24 <flag name='java-external'>Use the external java extension rather than the bundled one</flag>
25 <flag name='json'>Enable JSON support</flag>
26 <flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
27 + <flag name='mbstring'>Add support for the Multi-Byte String extension</flag>
28 <flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
29 <flag name='pcre'>Adds support for Perl Compatible Regular Expressions (deprecated: always "on" in php 5.3)</flag>
30 <flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
31
32
33
34 1.382 dev-lang/php/ChangeLog
35
36 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.382&view=markup
37 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.382&content-type=text/plain
38 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.381&r2=1.382
39
40 Index: ChangeLog
41 ===================================================================
42 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
43 retrieving revision 1.381
44 retrieving revision 1.382
45 diff -u -r1.381 -r1.382
46 --- ChangeLog 30 May 2010 10:05:20 -0000 1.381
47 +++ ChangeLog 1 Jun 2010 16:17:05 -0000 1.382
48 @@ -1,6 +1,13 @@
49 # ChangeLog for dev-lang/php
50 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
51 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.381 2010/05/30 10:05:20 mabi Exp $
52 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.382 2010/06/01 16:17:05 mabi Exp $
53 +
54 + 01 Jun 2010; <mabi@g.o> -files/eblits/common-v2.eblit,
55 + -files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit,
56 + files/eblits/src_prepare-v1.eblit, php-5.3.2.ebuild, metadata.xml:
57 + align more closely with original php-5.3 work from hoffie@g.o, fix
58 + missing mbstring use description, remove unneeded -v2 eblits, remove
59 + dangling mcve references
60
61 30 May 2010; <mabi@g.o> -files/20php4-envd, php-5.3.2.ebuild,
62 -files/php4-ldvs:
63
64
65
66 1.5 dev-lang/php/php-5.3.2.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.5&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.5&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?r1=1.4&r2=1.5
71
72 Index: php-5.3.2.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v
75 retrieving revision 1.4
76 retrieving revision 1.5
77 diff -u -r1.4 -r1.5
78 --- php-5.3.2.ebuild 1 Jun 2010 03:49:53 -0000 1.4
79 +++ php-5.3.2.ebuild 1 Jun 2010 16:17:05 -0000 1.5
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2010 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.4 2010/06/01 03:49:53 ferringb Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.5 2010/06/01 16:17:05 mabi Exp $
85
86 EAPI=2
87
88 @@ -33,7 +33,7 @@
89 die "unhandled case in php_get_uri"
90 ;;
91 esac
92 -};
93 +}
94
95 PHP_MV="$(get_major_version)"
96
97 @@ -44,7 +44,7 @@
98 PHP_P="${PN}-${PHP_PV}"
99 PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
100
101 -PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}";
102 +PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
103 PHP_PATCHSET_URI="
104 $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
105
106 @@ -54,9 +54,9 @@
107 SUHOSIN_TYPE="gentoo"
108 else
109 SUHOSIN_TYPE="suhosin"
110 -fi;
111 +fi
112
113 -SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
114 +SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
115 SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
116
117 SRC_URI="
118 @@ -72,7 +72,7 @@
119 SAPIS="cli cgi embed apache2"
120
121 # Gentoo-specific, common features
122 -IUSE="kolab mcve"
123 +IUSE="kolab"
124
125 # SAPIs and SAPI-specific USE flags:
126 IUSE="${IUSE}
127 @@ -84,7 +84,7 @@
128 empress-bcs enchant esoob exif frontbase fileinfo filter firebird
129 flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile
130 interbase intl iodbc ipv6 json kerberos ldap ldap-sasl libedit
131 - mssql mysql mysqlnd mysqli nls oci8
132 + mbstring mssql mysql mysqlnd mysqli nls oci8
133 oci8-instant-client odbc pcntl pdo phar pic posix postgres qdbm
134 readline recode sapdb session sharedext sharedmem
135 simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
136 @@ -92,7 +92,6 @@
137 xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
138
139 DEPEND="app-admin/php-toolkit
140 - sys-devel/flex
141 >=dev-libs/libpcre-7.9[unicode]
142 adabas? ( >=dev-db/unixODBC-1.8.13 )
143 apache2? ( !threads? ( www-servers/apache[-threads] ) )
144 @@ -136,7 +135,6 @@
145 ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
146 libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
147 mbstring? ( dev-libs/oniguruma )
148 - mcve? ( >=dev-libs/openssl-0.9.7 )
149 mssql? ( dev-db/freetds )
150 !mysqlnd? (
151 mysql? ( virtual/mysql )
152 @@ -191,9 +189,9 @@
153 zip? ( sys-libs/zlib )
154 zlib? ( sys-libs/zlib )
155 virtual/mta
156 -";
157 +"
158
159 -php="=${CATEGORY}/${PF}";
160 +php="=${CATEGORY}/${PF}"
161 RDEPEND="${DEPEND}
162 truetype? ( || ( $php[gd] $php[gd-external] ) )
163 cjk? ( || ( $php[gd] $php[gd-external] ) )
164 @@ -209,7 +207,6 @@
165 xmlreader? ( $php[xml] )
166 xsl? ( $php[xml] )
167 ldap-sasl? ( $php[ldap,-oci8] )
168 - mcve? ( $php[ssl] )
169 suhosin? ( $php[unicode] )
170 adabas? ( $php[odbc] )
171 birdstep? ( $php[odbc] )
172 @@ -218,7 +215,7 @@
173 empress? ( $php[odbc] )
174 esoob? ( $php[odbc] )
175 db2? ( $php[odbc] )
176 - iodbc? ( $php[odbc] )
177 + iodbc? ( $php[iodbc] )
178 sapdb? ( $php[odbc] )
179 solid? ( $php[odbc] )
180 kolab? ( $php[imap] )
181 @@ -248,6 +245,7 @@
182 zip? ( !dev-php${PHP_MV}/pecl-zip )"
183
184 DEPEND="${DEPEND}
185 + sys-devel/flex
186 >=sys-devel/m4-1.4.3
187 >=sys-devel/libtool-1.5.18"
188
189 @@ -260,7 +258,7 @@
190 # for the best
191 PROVIDE="virtual/php virtual/httpd-php"
192
193 -SLOT="${PHP_MV}";
194 +SLOT="${PHP_MV}"
195 S="${WORKDIR}/${PHP_P}"
196
197 PHP_INI_FILE="php.ini"
198 @@ -332,8 +330,8 @@
199
200 src_prepare() { eblit-run src_prepare v1 ; }
201 src_configure() { eblit-run src_configure v1 ; }
202 -src_compile() { eblit-run src_compile v2 ; }
203 -src_install() { eblit-run src_install v2 ; }
204 +src_compile() { eblit-run src_compile v1 ; }
205 +src_install() { eblit-run src_install v1 ; }
206 src_test() { eblit-run src_test v1 ; }
207
208 eblit-pkg pkg_postinst v1
Report Message
Find on MARC Find on Google Groups