set USE-defaults

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 15 insertions, 13 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index d8e067782fec..e8e76d060931 100644
--- 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/metadata.xml b/dev-lang/php/metadata.xml
index 046237f85c07..09a50059bb3b 100644
--- 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 2e4d77b54f4d..05700f7e89b1 100644
--- 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 )