add in fix for pear.conf issue, bug #36455.

4 files changed, 55 insertions, 2 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index cb7b555bae1c..c4d1181f22ec 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.80 2004/04/01 06:33:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.81 2004/04/01 08:22:12 robbat2 Exp $
+
+*php-4.3.5-r1 (01 Apr 2004)
+
+  01 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.5-r1.ebuild:
+  add in fix for pear.conf issue, bug #36455.
 
   31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r1.ebuild,
   php-4.3.2-r2.ebuild, php-4.3.2-r3.ebuild, php-4.3.2.ebuild,
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 615187d35282..ac9576364687 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,11 +1,13 @@
 MD5 db72709573c572cf5f41f9c0d192be83 php-5.0_beta1-r1.ebuild 1284
 MD5 b79d62ef2f1f57436feebcba1f8f115c php-4.3.5.ebuild 1301
+MD5 cb0b21f2f820e7210c03fd5dc56fd9aa php-4.3.5-r1.ebuild 1049
 MD5 ca1f3482b0ecc4d25fae4c7c1bbecf00 php-4.3.4-r4.ebuild 1378
 MD5 2c4f329f8ef101fc4b4c2853d870b04f php-5.0_beta1.ebuild 1164
-MD5 8c3b4792cf65b5b7240853533082bd33 ChangeLog 12624
+MD5 e1eb53d9053d58a6e3ad64a337046ae1 ChangeLog 12774
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r4 137
+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 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
diff --git a/dev-php/php/files/digest-php-4.3.5-r1 b/dev-php/php/files/digest-php-4.3.5-r1
new file mode 100644
index 000000000000..97a47f67dfbc
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.5-r1
@@ -0,0 +1 @@
+MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
diff --git a/dev-php/php/php-4.3.5-r1.ebuild b/dev-php/php/php-4.3.5-r1.ebuild
new file mode 100644
index 000000000000..8b7a92ac0fea
--- /dev/null
+++ b/dev-php/php/php-4.3.5-r1.ebuild
@@ -0,0 +1,45 @@
+# 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 $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+
+src_unpack() {
+	php-sapi_src_unpack
+	if [ "${ARCH}" == "amd64" ] ; then
+		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+	fi
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_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
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}