make things quieter, and mark 4.3.6 stable on x86

8 files changed, 44 insertions, 39 deletions

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index f008c6c8a25f..4b44a7c394a0 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,18 +1,18 @@
+MD5 e9cc6d5e90e3eb00a772fcd7a3aeb763 mod_php-4.3.6.ebuild 5743
+MD5 7c41f95026fdedf98adc845720f210e2 mod_php-4.3.6-r1.ebuild 5745
+MD5 48f8711aed7e1367152caea1db32de14 mod_php-4.3.5.ebuild 5743
+MD5 55fba46f2a3217cb73cde464c1455f62 ChangeLog 27894
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 00d0c8758562728658113d0bf0ecbbaf mod_php-4.3.6_rc2.ebuild 5789
+MD5 1e6fd83e7691b1437ec8c5806ca221be mod_php-4.3.4-r4.ebuild 5387
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
 MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137
+MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6 205
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 8e71c532a5a8bbb19be4c057cf1d776b files/digest-mod_php-4.3.6_rc2 208
-MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6 205
-MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6-r1 205
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r4 137
-MD5 7d08154bdfb453db6853032374e09e2f ChangeLog 27800
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 0c74a1dba68c0efccf8c1b2742fc7b59 mod_php-4.3.5.ebuild 5744
-MD5 4bbcf8992e233b1c0293173cde33be6c mod_php-4.3.6_rc2.ebuild 5790
-MD5 8a0550a13803d381fccf97c626cb6de1 mod_php-4.3.6.ebuild 5744
-MD5 3ba9769fb570c4a6dde5a022bc4a6f1f mod_php-4.3.6-r1.ebuild 5747
-MD5 6d8c41f424b97b40ed9be1b1ace46627 mod_php-4.3.4-r4.ebuild 5388
+MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6-r1 205
+MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 49d8a1cc1954..dd980a9c4697 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.84 2004/04/21 00:36:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.85 2004/05/04 23:23:24 robbat2 Exp $
+
+  04 May 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.4-r4.ebuild,
+  php-4.3.5-r1.ebuild, php-4.3.5.ebuild, php-4.3.6.ebuild,
+  php-4.3.6_rc2.ebuild:
+  make things quieter, and mark 4.3.6 stable on x86
 
   20 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> :
   pcre fix bug #47498
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 716e0583794b..14c72a243274 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,18 +1,18 @@
-MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
-MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5-r1 63
+MD5 db72709573c572cf5f41f9c0d192be83 php-5.0_beta1-r1.ebuild 1284
+MD5 dbc6a4888019558b88925680b7dad634 php-4.3.5.ebuild 1332
+MD5 4557278df0e67c7fa32ab901fce377b1 php-4.3.5-r1.ebuild 1083
+MD5 9b8d83a964cfe89c9f7247dffdd47ebe php-4.3.4-r4.ebuild 1409
+MD5 2c4f329f8ef101fc4b4c2853d870b04f php-5.0_beta1.ebuild 1164
+MD5 0714decf2797f506949254e9f2559527 php-4.3.6.ebuild 1079
+MD5 898155ca216918f4c51b34a2df028b8b ChangeLog 13318
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 56999d1b2c6e7eb98b17df5f4e8a0ea7 php-4.3.6_rc2.ebuild 1130
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
 MD5 9e8cc85bdcd5d6473df932c693647dc9 files/digest-php-4.3.6_rc2 134
