version bump

(Portage version: 2.0.51.19)

4 files changed, 78 insertions, 23 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index fd8dac908cdf..e6c8998e0e31 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.70 2005/05/19 20:25:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.71 2005/06/11 00:19:34 stuart Exp $
+
+*php-cgi-5.0.4 (11 Jun 2005)
+
+  11 Jun 2005; Stuart Herbert <stuart@gentoo.org> +php-cgi-5.0.4.ebuild:
+  Version bump; uses new -r2 eclass
 
   19 May 2005; Robin H. Johnson <robbat2@gentoo.org>
   php-cgi-4.3.9_rc1.ebuild, php-cgi-4.3.9_rc1-r1.ebuild,
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index d53630dcac8b..fb36ec2ce8b8 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,38 +1,40 @@
+MD5 28be59eda18e8d854df91f2ee4e87b49 ChangeLog 9347
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 1b42fac49fa9ef2c59613ec2177f3d5d php-cgi-5.0.0-r1.ebuild 886
+MD5 dceed980602910f4b477dfec8d31bc68 php-cgi-4.3.9_rc1.ebuild 860
 MD5 b0699992939c804bbc6e2382978bbe1f php-cgi-4.3.8-r1.ebuild 767
+MD5 bd43248eeca41df5712a8cd1d8fad2b1 php-cgi-4.3.9_rc1-r1.ebuild 878
 MD5 a2364c381c6ecc36e77343399d311f8f php-cgi-4.3.8.ebuild 749
+MD5 aa06aa749dabb98ee9aa40540115f887 php-cgi-5.0.4.ebuild 1098
 MD5 a3c5b4fac880abaa735f3edede458a2c php-cgi-5.0.1.ebuild 885
-MD5 09d3d3d80c7d19497f383b50f0d6f2f6 php-cgi-4.3.11.ebuild 995
-MD5 dceed980602910f4b477dfec8d31bc68 php-cgi-4.3.9_rc1.ebuild 860
-MD5 5413aa2dfe22ecd23ee9e5b920c42916 php-cgi-5.0.3.ebuild 1074
-MD5 1b42fac49fa9ef2c59613ec2177f3d5d php-cgi-5.0.0-r1.ebuild 886
-MD5 4e5fd8a7135193edde701a23138ee86d php-cgi-5.0.0.ebuild 750
-MD5 0027de1560a23faca547c7531eebce2f php-cgi-4.3.9.ebuild 790
-MD5 46aebfa8a26be82c3c0a32aab969f492 php-cgi-4.3.10.ebuild 921
-MD5 5f883b12ada0df1d37a26ef42a480bd6 php-cgi-5.0.3-r1.ebuild 1200
 MD5 a4c7d82cf8fe5d4b82eff5a4b283d882 php-cgi-4.3.9-r1.ebuild 808
+MD5 0027de1560a23faca547c7531eebce2f php-cgi-4.3.9.ebuild 790
 MD5 270f3b6a132ee528a0fd55b810e02eb3 php-cgi-5.0.2.ebuild 898
-MD5 bd43248eeca41df5712a8cd1d8fad2b1 php-cgi-4.3.9_rc1-r1.ebuild 878
+MD5 46aebfa8a26be82c3c0a32aab969f492 php-cgi-4.3.10.ebuild 921
+MD5 5413aa2dfe22ecd23ee9e5b920c42916 php-cgi-5.0.3.ebuild 1074
+MD5 4e5fd8a7135193edde701a23138ee86d php-cgi-5.0.0.ebuild 750
+MD5 09d3d3d80c7d19497f383b50f0d6f2f6 php-cgi-4.3.11.ebuild 995
 MD5 ec6a9c89ec2cc50a21a6beba1811af20 php-cgi-4.3.11-r1.ebuild 1118
-MD5 28be59eda18e8d854df91f2ee4e87b49 ChangeLog 9347
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 5f883b12ada0df1d37a26ef42a480bd6 php-cgi-5.0.3-r1.ebuild 1200
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0-r1 63
-MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-cgi-5.0.3-r1 63
-MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11-r1 284
+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 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
+MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
+MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
 MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9 282
+MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
-MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-cgi-5.0.1 63
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9-r1 282
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-cgi-5.0.2 63
+MD5 7304d443039ee9ef328e98a346f3056e files/digest-php-cgi-4.3.10 284
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-cgi-5.0.3 63
-MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-php-cgi-4.3.9_rc1-r1 208
-MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8-r1 282
-MD5 24b9b19a4420d27906e4aface78ed963 files/digest-php-cgi-4.3.9-r1 282
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 f7a7898637874593f519c336db79fa45 files/php-cgi-5.0.3-missing-arches.patch 524
-MD5 7304d443039ee9ef328e98a346f3056e files/digest-php-cgi-4.3.10 284
 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11 284
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-php-cgi-4.3.11-r1 284
+MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-cgi-5.0.3-r1 63
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 457955f18cb41f31bab803aac779573c files/digest-php-cgi-5.0.4 140
diff --git a/dev-php/php-cgi/files/digest-php-cgi-5.0.4 b/dev-php/php-cgi/files/digest-php-cgi-5.0.4
new file mode 100644
index 000000000000..7ffa29e520c6
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.4
@@ -0,0 +1,2 @@
+MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
+MD5 60b3a09d4ea271961a0abe480a5368a2 hardened-php-5.0.4-0.2.7.patch.gz 20011
diff --git a/dev-php/php-cgi/php-cgi-5.0.4.ebuild b/dev-php/php-cgi/php-cgi-5.0.4.ebuild
new file mode 100644
index 000000000000..d11595b5ddda
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.4.ebuild,v 1.1 2005/06/11 00:19:34 stuart Exp $
+
+PHPSAPI="cgi"
+MY_PHP_P="php-${PV}"
+PHP_S="${WORKDIR}/${MY_PHP_P}"
+PHP_PACKAGE=1
+
+inherit php5-sapi-r2 eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+LICENSE="PHP"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+DEPEND="$DEPEND"
+RDEPEND="$RDEPEND"
+PROVIDE="virtual/php-cgi virtual/php-httpd"
+SLOT="0"
+
+PHP_INSTALLTARGETS="install"
+
+src_unpack() {
+	php5-sapi-r2_src_unpack
+
+	###########################################################################
+	# DO NOT ADD YOUR PATCHES HERE
+	#
+	# Please add your patches into the eclass, where they belong!
+	#
+	# Thanks,
+	# Stu
+	###########################################################################
+}
+
+src_compile () {
+	my_conf="--disable-cli --enable-cgi"
+	php5-sapi-r2_src_compile
+}
+
+src_install () {
+	php5-sapi-r2_src_install
+
+	# PHP's makefile calls the cgi bin 'php'
+	# we need to rename it by hand
+	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}