fix bug #281316, #322303

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index e4468f61722cbcc1dc3a7aaf3ea1a1eec1f78135..87d77da0ce744b3851943f577b96c76bb82cc592 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -27,7 +27,7 @@ DIST php-patchset-5.2.11-r1.tar.bz2 10403 RMD160 53ce1a43697db2cf79eba89a548f52e
 DIST php-patchset-5.2.12-r0.tar.bz2 10181 RMD160 e78dc3a500838e163da4eb5853dfe539430486c3 SHA1 91244c62af3ef3a0ebd1a396dbe22d2732512c89 SHA256 ca0cb19e98cb073fa0dd9157c728a9285b97198f1b522727e040f0f00dd8255f
 DIST php-patchset-5.2.13-r0.tar.bz2 10207 RMD160 b367c17742553fcfbf4cb1b76f8dd4aae9f08cf8 SHA1 20b60e3aef34d0b558f0c896c6981957490b2ba9 SHA256 c71dad65178186786393164a0cb4f056b85f0e00579da3dc2dbe5b863ec4262b
 DIST php-patchset-5.2.9-r2.tar.bz2 17294 RMD160 1367ccf198686df2ff81408b1d6fb7096fa6790b SHA1 d5d1528aa775ff4af9251a6843a5f18bffcb4795 SHA256 ba77dab6cf96f874070afee76d1ad7b48a55a8738bc0e0bc6c54f011b9070dc1
-DIST php-patchset-5.3.2-r0.tar.bz2 9465 RMD160 46ab4a3b94fd393092ed2f9ce74ee461d13f2bb4 SHA1 8ac2f47df56989bcb3fd7498ffe826e147aebbd4 SHA256 3f807bd87aa6a122bf0e204cdfc3b8f2a5305b258e77144240968243fb61a271
+DIST php-patchset-5.3.2-r0.tar.bz2 9702 RMD160 40cdb57493dc44640cf0b9ab545d0206e24e2316 SHA1 c60b29edb9cc28658b8da63a82800cd90eef12d4 SHA256 5c75dd05000c90e55a11295ead6aae5aea238001d852c14cb821abd2730aef67
 DIST suhosin-patch-5.2.10-0.9.7.patch.gz 23072 RMD160 18df1686a48d652f581591115b51461e9dacf5a4 SHA1 3768bbded0bb2376414322b26308342452cb927a SHA256 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
 DIST suhosin-patch-5.2.11-0.9.7.patch.gz 23050 RMD160 0f6d442aace34c221f9fbff42a63e7f3b4489f15 SHA1 248419332131efc53f3306c2a57a4b1a9dc92cc1 SHA256 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b
 DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935 SHA1 e2faf8db2d7facbd44cee2f737ce87732835d341 SHA256 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184
@@ -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 9302 RMD160 8ceebd031b518a6253e2d149dd45a668bfeefa0c SHA1 b6f94c95b1992f6b414a32fbb9dafa1936a9746b SHA256 3f86897f3e6d57a3764138ff23bb87a289e421d99995b9e18ad4a71673f46dc8
+EBUILD php-5.3.2.ebuild 9331 RMD160 5b656a67d8d13dab5e00a065d7f4cd7057ef2051 SHA1 e766256fda3df4d26f505a14eb69a6747f95f6bb SHA256 7aa97ac8887a9b2a29dd1856afdd6790d973d7f95ac0471b0196564da2e5084f
 MISC ChangeLog 66844 RMD160 12a3fc7193db3bdf80d67b1d85032c3e36efee14 SHA1 7068d1a553606fea6ab627574469bd4693e794ed SHA256 68db8151a13d32686014a11382311ce9173a6519782b4d398da15f9313940ae1
 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667

diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index 8c9fa0122deb3645972edb3739f61b46ce19b8ca..cb0d76294a4751e4048936237609ebc00ce144c4 100644 (file)
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.ebuild
@@ -1,10 +1,10 @@
 # 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.8 2010/06/14 17:03:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.9 2010/07/04 12:24:16 mabi Exp $
 
 EAPI=2
 
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid sybase-ct"
+PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
@@ -74,7 +74,7 @@ SAPIS="cli cgi embed apache2"
 # Gentoo-specific, common features
 IUSE="kolab"
 
-# SAPIs and SAPI-specific USE flags:
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
 IUSE="${IUSE}
        +${SAPIS}
        concurrentmodphp threads"
@@ -134,7 +134,7 @@ 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 ) )
-       mssql? ( dev-db/freetds )
+       mssql? ( dev-db/freetds[mssql] )
        !mysqlnd? (
                mysql? ( virtual/mysql )
                mysqli? ( >=virtual/mysql-4.1 )
@@ -166,6 +166,7 @@ DEPEND="app-admin/php-toolkit
        sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
        sqlite3? ( =dev-db/sqlite-3* )
        ssl? ( >=dev-libs/openssl-0.9.7 )
+       sybase-ct? ( dev-db/freetds )
        tidy? ( app-text/htmltidy )
        truetype? (
                =media-libs/freetype-2*
@@ -214,7 +215,6 @@ RDEPEND="${DEPEND}
        empress? ( $php[odbc] )
        esoob? ( $php[odbc] )
        db2? ( $php[odbc] )
-       iodbc? ( $php[iodbc] )
        sapdb? ( $php[odbc] )
        solid? ( $php[odbc] )
        kolab? ( $php[imap] )