fix oops with pear config file that caused install problems

4 files changed, 75 insertions, 20 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index f6d7cc7c60ad..f4a75fb4540d 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.71 2004/01/12 18:07:09 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.72 2004/01/16 20:37:04 robbat2 Exp $
+
+*php-4.3.4-r3 (16 Jan 2004)
+
+  16 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.4-r3.ebuild:
+  fix oops with pear config file that caused install problems
 
   12 Jan 2004; Guy Martin <gmsoft@gentoo.org> php-4.3.4-r2.ebuild,
   php-4.3.3-r2.ebuild :
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 69c637e26f62..3143bf35df3d 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,29 +1,31 @@
-MD5 41dfc4060bae1136d3725c72601372ef ChangeLog 11308
+MD5 5cbd6f925e1ab9bdc352f4c1d2cdcad3 php-4.3.4-r2.ebuild 1135
+MD5 db72709573c572cf5f41f9c0d192be83 php-5.0_beta1-r1.ebuild 1284
+MD5 44032cb601378cfb68cc611c3d73c027 php-4.3.2-r3.ebuild 1128
+MD5 64fee58bb5521beb3ced6a2173ef4682 php-4.3.3-r2.ebuild 1198
+MD5 9d440b124987696f55359c54ef510656 php-4.3.2.ebuild 2406
+MD5 8b866478b9f1ec3d136b503e1f3f8352 php-4.3.4-r1.ebuild 1283
+MD5 73c273747e4324f86cddb2bcf54dd923 php-4.3.2-r2.ebuild 1170
+MD5 c0e042bf7276ef1642b339ef04f8cda0 php-4.3.4.ebuild 1204
+MD5 76a2775ff6ee1b94403b2b54b3afcb6e php-4.3.4-r3.ebuild 1257
+MD5 0641aac580bbe91ba865933b7ae6130c php-4.3.3-r1.ebuild 1197
+MD5 2c4f329f8ef101fc4b4c2853d870b04f php-5.0_beta1.ebuild 1164
+MD5 6973bdeddbe561f9c4102b350760d789 ChangeLog 11473
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 02828b6fa75a43b15d78d0966e1d8400 php-4.3.2-r1.ebuild 979
-MD5 91f4a7fde0f3e06d7e7cfa4bb3f914c2 php-4.3.2-r2.ebuild 1171
-MD5 71a3e4aa0b406c4cb3282bb61b633376 php-4.3.2-r3.ebuild 1129
-MD5 fbe255ea8c0fba329faf947ec54b3d17 php-4.3.2.ebuild 2407
-MD5 139eb871907b545773766aa53589df9e php-4.3.3-r1.ebuild 1198
-MD5 402def0cf0a5834644497f8d6cf82f6c php-4.3.3-r2.ebuild 1199
-MD5 4e31b0c66c87e0c0fb4e0f01105f1873 php-4.3.3-r3.ebuild 1208
-MD5 2a544714659ee2a1c457d445d16e24b3 php-4.3.3.ebuild 1199
-MD5 2fe52c31a29123ad2f6d31dc864b4d7d php-4.3.4-r1.ebuild 1284
-MD5 09136ad03063a7b74db16d9be9c651dc php-4.3.4.ebuild 1205
-MD5 bcd91247964caa0747b672f519b2b9a5 php-5.0_beta1-r1.ebuild 1285
-MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
-MD5 b2e03c90ac8671fbd669d028538136ca php-4.3.4-r2.ebuild 1136
-MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2 137
+MD5 3fcea37aff85c97681f35ebe4e39a26f php-4.3.3-r3.ebuild 1207
+MD5 bac39ed18f8e24bc8b6ae6613328a6e1 php-4.3.2-r1.ebuild 978
+MD5 d9086ac6b0865e852cc97dd052bb2f52 php-4.3.3.ebuild 1198
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r3 137
-MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r1 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r3 137
-MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-php-4.3.4 208
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r1 137
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r2 137
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r3 137
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r2 137
+MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2 137
+MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3 137
+MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-php-4.3.4 208
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
diff --git a/dev-php/php/files/digest-php-4.3.4-r3 b/dev-php/php/files/digest-php-4.3.4-r3
new file mode 100644
index 000000000000..d65ce9576341
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.4-r3
@@ -0,0 +1,2 @@
+MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/php-4.3.4-r3.ebuild b/dev-php/php/php-4.3.4-r3.ebuild
new file mode 100644
index 000000000000..5e2eb56c4a43
--- /dev/null
+++ b/dev-php/php/php-4.3.4-r3.ebuild
@@ -0,0 +1,46 @@
+# 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-r3.ebuild,v 1.1 2004/01/16 20:37:04 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc alpha hppa amd64 ia64"
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli install-programs install-pear install-build install-headers"
+	php-sapi_src_install
+
+	einfo "Fixing PEAR cache location"
+	local oldloc="${T}/pear/cache"
+	local old="s:${#oldloc}:\"${oldloc}\""
+	local newloc="/tmp/pear/cache"
+	local new="s:${#newloc}:${newloc}"
+	sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
+	keepdir /tmp/pear/cache
+
+	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
+}