bug #332423

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

3 files changed, 9 insertions, 16 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index f4e03358e53f..26d0647dd26e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
 # 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.411 2010/08/11 23:36:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.412 2010/08/12 18:07:15 mabi Exp $
+
+  12 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild:
+  patch tarball now includes the correctly named kolab patch (bug #332423)
 
   11 Aug 2010; Joseph Jezak <josejx@gentoo.org> php-5.2.14.ebuild,
   php-5.3.3-r1.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 59f5387cdbb8..3d8b078361f0 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
@@ -24,20 +21,13 @@ DIST php-5.2.13.tar.bz2 9084518 RMD160 9e21d32a7b757d25ed827834b26235ea1eebfcc8
 DIST php-5.2.14.tar.bz2 9055945 RMD160 f699488f5b266a1c5e36df570c4d5896dc4e0aea SHA1 311b44b2c0f2eea8ab8dab876d2a6b6e7a55632e SHA256 515b5fd41258798d59b93d86b0d752ab0b03e5738c32af444fba1907763c2bd1
 DIST php-5.3.3.tar.bz2 10662227 RMD160 9edb51663feac9b787f8382012893f1ac98fec6a SHA1 9f66716b341119e4e4f8fe3d81b7d0a5daf3cbc8 SHA256 f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a
 DIST php-patchset-5.2.13-r0.tar.bz2 10207 RMD160 b367c17742553fcfbf4cb1b76f8dd4aae9f08cf8 SHA1 20b60e3aef34d0b558f0c896c6981957490b2ba9 SHA256 c71dad65178186786393164a0cb4f056b85f0e00579da3dc2dbe5b863ec4262b
-DIST php-patchset-5.2.14-r0.tar.bz2 10414 RMD160 ce0d1dca4aaed5cd31bacd83e71711f4f2f4804d SHA1 2a0f77e69842481c9bb62960ddb9e35bfe8a5ab0 SHA256 3de5685514ff65fbaec71c4df93f14a0bb6b66de91b242d083e23329bf5c4bee
+DIST php-patchset-5.2.14-r1.tar.bz2 8381 RMD160 7f562ac7df8f918f6d73f61c4e2096a88759889d SHA1 0453926bccfd5bd8089c311f6e16f1e4a8c08993 SHA256 f49aacef203cee8e7ad038492ed43e7677ed2d22e0fef07dc840195cacc95d34
 DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665867d216 SHA1 6f582a41c3f8b9c73677124a631cee3c4390e3f1 SHA256 aa331a07d00eb92a6a4d1ba937377e17ec4e3fa099c4295f4ccb5602ee583ae7
 DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935 SHA1 e2faf8db2d7facbd44cee2f737ce87732835d341 SHA256 787743e5d201ab2ce3fcc3f252eedd7f167470fa1f55af0646d7f03aab89d184
 DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
 DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c SHA1 76675242cfdeff763767900213346af622002490 SHA256 f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
 EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d
-EBUILD php-5.2.14.ebuild 9169 RMD160 fc26801cf4884abae77bcf0c41a7df177b44a42b SHA1 f8df9f6c9449f4842423add82bfa4acffe4bcbf4 SHA256 f98fc097af4b9dbea1cebdf5cf7044ac51dee82f64da7f8acaf496235e85fd1e
+EBUILD php-5.2.14.ebuild 9168 RMD160 9f22184ddfa6cb462cf35c4e9af7948754dc9338 SHA1 476ff987b6a4614e9d43bb1a4cf3b84fd1c7fec2 SHA256 6857291e6cd719afd91049d1af04642a52e27a826e625b48d97a5f4d75c340f2
 EBUILD php-5.3.3-r1.ebuild 9489 RMD160 df49eb334096d97ee4fa7cc9aa8e322919822773 SHA1 d363bb6486e440f3344bc6ddb676f1b4051f7aa9 SHA256 0adb609ccaecf0366353def2bba991667b793c9d24a229054fdf5b2fc1eb7d62
-MISC ChangeLog 70938 RMD160 1da9bbd523ee64a36e96dad0829a7ea8e3dc93e2 SHA1 e2e73805211fd145472e0dd32886de9f18836797 SHA256 eb1ade5c6427c9686253ff42123b707ce85a990b258d681f514112c5e5c86894
+MISC ChangeLog 71077 RMD160 141bc3d37c29940886cd39b6cd5ab6f25c98efb6 SHA1 5af2e0d59df51f44a5563113cbb99966cc8a6b05 SHA256 66f63d2517a9756742441fa005b3f5ccdce1e32c47e61c3804d58e20b6a10d56
 MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxjM6MACgkQcsIHjyDViGTe5gCdFN6aiMj42kr+EHk6kjTMWqlt
-9NsAoNQMDHB6SgTXI/OSjke7A3Lhq8xk
-=T3vy
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.14.ebuild b/dev-lang/php/php-5.2.14.ebuild
index 7e8ebca0c988..2ffc48441260 100644
--- a/dev-lang/php/php-5.2.14.ebuild
+++ b/dev-lang/php/php-5.2.14.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.2.14.ebuild,v 1.7 2010/08/11 23:36:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.8 2010/08/12 18:07:15 mabi Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ interbase msql oci8 sapdb solid"
 # inherit autotools, because we call eautoreconf in the eblits
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
-PHP_PATCHSET=""
+PHP_PATCHSET="1"
 SUHOSIN_VERSION="$PV-0.9.7"
 EXPECTED_TEST_FAILURES=""