New version, solves bugs #73698, 73525, 72752, 72735.

6 files changed, 95 insertions, 24 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index c799f340c90f..bdc5ba7887af 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.131 2004/11/22 01:38:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.132 2004/12/16 06:45:44 robbat2 Exp $
+
+*php-4.3.10 (15 Dec 2004)
+*php-5.0.3 (15 Dec 2004)
+
+  15 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> +php-4.3.10.ebuild,
+  +php-5.0.3.ebuild:
+  New version, solves bugs #73698, 73525, 72752, 72735.
 
   21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   php-5.0.2-r1.ebuild:
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 8bc4755e778c..0a160caa8e8c 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,31 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2f6cfc9a623ff03ca36534d43b3a0f95 ChangeLog 18248
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137
-MD5 abf5f97a49422c509b77b8077d714153 php-5.0.0-r1.ebuild 540
+MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.10.ebuild 1077
 MD5 0413eca1cec9d3896cfe3634fd3e6806 php-5.0.1.ebuild 540
-MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.9.ebuild 1077
-MD5 66457079ee99ec81625f60af44bcda9c php-5.0.2.ebuild 558
+MD5 4a2d4a8397c2514cec55a8df4f62a778 php-5.0.3.ebuild 600
 MD5 4a2d4a8397c2514cec55a8df4f62a778 php-5.0.2-r1.ebuild 600
 MD5 48aa6f4b37fb2c3cc4fa6ad0527f4378 php-5.0.0.ebuild 521
+MD5 7efc53f2d831c9205887379e0f79aed5 php-4.3.9.ebuild 1077
+MD5 159ad5dc930e19ed38c8377ef7a8eb06 php-4.3.9_rc1.ebuild 1137
+MD5 66457079ee99ec81625f60af44bcda9c php-5.0.2.ebuild 558
+MD5 2f6cfc9a623ff03ca36534d43b3a0f95 ChangeLog 18248
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 abf5f97a49422c509b77b8077d714153 php-5.0.0-r1.ebuild 540
 MD5 43e57e69f231376d10554cf9874e8d5d php-4.3.8.ebuild 1071
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
 MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
-MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 b4787473c5b65d10113edd1635711e08 files/digest-php-4.3.9 131
-MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2-r1 63
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
 MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBoUN3ArHZZzCEUG0RAmR0AJ9dxABqLYdG65otqh4togypvLi5ngCdHSTF
-yYnmiodDrZr+vQ44Y6o6FcU=
-=7vBm
------END PGP SIGNATURE-----
+MD5 b4787473c5b65d10113edd1635711e08 files/digest-php-4.3.9 131
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
+MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3 63
+MD5 541741db181f5a324ab6061ffd2ac424 files/digest-php-4.3.10 132
diff --git a/dev-php/php/files/digest-php-4.3.10 b/dev-php/php/files/digest-php-4.3.10
new file mode 100644
index 000000000000..3a29eb41ca6e
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.10
@@ -0,0 +1,2 @@
+MD5 7e56824dae9679c59a8234eb848aa542 php-4.3.10.tar.bz2 4026148
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php/files/digest-php-5.0.3 b/dev-php/php/files/digest-php-5.0.3
new file mode 100644
index 000000000000..eb20872d0cc2
--- /dev/null
+++ b/dev-php/php/files/digest-php-5.0.3
@@ -0,0 +1 @@
+MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759
diff --git a/dev-php/php/php-4.3.10.ebuild b/dev-php/php/php-4.3.10.ebuild
new file mode 100644
index 000000000000..1dfc67002ed3
--- /dev/null
+++ b/dev-php/php/php-4.3.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.10.ebuild,v 1.1 2004/12/16 06:45:44 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~s390 ~ppc64 ~mips"
+IUSE=""
+
+src_unpack() {
+	php-sapi_src_unpack
+	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+}
+
+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 [ -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-5.0.3.ebuild b/dev-php/php/php-5.0.3.ebuild
new file mode 100644
index 000000000000..bd9b35686fa6
--- /dev/null
+++ b/dev-php/php/php-5.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.3.ebuild,v 1.1 2004/12/16 06:45:44 robbat2 Exp $
+
+PHPSAPI="cli"
+MY_P="${PN}-${PV}"
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+LICENSE="PHP"
+KEYWORDS="~arm ~hppa ~ia64 ~ppc ~x86 ~ppc64"
+DEPEND="$DEPEND"
+RDEPEND="$RDEPEND"
+PROVIDE="virtual/php-${PV}"
+SLOT="0"
+
+# PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
+
+src_compile () {
+	my_conf="--disable-cgi --enable-cli --enable-embed"
+
+	php5-sapi_src_compile
+}