Revert, now it got even worse.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 21 insertions, 18 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b035cc3b4fdb..a1d97ea3a606 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.114 2006/08/10 23:32:26 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.115 2006/08/10 23:43:32 chtekk Exp $
+
+  10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild:
+  Revert, now it got even worse, fails on some of my systems too. :S
 
   10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild:
   Update patchset for PHP 4.4.3, it seems one of the patches randomly failed
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d59448782586..53b9483be18f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -48,7 +48,7 @@ DIST php-patchset-4.3.11-r3.tar.bz2 27977 RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a
 DIST php-patchset-4.4.2-r1.tar.bz2 13774 RMD160 95db8755a8d5d8972bc8bf5ecaf8740663f910d5 SHA1 23c63e357ce9e3d5015430da288ce805bff5bee5 SHA256 8106995c3243c604434cb4b4fdafc04db0e3604eccb7ba487724f44b892252e4
 DIST php-patchset-4.4.2-r3.tar.bz2 18063 RMD160 d7a06bb5cc4cff88e943c85f73adea92ed7eb4a7 SHA1 855351e32fc972a5585d913e37d98a5a2c653ec4 SHA256 203918cf6e984266196748342cdeaa1d30e1ecb971376e0a5d2aff09428538ac
 DIST php-patchset-4.4.2-r7.tar.bz2 24079 RMD160 9bd72618cb3ac7584bcbf5f41c7c7926590bc85b SHA1 3a1704b7c374ca79a9ba14f7287e8c1122380037 SHA256 44c976ee3df7b99ed014a1579264cdd069e9bd57efa2757ee4e06112d073fc5b
-DIST php-patchset-4.4.3-r2.tar.bz2 22681 RMD160 a66c021a3daf0ca6c192a75a71a7173e92122ee5 SHA1 e9ef9b5d18bda9b79ed303b8fae0e750ee46c2fa SHA256 d2a863084c675b97a1f701fbfbcab28da25b33f34682813e98b007984f5e5957
+DIST php-patchset-4.4.3-r1.tar.bz2 22814 RMD160 389617d7e3ed41f67ea284a907cf9a347c5bf471 SHA1 09fcb5faf25c584a9aca1495622717df81070e27 SHA256 16a7748f98cf8dbfeacebecdf57faed28e1176371ad89c62ce88c260811a0c41
 DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
 DIST php-patchset-5.1.4-r1.tar.bz2 7330 RMD160 ed33ee236286539a0614709d944ac636b84bca45 SHA1 acf60f1f750cb8c2a42d0b5478cf295c2c5a37ea SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961
 DIST php-patchset-5.1.4-r5.tar.bz2 21025 RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea SHA1 c0d23e0437878a54c8c06790cfe71de940ca2fa8 SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f
@@ -70,10 +70,10 @@ EBUILD php-4.4.2.ebuild 14557 RMD160 503ac43956034c09048fb503c0ec8e8183b9b83a SH
 MD5 18a50db5046960540ea7c86bcbb8408a php-4.4.2.ebuild 14557
 RMD160 503ac43956034c09048fb503c0ec8e8183b9b83a php-4.4.2.ebuild 14557
 SHA256 3ea41d08f3ec23aa107a34f11f8294ce6b73e995758e9e1f88858a1d5bbc215c php-4.4.2.ebuild 14557
-EBUILD php-4.4.3-r1.ebuild 15386 RMD160 ed0a25880d22bd8f7af4d98837c0bdcdf14cdb59 SHA1 6c9d692187f074d62487f7b01eec0b59b02da1e2 SHA256 7620a76fd513a11711d2e3ce478c849ef4dedd5700977b56344173787524d0c7
-MD5 4d3f6ad2a7d1ff10f18559ebffc8830c php-4.4.3-r1.ebuild 15386
-RMD160 ed0a25880d22bd8f7af4d98837c0bdcdf14cdb59 php-4.4.3-r1.ebuild 15386
-SHA256 7620a76fd513a11711d2e3ce478c849ef4dedd5700977b56344173787524d0c7 php-4.4.3-r1.ebuild 15386
+EBUILD php-4.4.3-r1.ebuild 15386 RMD160 04e027d6c582c5c47d5bcc117a32ad6a0ff61de0 SHA1 6d7eb29e52255a745d2fd891aa0edc5c718b140b SHA256 de898f3fbe7fc5e9b4309c8b261e355a9844d65ecaba464997b82067c6bf0b31
+MD5 1809249f4feb4519f195ecfbdb6053d1 php-4.4.3-r1.ebuild 15386
+RMD160 04e027d6c582c5c47d5bcc117a32ad6a0ff61de0 php-4.4.3-r1.ebuild 15386
+SHA256 de898f3fbe7fc5e9b4309c8b261e355a9844d65ecaba464997b82067c6bf0b31 php-4.4.3-r1.ebuild 15386
 EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996 SHA1 1d0b97da8e1cdeefacffd9e68dec94a94eb040db SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb
 MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
 RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
@@ -90,10 +90,10 @@ EBUILD php-5.1.4.ebuild 14575 RMD160 798bb61e46536dbb1429df96a5ab596457b01543 SH
 MD5 36747f311302de82fcacf093713361bb php-5.1.4.ebuild 14575
 RMD160 798bb61e46536dbb1429df96a5ab596457b01543 php-5.1.4.ebuild 14575
 SHA256 5055ab37f0e18f503f49e012bd01a02d1e8dd824cfed9aa76d27c44988b21123 php-5.1.4.ebuild 14575
