Fix for bug #60247 is needed again, I'll submit a proper fix upstream later.

4 files changed, 61 insertions, 23 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 1e92b229e004..a597b7ada6da 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.41 2004/09/28 17:28:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.42 2004/09/29 03:57:15 robbat2 Exp $
+
+*php-cgi-4.3.9-r1 (28 Sep 2004)
+
+  28 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +php-cgi-4.3.9-r1.ebuild:
+  Fix for bug #60247 is needed again, I'll submit a proper fix upstream later.
 
   28 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> php-cgi-4.3.9.ebuild:
   Stable on x86.
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index ece38670f582..2fc3675d31eb 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,32 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 206c7bebecfd63ba05c23d7e6cbcd74b ChangeLog 5627
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 ca42c18e46b70937fe8c3ff46ec89dc2 php-cgi-4.3.8-r1.ebuild 771
-MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886
+MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
+MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
 MD5 3411777bc579d53726a119e9bcd58c0c php-cgi-4.3.9_rc1.ebuild 866
 MD5 dea7eefba04e3e8d7fa6dcb9f01bd95a php-cgi-5.0.0-r1.ebuild 898
-MD5 dffa69fb33eb0cadc0ba2d01e178dda8 php-cgi-5.0.1.ebuild 895
-MD5 a673bafe30cbf7e555363d4c6a136081 php-cgi-4.3.8.ebuild 752
 MD5 ff8d280e1df6a129bc07898d5acbb1c0 php-cgi-5.0.0.ebuild 751
 MD5 dc331b0bb956eebf1e51a1ab9fc6c5a2 php-cgi-4.3.9.ebuild 796
+MD5 9e468f397224b0e62b22342aeb6a5667 php-cgi-4.3.9-r1.ebuild 811
 MD5 7e76422a184b68458a18cdc7a5a21834 php-cgi-5.0.2.ebuild 897
-MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 6069f9c2784adf67f7fb2ed0e860ca0d php-cgi-4.3.9_rc1-r1.ebuild 886
+MD5 c5d7631700ac9355594a2c1c22edcc3e ChangeLog 5819
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1 208
 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9 205
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-cgi-5.0.2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBWarkHTu7gpaalycRAoPWAJwL0FcWGiNuLrr0o6xarEW6zkZd7wCfaMtF
-DFE+pSOFiUlnNzkKvNyhWWM=
-=mfqb
------END PGP SIGNATURE-----
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
+MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-php-cgi-4.3.9-r1 205
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.9-r1 b/dev-php/php-cgi/files/digest-php-cgi-4.3.9-r1
new file mode 100644
index 000000000000..b10301d72f1f
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.9-r1
@@ -0,0 +1,3 @@
+MD5 b799bbb330da60324d972641baab693c php-4.3.9.tar.bz2 4001681
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
diff --git a/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild b/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild
new file mode 100644
index 000000000000..43f688c18a32
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.9-r1.ebuild,v 1.1 2004/09/29 03:57:15 robbat2 Exp $
+
+PHPSAPI="cgi"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="x86 sparc alpha ~hppa ppc ia64"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.9"
+PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
+
+src_compile() {
+	# CLI needed to build stuff
+	myconf="${myconf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	php-sapi_src_compile
+}
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	rm -f ${D}/usr/bin/php
+	# rename binary
+	newbin ${S}/sapi/cgi/php php-cgi
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CGI only build."
+}