set USE-defaults

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d8e067782fec17594ef89aafbf5c4022a04f0413..e8e76d060931145c76ef78b792c06f4d6d37fd94 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -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:

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 45de8b9958b63ecb85903f7ee3259e34f14e046a..fa9184e4f7f6ef032a8d93d75ff2b45672a914d0 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -41,6 +41,6 @@ EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 S
 EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
 EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
 EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
-EBUILD php-5.3.2.ebuild 9347 RMD160 af947f0a5d0f1d95832c037e8e5cf74af7b58b45 SHA1 cb6af3a4eff1c84822d7bd9c3fdfb2d574f51fc6 SHA256 515343dc77123d7f7b5336e2f64846a46e9d73823be7b244ea042df9faf10150
-MISC ChangeLog 66450 RMD160 e84578b192e250161f82acbb72472dc6caf8ed39 SHA1 cc4197a88d4f0d41918ec1e9ca2e5f9d0cdda18a SHA256 150ccd8e664436b6a82b09edc4952342a911a6bc4614b129c4565e3c5be77692
-MISC metadata.xml 2264 RMD160 82c0da8dfb32f6747d25e1fcd228e7ff87661195 SHA1 1fdbe39bbc372da83fa44d620d087a11f075e20d SHA256 dfbbbf2fb81666c8051408f2e0f4695b3a5f38940ba2adbd0f7f53785ed9338e
+EBUILD php-5.3.2.ebuild 9315 RMD160 855ad7ca6703c36525a16e1d5ba6c659b4881eae SHA1 1da6a6e82fe7f228c94b45e81a89041a00657006 SHA256 89a53d10f5adbd84b3d558822dfb03b0093bef9d16f37a5ca076e1b8b393ade6
+MISC ChangeLog 66627 RMD160 5c604e4d40b32e71a3df38c481f8a35a7fa88785 SHA1 0bc2216ee72dfae95d3f87342122aca4f315ba11 SHA256 4d6c4ca7ccc9cebbdda161de73b1bc738f3d9b53051d58c8b4b8b9151cb97e28
+MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 046237f85c079f24535e7e7b3500bcbfc2429086..09a50059bb3bfdd226e6a1015f71d84a1f05ef81 100644 (file)
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -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>

diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index 2e4d77b54f4dad87295397264c956c5e1d5fe629..05700f7e89b19a89012332fa6b48b973805d410f 100644 (file)
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.ebuild
@@ -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 @@ IUSE="${IUSE}
        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 @@ DEPEND="app-admin/php-toolkit
        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 )