-MD5 6eae78465f67d5f837cbb8978a41c512 files/digest-php-4.3.6 131
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 77b8adf08a7697becbfea770f85fd33d files/digest-php-4.3.4-r4 63
+MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5-r1 63
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 77b8adf08a7697becbfea770f85fd33d files/digest-php-4.3.4-r4 63
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 b9d67591732c3964ec8f82d2dc06e505 ChangeLog 13109
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 6578b9b4911d29a349354934641ca9b9 php-4.3.5-r1.ebuild 1055
-MD5 30ef8eb0fa16fc2891a99661c2cde7f4 php-4.3.5.ebuild 1302
-MD5 7ee8becdbb65e8954bb5bf61672ff497 php-4.3.6_rc2.ebuild 1102
-MD5 76ca087fbbb9d9fca788ce995f5b20e4 php-4.3.6.ebuild 1052
-MD5 bcd91247964caa0747b672f519b2b9a5 php-5.0_beta1-r1.ebuild 1285
-MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
-MD5 791de6564dbf283f21abce7146c3012e php-4.3.4-r4.ebuild 1379
+MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
+MD5 6eae78465f67d5f837cbb8978a41c512 files/digest-php-4.3.6 131
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
diff --git a/dev-php/php/php-4.3.4-r4.ebuild b/dev-php/php/php-4.3.4-r4.ebuild
index bf879f3c9e53..eb9a080baa64 100644
--- a/dev-php/php/php-4.3.4-r4.ebuild
+++ b/dev-php/php/php-4.3.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.4-r4.ebuild,v 1.3 2004/02/06 22:12:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.4-r4.ebuild,v 1.4 2004/05/04 23:23:24 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
@@ -46,7 +46,7 @@ pkg_postinst() {
 	einfo "This is a CLI only build."
 	einfo "You cannot use it on a webserver."
 
-	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
 		einfo "Cleaning up an old PEAR install glitch"
 		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
 	fi
diff --git a/dev-php/php/php-4.3.5-r1.ebuild b/dev-php/php/php-4.3.5-r1.ebuild
index 8b7a92ac0fea..a3d2d1c7923b 100644
--- a/dev-php/php/php-4.3.5-r1.ebuild
+++ b/dev-php/php/php-4.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5-r1.ebuild,v 1.1 2004/04/01 08:22:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5-r1.ebuild,v 1.2 2004/05/04 23:23:24 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
@@ -38,7 +38,7 @@ pkg_postinst() {
 	einfo "This is a CLI only build."
 	einfo "You cannot use it on a webserver."
 
-	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
 		einfo "Cleaning up an old PEAR install glitch"
 		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
 	fi
diff --git a/dev-php/php/php-4.3.5.ebuild b/dev-php/php/php-4.3.5.ebuild
index 09dcafa9f2c9..72343beac5a1 100644
--- a/dev-php/php/php-4.3.5.ebuild
+++ b/dev-php/php/php-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5.ebuild,v 1.3 2004/03/30 19:28:58 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5.ebuild,v 1.4 2004/05/04 23:23:24 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
@@ -46,7 +46,7 @@ pkg_postinst() {
 	einfo "This is a CLI only build."
 	einfo "You cannot use it on a webserver."
 
-	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
 		einfo "Cleaning up an old PEAR install glitch"
 		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
 	fi
diff --git a/dev-php/php/php-4.3.6.ebuild b/dev-php/php/php-4.3.6.ebuild
index e890b9c04025..2e0c756e69fa 100644
--- a/dev-php/php/php-4.3.6.ebuild
+++ b/dev-php/php/php-4.3.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6.ebuild,v 1.1 2004/04/17 01:42:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6.ebuild,v 1.2 2004/05/04 23:23:24 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
 
 DESCRIPTION="PHP Shell Interpreter"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 
 src_unpack() {
 	php-sapi_src_unpack
@@ -38,7 +38,7 @@ pkg_postinst() {
 	einfo "This is a CLI only build."
 	einfo "You cannot use it on a webserver."
 
-	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
 		einfo "Cleaning up an old PEAR install glitch"
 		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
 	fi
diff --git a/dev-php/php/php-4.3.6_rc2.ebuild b/dev-php/php/php-4.3.6_rc2.ebuild
index a3a39b40d9c7..6a53a2279a4e 100644
--- a/dev-php/php/php-4.3.6_rc2.ebuild
+++ b/dev-php/php/php-4.3.6_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6_rc2.ebuild,v 1.1 2004/04/05 20:55:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6_rc2.ebuild,v 1.2 2004/05/04 23:23:24 robbat2 Exp $
 
 PHPSAPI="cli"
 SRC_URI_BASE="http://downloads.php.net/ilia/"
@@ -39,7 +39,7 @@ pkg_postinst() {
 	einfo "This is a CLI only build."
 	einfo "You cannot use it on a webserver."
 
-	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+	if [ -f "${ROOT}/root/.pearrc" -a "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
 		einfo "Cleaning up an old PEAR install glitch"
 		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
 	fi