make things quieter, and mark 4.3.6 stable on x86

6 files changed, 17 insertions, 12 deletions

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/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