Fixes for installing the CLI sapi

(Portage version: 2.0.51.19)

3 files changed, 45 insertions, 30 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 67664aba2583..de432fde0e5d 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.161 2005/06/09 18:57:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.162 2005/06/10 23:45:29 stuart Exp $
+
+*php-5.0.4 (11 Jun 2005)
+
+  11 Jun 2005; Stuart Herbert <stuart@gentoo.org> php-5.0.4-r1.ebuild,
+  php-5.0.4.ebuild:
+  Finished the ebuild; now installs the cli correctly
 
   09 Jun 2005; Markus Rothe <corsair@gentoo.org> php-5.0.4.ebuild,
   php-5.0.4-r1.ebuild:
@@ -24,6 +30,11 @@
   php-5.0.3-r1.ebuild:
   Patch to fix compilation with GCC4 ; bug #94282
 
+*php-5.0.4 (22 May 2005)
+
+  22 May 2005; Stuart Herbert <stuart@gentoo.org> +php-5.0.4.ebuild:
+  Version bump; now uses the latest eclass
+
   19 May 2005; Robin H. Johnson <robbat2@gentoo.org> php-5.0.2-r1.ebuild,
   php-5.0.3.ebuild, php-5.0.3-r1.ebuild:
   Bug #93028, clean up PROVIDE instances.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index b824b929e7d4..9dfbb73b1859 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,39 +1,38 @@
-MD5 24784884434c89ab9bcfd717de035f4f ChangeLog 21866
+MD5 d1b75409569c40e789d2089b762b3cda ChangeLog 22005
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 fbba8d77e8712b6026b0815967281540 php-4.3.10.ebuild 1137
-MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217
-MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
-MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
-MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
 MD5 8a5dced6630e496f509c8c89ce64a66e php-5.0.0-r1.ebuild 538
-MD5 1d25a66511eb4e2ed454554525f21139 php-5.0.0.ebuild 520
+MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
 MD5 a477b4bbabe5481c1f3ce596a407201a php-5.0.1.ebuild 540
-MD5 8617878370179a48e3e24a92e6c3e9af php-5.0.2-r1.ebuild 591
+MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
 MD5 bb72d15f50c43726d3e53dc821addf2b php-5.0.2.ebuild 557
-MD5 3344ef8d8bb858f7c19f58be2147e397 php-5.0.3-r1.ebuild 867
+MD5 8617878370179a48e3e24a92e6c3e9af php-5.0.2-r1.ebuild 591
+MD5 fbba8d77e8712b6026b0815967281540 php-4.3.10.ebuild 1137
 MD5 30ee00b03a957aa320e736ba94ddec84 php-5.0.3.ebuild 748
-MD5 c4592407e73937fcd6b86993439a2c02 php-5.0.4.ebuild 912
-MD5 8a8d310709a0752fb6a500a59e4b134c php-5.0.4-r1.ebuild 912
-MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
-MD5 e1385dbdad960ad1d13116d33814dacd files/digest-php-4.3.11 210
-MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
-MD5 205c1cd94cbb81c772fa366163faff0a files/digest-php-4.3.9 208
-MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
-MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 1d25a66511eb4e2ed454554525f21139 php-5.0.0.ebuild 520
+MD5 228f5304b8b0dedb94087ad6f555bad9 php-4.3.11.ebuild 1217
+MD5 db2a030a2f6d34869c4e46d0b3d79761 php-4.3.8.ebuild 1071
+MD5 3344ef8d8bb858f7c19f58be2147e397 php-5.0.3-r1.ebuild 867
+MD5 3d08585f4eb5b8c4af9728750a881bcd php-5.0.4-r1.ebuild 940
+MD5 31708f113837cfa71a1be2265e1d851d files/digest-php-5.0.4 63
 MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0-r1 63
+MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
+MD5 3d9b5ebf0a273b87c7a9355fa0d0676d files/digest-php-4.3.9_rc1 134
 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-php-5.0.1 63
+MD5 205c1cd94cbb81c772fa366163faff0a files/digest-php-4.3.9 208
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2 63
 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-php-5.0.2-r1 63
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-5.0.0 63
+MD5 8c692a66d1aeba1f84a35386e6bec47e files/digest-php-4.3.10 210
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3 63
 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3-r1 63
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 ae48d9701424c6ba150e00304b5d84b1 files/digest-php-4.3.8 208
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 f7a7898637874593f519c336db79fa45 files/php-5.0.3-missing-arches.patch 524
 MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
+MD5 e1385dbdad960ad1d13116d33814dacd files/digest-php-4.3.11 210
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 f7a7898637874593f519c336db79fa45 files/php-5.0.3-missing-arches.patch 524
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 6fb14885b5124b2bb92eb7a02ac24b01 files/php-5.0.3-gcc4.patch 432
-MD5 31708f113837cfa71a1be2265e1d851d files/digest-php-5.0.4 63
 MD5 457955f18cb41f31bab803aac779573c files/digest-php-5.0.4-r1 140
diff --git a/dev-php/php/php-5.0.4-r1.ebuild b/dev-php/php/php-5.0.4-r1.ebuild
index dbc8891f6271..89f4daddcf11 100644
--- a/dev-php/php/php-5.0.4-r1.ebuild
+++ b/dev-php/php/php-5.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.4-r1.ebuild,v 1.2 2005/06/09 18:57:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0.4-r1.ebuild,v 1.3 2005/06/10 23:45:29 stuart Exp $
 
 PHPSAPI="cli"
 MY_PHP_P="php-${PV}"
@@ -21,13 +21,18 @@ PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
 
 src_unpack() {
 	php5-sapi-r2_src_unpack
-	# merged upstream
-	#[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff
-	#EPATCH_OPTS="-p 1 -d ${S}" epatch ${FILESDIR}/${PN}-5.0.3-missing-arches.patch
-	#EPATCH_OPTS="-p 0 -d ${S}" epatch ${FILESDIR}/libmbfl-headers.patch
+
+	###########################################################################
+	# DO NOT ADD YOUR PATCHES HERE
+	#
+	# Please add your patches into the eclass, where they belong!
+	#
+	# Thanks,
+	# Stu
+	###########################################################################
 }
 
 src_compile () {
-	my_conf="--disable-cgi --enable-cli --enable-embed"
+	my_conf="--disable-cgi --enable-cli"
 	php5-sapi-r2_src_compile
 }