* [gentoo-commits] gentoo-x86 commit in dev-lang/php: metadata.xml ChangeLog php-5.3.2.ebuild
@ 2010-06-01 16:17 Matti Bickel (mabi)
0 siblings, 0 replies; 2+ messages in thread
From: Matti Bickel (mabi) @ 2010-06-01 16:17 UTC (permalink / raw
To: gentoo-commits
mabi 10/06/01 16:17:05
Modified: metadata.xml ChangeLog php-5.3.2.ebuild
Log:
fix use desc, add mbstring, fix file versioning
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.10 dev-lang/php/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 27 May 2010 23:05:04 -0000 1.9
+++ metadata.xml 1 Jun 2010 16:17:05 -0000 1.10
@@ -18,6 +18,7 @@
<flag name='java-external'>Use the external java extension rather than the bundled one</flag>
<flag name='json'>Enable JSON support</flag>
<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
+ <flag name='mbstring'>Add support for the Multi-Byte String extension</flag>
<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
<flag name='pcre'>Adds support for Perl Compatible Regular Expressions (deprecated: always "on" in php 5.3)</flag>
<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
1.382 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.382&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.382&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.381&r2=1.382
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- ChangeLog 30 May 2010 10:05:20 -0000 1.381
+++ ChangeLog 1 Jun 2010 16:17:05 -0000 1.382
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.381 2010/05/30 10:05:20 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.382 2010/06/01 16:17:05 mabi Exp $
+
+ 01 Jun 2010; <mabi@gentoo.org> -files/eblits/common-v2.eblit,
+ -files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit,
+ files/eblits/src_prepare-v1.eblit, php-5.3.2.ebuild, metadata.xml:
+ align more closely with original php-5.3 work from hoffie@gentoo.org, fix
+ missing mbstring use description, remove unneeded -v2 eblits, remove
+ dangling mcve references
30 May 2010; <mabi@gentoo.org> -files/20php4-envd, php-5.3.2.ebuild,
-files/php4-ldvs:
1.5 dev-lang/php/php-5.3.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?r1=1.4&r2=1.5
Index: php-5.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-5.3.2.ebuild 1 Jun 2010 03:49:53 -0000 1.4
+++ php-5.3.2.ebuild 1 Jun 2010 16:17:05 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.4 2010/06/01 03:49:53 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.5 2010/06/01 16:17:05 mabi Exp $
EAPI=2
@@ -33,7 +33,7 @@
die "unhandled case in php_get_uri"
;;
esac
-};
+}
PHP_MV="$(get_major_version)"
@@ -44,7 +44,7 @@
PHP_P="${PN}-${PHP_PV}"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}";
+PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
PHP_PATCHSET_URI="
$(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
@@ -54,9 +54,9 @@
SUHOSIN_TYPE="gentoo"
else
SUHOSIN_TYPE="suhosin"
-fi;
+fi
-SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
+SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
SRC_URI="
@@ -72,7 +72,7 @@
SAPIS="cli cgi embed apache2"
# Gentoo-specific, common features
-IUSE="kolab mcve"
+IUSE="kolab"
# SAPIs and SAPI-specific USE flags:
IUSE="${IUSE}
@@ -84,7 +84,7 @@
empress-bcs enchant esoob exif frontbase fileinfo filter firebird
flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile
interbase intl iodbc ipv6 json kerberos ldap ldap-sasl libedit
- mssql mysql mysqlnd mysqli nls oci8
+ mbstring mssql mysql mysqlnd mysqli nls oci8
oci8-instant-client odbc pcntl pdo phar pic posix postgres qdbm
readline recode sapdb session sharedext sharedmem
simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
@@ -92,7 +92,6 @@
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
DEPEND="app-admin/php-toolkit
- sys-devel/flex
>=dev-libs/libpcre-7.9[unicode]
adabas? ( >=dev-db/unixODBC-1.8.13 )
apache2? ( !threads? ( www-servers/apache[-threads] ) )
@@ -136,7 +135,6 @@
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
mbstring? ( dev-libs/oniguruma )
- mcve? ( >=dev-libs/openssl-0.9.7 )
mssql? ( dev-db/freetds )
!mysqlnd? (
mysql? ( virtual/mysql )
@@ -191,9 +189,9 @@
zip? ( sys-libs/zlib )
zlib? ( sys-libs/zlib )
virtual/mta
-";
+"
-php="=${CATEGORY}/${PF}";
+php="=${CATEGORY}/${PF}"
RDEPEND="${DEPEND}
truetype? ( || ( $php[gd] $php[gd-external] ) )
cjk? ( || ( $php[gd] $php[gd-external] ) )
@@ -209,7 +207,6 @@
xmlreader? ( $php[xml] )
xsl? ( $php[xml] )
ldap-sasl? ( $php[ldap,-oci8] )
- mcve? ( $php[ssl] )
suhosin? ( $php[unicode] )
adabas? ( $php[odbc] )
birdstep? ( $php[odbc] )
@@ -218,7 +215,7 @@
empress? ( $php[odbc] )
esoob? ( $php[odbc] )
db2? ( $php[odbc] )
- iodbc? ( $php[odbc] )
+ iodbc? ( $php[iodbc] )
sapdb? ( $php[odbc] )
solid? ( $php[odbc] )
kolab? ( $php[imap] )
@@ -248,6 +245,7 @@
zip? ( !dev-php${PHP_MV}/pecl-zip )"
DEPEND="${DEPEND}
+ sys-devel/flex
>=sys-devel/m4-1.4.3
>=sys-devel/libtool-1.5.18"
@@ -260,7 +258,7 @@
# for the best
PROVIDE="virtual/php virtual/httpd-php"
-SLOT="${PHP_MV}";
+SLOT="${PHP_MV}"
S="${WORKDIR}/${PHP_P}"
PHP_INI_FILE="php.ini"
@@ -332,8 +330,8 @@
src_prepare() { eblit-run src_prepare v1 ; }
src_configure() { eblit-run src_configure v1 ; }
-src_compile() { eblit-run src_compile v2 ; }
-src_install() { eblit-run src_install v2 ; }
+src_compile() { eblit-run src_compile v1 ; }
+src_install() { eblit-run src_install v1 ; }
src_test() { eblit-run src_test v1 ; }
eblit-pkg pkg_postinst v1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php: metadata.xml ChangeLog php-5.3.2.ebuild
@ 2010-06-12 22:05 Matti Bickel (mabi)
0 siblings, 0 replies; 2+ messages in thread
From: Matti Bickel (mabi) @ 2010-06-12 22:05 UTC (permalink / raw
To: gentoo-commits
mabi 10/06/12 22:05:54
Modified: metadata.xml ChangeLog php-5.3.2.ebuild
Log:
set USE-defaults
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.11 dev-lang/php/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/metadata.xml?r1=1.10&r2=1.11
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml 1 Jun 2010 16:17:05 -0000 1.10
+++ metadata.xml 12 Jun 2010 22:05:54 -0000 1.11
@@ -18,7 +18,6 @@
<flag name='java-external'>Use the external java extension rather than the bundled one</flag>
<flag name='json'>Enable JSON support</flag>
<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
- <flag name='mbstring'>Add support for the Multi-Byte String extension</flag>
<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
<flag name='pcre'>Adds support for Perl Compatible Regular Expressions (deprecated: always "on" in php 5.3)</flag>
<flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag>
1.384 dev-lang/php/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.384&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?rev=1.384&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/ChangeLog?r1=1.383&r2=1.384
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- ChangeLog 11 Jun 2010 17:15:29 -0000 1.383
+++ ChangeLog 12 Jun 2010 22:05:54 -0000 1.384
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.383 2010/06/11 17:15:29 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.384 2010/06/12 22:05:54 mabi Exp $
+
+ 12 Jun 2010; <mabi@gentoo.org> php-5.3.2.ebuild, metadata.xml:
+ USE="mbstring" already covered by USE="unicode"; set USE-defaults to match
+ upstream defaults (bug #285816)
11 Jun 2010; <mabi@gentoo.org> files/eblits/src_compile-v1.eblit,
php-5.3.2.ebuild, files/eblits/src_configure-v1.eblit:
1.7 dev-lang/php/php-5.3.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/php-5.3.2.ebuild?r1=1.6&r2=1.7
Index: php-5.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-5.3.2.ebuild 11 Jun 2010 17:15:29 -0000 1.6
+++ php-5.3.2.ebuild 12 Jun 2010 22:05:54 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.6 2010/06/11 17:15:29 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.7 2010/06/12 22:05:54 mabi Exp $
EAPI=2
@@ -80,15 +80,15 @@
concurrentmodphp threads"
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
- crypt ctype curl curlwrappers db2 dbmaker debug doc empress
- empress-bcs enchant esoob exif frontbase fileinfo filter firebird
- flatfile ftp gd gd-external gdbm gmp hash iconv imap inifile
- interbase intl iodbc ipv6 json kerberos ldap ldap-sasl libedit
- mbstring mssql mysql mysqlnd mysqli nls oci8
- oci8-instant-client odbc pcntl pdo phar pic posix postgres qdbm
- readline recode sapdb session sharedext sharedmem
- simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
- sybase-ct sysvipc tidy tokenizer truetype unicode wddx
+ crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
+ empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
+ flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
+ interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit
+ mssql mysql mysqlnd mysqli nls oci8
+ oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
+ readline recode sapdb +session sharedext sharedmem
+ +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
+ sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
DEPEND="app-admin/php-toolkit
@@ -134,7 +134,6 @@
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mbstring? ( dev-libs/oniguruma )
mssql? ( dev-db/freetds )
!mysqlnd? (
mysql? ( virtual/mysql )
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-12 22:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-12 22:05 [gentoo-commits] gentoo-x86 commit in dev-lang/php: metadata.xml ChangeLog php-5.3.2.ebuild Matti Bickel (mabi)
-- strict thread matches above, loose matches on Subject: below --
2010-06-01 16:17 Matti Bickel (mabi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox