changing explicit depend on c-client back to the virtual, now that a recent enough uw-imap version is in the tree; stable dependencies are still broken in case of uw-imap, as the needed version is not stable

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 17 insertions, 11 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 0ab4ef144549..578e45d446ab 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.281 2008/07/20 13:40:26 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.282 2008/07/24 20:44:23 hoffie Exp $
+
+  24 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild,
+  php-5.2.6-r5.ebuild:
+  changing explicit depend on c-client back to the virtual, now that a
+  recent enough uw-imap version is in the tree; stable dependencies are
+  still broken in case of uw-imap, as the needed version is not stable
 
   20 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild:
   previous commit replaced CXXFLAGS by CFLAGS by accident, thanks to Rafał
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2e0a7194f20a..f7e9b7d3ceae 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -28,16 +28,16 @@ DIST suhosin-patch-5.2.6-0.9.6.2.patch.gz 22986 RMD160 f5e5e6d88b91506a49988e3b7
 EBUILD php-4.4.8.ebuild 13382 RMD160 17daef3621eff68c2f5e73f456e33eb8e57272bd SHA1 861b9ebfbcedd3b0d58337f493ec6f8403133ea6 SHA256 24bc333ebccaed00a396fe9f919d51bd1c9bac5387d5c897a8ee61d5befa626c
 EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab
 EBUILD php-5.2.6-r1.ebuild 15278 RMD160 f53b3bc7850482612b93e3c3ea84281ea973ba9c SHA1 e2f39c7c3184da46d37e36bcde4753073a81f4c3 SHA256 cd878246c44ada41e04ebdfc85a70c1a6de1ac5df0df164f006a73aba966acd4
-EBUILD php-5.2.6-r2.ebuild 15416 RMD160 0b9f4cf6fdcaf1a11eee238738b06faf8d81295f SHA1 8d7d6ee0deeab16f4e85105526a9dfcd2127623d SHA256 f4cd7d8238b753a83ff3c8fa1ebb2e7b48882401a1c0bc2479cd444e3c6cb1f8
-EBUILD php-5.2.6-r5.ebuild 15511 RMD160 f5be73b1ec96507e9beb8c69b999532ca2d849d0 SHA1 b8269b0576d44efc93716ce0d6ca53989da87ed1 SHA256 8eafa574f5d11c2e9c6dd417f1892c748d34ad664eec0152525499fec73932f1
+EBUILD php-5.2.6-r2.ebuild 15423 RMD160 640e51f190cdfe93ea36f7098b0c25a3e62d3d84 SHA1 d1a773b35c40c6d41a8cf0cd070cfe3febc96f48 SHA256 5c982bf757f54f4342567bca415dbdc571ac125fb99a11414cd4b63a0a30397b
+EBUILD php-5.2.6-r5.ebuild 15515 RMD160 d05b0a4e845fe47a883c3d73da7a0c1f0d1351fe SHA1 46ab96f2964ad8c07bc8ab881f8f9390d983e813 SHA256 388394db6cd970fd75d087748a108c7d35a096666f70b90d178482d7efbe4294
 EBUILD php-5.2.6.ebuild 15292 RMD160 f6157ccdaffbf24252e4d07e26ffa55cb46f3ff9 SHA1 dd479cc008ae5aee86a29e4eeb2297daadb60f3a SHA256 47285d81ade0c4323c862924251b1fdc4b34e29f461759a471494d96c9be422e
 EBUILD php-5.2.6_rc4.ebuild 14591 RMD160 10095304f21234059dff4b237f25c7d4eb1e4ad5 SHA1 1050e2ba6e1140f92e054ed8db201e499923cc13 SHA256 5bb2b6ecf9cb535c42983110cf3d5ea2ed99377cf53dca4330b1d8c6c8057d88
-MISC ChangeLog 50375 RMD160 cce3a017d850bb107eb502854b8c65afbd3393e5 SHA1 92ec8bc3469ad40d2979107ad9217c5db30809a9 SHA256 8a3135615586869f5541fe4b16bb74a09334adce5b46a1a5143e97103dcd6dba
+MISC ChangeLog 50688 RMD160 3b6386d8b955f4ccde12959222501bec24f20a35 SHA1 557f4fecd8433873348f006276b9e95dc643cb9c SHA256 59a3de1d4f6c6623854347e873ed9d321563344b02b5cb0c64e738cc305f7092
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiDQFAACgkQV6E0EIywUuXWPgCfU2r4Mger3kYEJ084W+vpj/Aq
-AgMAoIXY1Xcx0bKz307EteddcXYLhIKk
-=coiW
+iEYEARECAAYFAkiI6a0ACgkQV6E0EIywUuV9uACcDBzlyPyc+v/1fu965fkQFj5X
+A0QAoNFragWisBXIiPFdhC4Y0M1fwzZc
+=Lw0x
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.6-r2.ebuild b/dev-lang/php/php-5.2.6-r2.ebuild
index e94eb1058fac..552fe83e299b 100644
--- a/dev-lang/php/php-5.2.6-r2.ebuild
+++ b/dev-lang/php/php-5.2.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r2.ebuild,v 1.8 2008/07/11 01:39:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r2.ebuild,v 1.9 2008/07/24 20:44:23 hoffie Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -38,7 +38,7 @@ inherit versionator php5_2-sapi apache-module
 DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
 
 DEPEND="app-admin/php-toolkit
-	imap? ( >=net-libs/c-client-2006k )"
+	imap? ( >=virtual/imap-c-client-2006k )"
 RDEPEND="${DEPEND}"
 if [[ -n "${KOLAB_PATCH}" ]] ; then
 	IUSE="${IUSE} kolab"
diff --git a/dev-lang/php/php-5.2.6-r5.ebuild b/dev-lang/php/php-5.2.6-r5.ebuild
index 67ae785c7a30..d74ca922ec9a 100644
--- a/dev-lang/php/php-5.2.6-r5.ebuild
+++ b/dev-lang/php/php-5.2.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r5.ebuild,v 1.4 2008/07/20 13:40:26 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r5.ebuild,v 1.5 2008/07/24 20:44:23 hoffie Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -41,7 +41,7 @@ SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2
 DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
 
 DEPEND="app-admin/php-toolkit
-	imap? ( >=net-libs/c-client-2006k )"
+	imap? ( >=virtual/imap-c-client-2006k )"
 RDEPEND="${DEPEND}"
 if [[ -n "${KOLAB_PATCH}" ]] ; then
 	IUSE="${IUSE} kolab"