can not have use-deps on old style virtuals

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

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index e3e95f0fc20c69ce44275ce3e09eae46a7ccb39c..fcb0a5e231e5ab7c9e460cb018f07401219cefc3 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.390 2010/07/05 23:22:43 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.391 2010/07/08 22:39:52 mabi Exp $
+
+  08 Jul 2010; Matti Bickel <mabi@gentoo.org>
+  files/eblits/pkg_setup-v1.eblit, php-5.3.2.ebuild:
+  can not have use-deps on old style virtuals
 
   05 Jul 2010; Matti Bickel <mabi@gentoo.org>
   files/eblits/src_configure-v1.eblit:

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index dba77e00e5cfc11d1e47dd72760a6f43b809f62b..883bd139b9e6b7f0f5a483053db0903323ecb9e6 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,7 +5,7 @@ AUX 70_mod_php5_concurr.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95c
 AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7ad941620e199 SHA1 c42a23bd7a1d3e8c7e0ac906f50f180116349f76 SHA256 c05f499d9c8927391c586b94716a9f59d63767165552ea527ec7ff63c36eaa40
 AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
 AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
-AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
+AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a
 AUX eblits/src_compile-v1.eblit 1851 RMD160 64e65a7647907da821a277da9a4df970ae3bda0b SHA1 c22b8c4526ce081fb7de8234d93cc8cfa2616414 SHA256 da47bc9f75ba4de64c1848b07ea1324b707301421431f469296f32a8f2369648
 AUX eblits/src_configure-v1.eblit 9920 RMD160 3c0525eeeb3a1b9ad57f4d72b90640f065daff2d SHA1 71eecebfb96b202dc3ffae6ffda4b67902217e6e SHA256 52ecae46f02d7e1e8db983335ef4bad1e73ec9249e34d61391359a8c690f6fd3
 AUX eblits/src_install-v1.eblit 4025 RMD160 150514ec274f0892ee271466015116493eb4a74e SHA1 91b7bffec8fccf4b3230e2072e0ccf555b4c671e SHA256 2b1da468a1ecfa1507b9ab51e626203d421e5c4a3b694d77b01c065e3ae4fcff
@@ -21,6 +21,6 @@ DIST php-patchset-5.3.2-r1.tar.bz2 9702 RMD160 40cdb57493dc44640cf0b9ab545d0206e
 DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935 SHA1 e2faf8db2d7facbd44cee2f737ce87732835d341 SHA256 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184
 DIST suhosin-patch-5.3.2-0.9.9.1.patch.gz 40847 RMD160 64d8b7ec2ec91fd7a43b0cd95c0aa0df5b666768 SHA1 c48d3f24341d3b0214ca3e980320b23864aa93ba SHA256 a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2
 EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d
-EBUILD php-5.3.2.ebuild 9365 RMD160 afe466f09d14dc5ee20f8a55ba153500e115babe SHA1 37be3c2c873b0ac97c8f2fd0598f0af18e5ae01f SHA256 fc26ce0a37c9e2bce49b9b29fe7fa2daef76ef9075103f8e4b80eda1378ff35c
-MISC ChangeLog 67551 RMD160 02dbd6d964b47f61f3ac0501afd8f595ada926ab SHA1 11da636fb2f765d1d7ca5effc2a925e50de4eb6a SHA256 d8247966808a17a7a6a808293406478011fd94f3c367a3aff0bc6f6f2e662519
+EBUILD php-5.3.2.ebuild 9324 RMD160 7e671c9dc0f63062b462cc33ead964585222966a SHA1 ff40819656c68b000fa74e41ef40dba875450a2e SHA256 2cba08c33905f3bce86ad496d1623ff96b06c6efa12d4527558d5fed4bc3dc47
+MISC ChangeLog 67697 RMD160 dfa636f30db078f8bd91c262fb973198d42f3342 SHA1 4e0d05023521919053cc5c78cf3e2618584adfab SHA256 c3fd8280aec56000e1ebb6c62b672f9b2f6989f6ba5e4690926f4b6b5136dd1d
 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667

diff --git a/dev-lang/php/files/eblits/pkg_setup-v1.eblit b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
index 05aa23b92701dfa793190c27e954619d3cff72b7..f487a0b309e31725e1ad7acf098897cd298778c0 100644 (file)
--- a/dev-lang/php/files/eblits/pkg_setup-v1.eblit
+++ b/dev-lang/php/files/eblits/pkg_setup-v1.eblit
@@ -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/files/eblits/pkg_setup-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v1.eblit,v 1.2 2010/07/08 22:39:52 mabi Exp $
 
 eblit-php-pkg_setup() {
        if use concurrentmodphp || use kolab ; then
@@ -13,6 +13,11 @@ eblit-php-pkg_setup() {
        # Mail support
        php_check_mta
 
+       # imap support
+       # if virtuals/imap-c-client goes to new style virtual, we  can exchange this
+       # for proper use-deps
+       php_check_imap
+
        # Oracle support
        php_check_oracle_8
 

diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index 2e4983f5d0ca04a285e56cc9b7a8901fcc20d85e..0514c87bd00887018c270dbf6195b0cf123cb798 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.11 2010/07/05 14:10:06 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.12 2010/07/08 22:39:52 mabi Exp $
 
 EAPI=2
 
@@ -123,10 +123,7 @@ DEPEND="app-admin/php-toolkit
        gdbm? ( >=sys-libs/gdbm-1.8.0 )
        gmp? ( >=dev-libs/gmp-4.1.2 )
        iconv? ( virtual/libiconv )
-       imap? (
-               virtual/imap-c-client[ssl=]
-               virtual/imap-c-client[kolab=]
-       )
+       imap? ( virtual/imap-c-client )
        intl? ( dev-libs/icu )
        iodbc? ( dev-db/libiodbc )
        kerberos? ( virtual/krb5 )