-MISC ChangeLog 24741 RMD160 25e9ad2899db7da10db9a5ef8ff59cbd856e6232 SHA1 5f298191ae857b222002f158629e69edb610a00f SHA256 85fbe12c025ef80b5ff4803d2455d2dcf2a31226cd7d462b72a1eca1b6e3c23a
-MD5 2bc14f2d89c0a151bee8ca65de367506 ChangeLog 24741
-RMD160 25e9ad2899db7da10db9a5ef8ff59cbd856e6232 ChangeLog 24741
-SHA256 85fbe12c025ef80b5ff4803d2455d2dcf2a31226cd7d462b72a1eca1b6e3c23a ChangeLog 24741
+MISC ChangeLog 24883 RMD160 2de8e73fbf1a09c48d4a575e543be18053089c13 SHA1 c4bf63c0cde0c7b1fe163655bc1459467b24f97d SHA256 60c97222119e46b72825bfada2d9360d553cfe586e1c830a33b6ed1c3c474671
+MD5 c49916d25485e45e23f9073d1e66b89b ChangeLog 24883
+RMD160 2de8e73fbf1a09c48d4a575e543be18053089c13 ChangeLog 24883
+SHA256 60c97222119e46b72825bfada2d9360d553cfe586e1c830a33b6ed1c3c474671 ChangeLog 24883
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -110,9 +110,9 @@ SHA256 28d155fc949f922e9742f9ffa9800fe0efbcc22aa0729a93cd77c56fcfbf1f34 files/di
 MD5 d96dcb6c36a8d907794c8ea3008a613c files/digest-php-4.4.2-r6 819
 RMD160 0e0e73675ef2c0ac4a18d6f3e7248498303a8e3d files/digest-php-4.4.2-r6 819
 SHA256 12b893a3916430a02e6be38716485318febe1c72c9f84aca741cbefa9d3183cf files/digest-php-4.4.2-r6 819
-MD5 9d93b274ebb62d3984919e5c3e8412ea files/digest-php-4.4.3-r1 810
-RMD160 47c403038ebf3fe6114ecec412b943bdbaacc4a5 files/digest-php-4.4.3-r1 810
-SHA256 8e98a14cb9dd8516e9261e2e238ae9ae80db23535570825d98a89c3e753d1c68 files/digest-php-4.4.3-r1 810
+MD5 85d3cd25f3ab0e40dd7b9d1f55fb8617 files/digest-php-4.4.3-r1 810
+RMD160 b8074a648e27a37c0457fd8088bdbc256fd22333 files/digest-php-4.4.3-r1 810
+SHA256 e8b3f42b18f3afbc581cd427e98c6447f9ff0f416aac32ccd3bf4128cbf86444 files/digest-php-4.4.3-r1 810
 MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
 RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
 SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
diff --git a/dev-lang/php/files/digest-php-4.4.3-r1 b/dev-lang/php/files/digest-php-4.4.3-r1
index e04b5f1b8e81..f08155e73cd3 100644
--- a/dev-lang/php/files/digest-php-4.4.3-r1
+++ b/dev-lang/php/files/digest-php-4.4.3-r1
@@ -4,6 +4,6 @@ SHA256 4e09cd6cbd00e3a2199e6a68ab58875b133fea685500f2a35a2f7d348eaab44b hardenin
 MD5 9542117551c0e79f5bf21f46493094e7 php-4.4.3.tar.bz2 4461353
 RMD160 36c91930af44e8a1ed59eb159e6131ae8f0c77f0 php-4.4.3.tar.bz2 4461353
 SHA256 0f57da4b9d94f7febd37c0bc8e608e5aafafe744d094466723e04afb283407f7 php-4.4.3.tar.bz2 4461353
-MD5 60c4bec63184777d3f980be236928c0b php-patchset-4.4.3-r2.tar.bz2 22681
-RMD160 a66c021a3daf0ca6c192a75a71a7173e92122ee5 php-patchset-4.4.3-r2.tar.bz2 22681
-SHA256 d2a863084c675b97a1f701fbfbcab28da25b33f34682813e98b007984f5e5957 php-patchset-4.4.3-r2.tar.bz2 22681
+MD5 f53d57eca61739837334f56df400f199 php-patchset-4.4.3-r1.tar.bz2 22814
+RMD160 389617d7e3ed41f67ea284a907cf9a347c5bf471 php-patchset-4.4.3-r1.tar.bz2 22814
+SHA256 16a7748f98cf8dbfeacebecdf57faed28e1176371ad89c62ce88c260811a0c41 php-patchset-4.4.3-r1.tar.bz2 22814
diff --git a/dev-lang/php/php-4.4.3-r1.ebuild b/dev-lang/php/php-4.4.3-r1.ebuild
index 96440d4bcedf..a3bab9504ec6 100644
--- a/dev-lang/php/php-4.4.3-r1.ebuild
+++ b/dev-lang/php/php-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.3-r1.ebuild,v 1.4 2006/08/10 23:32:26 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.3-r1.ebuild,v 1.5 2006/08/10 23:43:32 chtekk Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,7 +20,7 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="2"
+PHP_PATCHSET_REV="1"
 HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.13-gentoo.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
 # php patch settings, ebuild specific