Removed obsolete versions; use dev-lang/php instead

Package-Manager: portage-2.0.51.22-r2

9 files changed, 16 insertions, 158 deletions

diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index 8a956c4d29c7..867d2567be35 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,18 +1,11 @@
-MD5 46b51e227a74308952bf3876e112bd39 ChangeLog 12712
+MD5 1e0b6a1f68520e3cd206644323804009 ChangeLog 12842
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 87afbaa27805c015e37148d0347887af php-cgi-4.3.11-r1.ebuild 1110
-MD5 58596c107f1a23e6be418c9dae669e74 php-cgi-4.4.0.ebuild 969
 MD5 d872a25f985f00e2d9cc17379b2d0492 php-cgi-4.4.0-r1.ebuild 972
-MD5 41aa4fdc669804f3522399c6381a3105 php-cgi-5.1.0_beta.ebuild 1283
-MD5 b1962214925ca2e9fb86b0428a2fcfde php-cgi-5.0.4.ebuild 1278
-MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-php-cgi-4.4.0 285
+MD5 58596c107f1a23e6be418c9dae669e74 php-cgi-4.4.0.ebuild 969
+MD5 87afbaa27805c015e37148d0347887af php-cgi-4.3.11-r1.ebuild 1110
 MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-php-cgi-4.4.0-r1 285
+MD5 09d7dee078c684b0de0e4de6209ef634 files/digest-php-cgi-4.4.0 285
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 225b57325cbdf582288a8796da9d72f5 files/digest-php-cgi-4.3.11-r1 287
-MD5 34c8c0361c81f5aedd386d228ccfe728 files/digest-php-cgi-5.1.0_beta 65
-MD5 74a728966bc5ec6d37ad89f4182ee135 files/digest-php-cgi-5.0.4 143
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518
-MD5 f7a7898637874593f519c336db79fa45 files/php-cgi-5.0.3-missing-arches.patch 524
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index be843a930de7..874e69f2aa4a 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # 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.187 2005/07/24 05:02:31 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.188 2005/09/04 17:28:45 stuart Exp $
+
+  04 Sep 2005; Stuart Herbert <stuart@gentoo.org> -php-5.0.4-r1.ebuild,
+  -php-5.1.0_beta-r2.ebuild:
+  Removed obsolete version
 
   24 Jul 2005; Hardave Riar <hardave@gentoo.org> php-4.4.0.ebuild:
   Stable on mips, bug #97655.
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 590ac8b52cc6..4c081a352109 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,27 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ac227180d232cc83a28d006bfd4835c5 ChangeLog 25440
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 5b98c4d17c827ba795d73f6c3daca44f php-5.1.0_beta-r2.ebuild 968
-MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
-MD5 3e6d7d39a16720cd8c2f50e85c502939 php-5.0.4-r1.ebuild 927
-MD5 948f06de2829b086231d2134186e3929 ChangeLog 25312
 MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
-MD5 40aa32876cfd159c95572b24ce39a7ce files/digest-php-5.0.4-r1 143
-MD5 34c8c0361c81f5aedd386d228ccfe728 files/digest-php-5.1.0_beta-r2 65
-MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 6fb14885b5124b2bb92eb7a02ac24b01 files/php-5.0.3-gcc4.patch 432
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
 MD5 f25bbe20f37a0eb83f7a57ca2c3a25e3 files/digest-php-4.4.0 211
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDAWahgIKl8Uu19MoRAmMpAJ4lciBeEpOulAJisBln6dEAHKH0vACeNc1P
-XcxwubKt9/FLAq/pbgihe1Y=
-=40z5
------END PGP SIGNATURE-----
+MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
+MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
diff --git a/dev-php/php/files/digest-php-5.0.4-r1 b/dev-php/php/files/digest-php-5.0.4-r1
deleted file mode 100644
index 3f9c2f5bad90..000000000000
--- a/dev-php/php/files/digest-php-5.0.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 13d1cec199f3144f9715194a59db3a8f hardening-patch-5.0.4-0.3.2.patch.gz 78117
-MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
diff --git a/dev-php/php/files/digest-php-5.1.0_beta-r2 b/dev-php/php/files/digest-php-5.1.0_beta-r2
deleted file mode 100644
index 36de97e6a7c9..000000000000
--- a/dev-php/php/files/digest-php-5.1.0_beta-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06a6f86743b5fd13cf6c95a8ddb1deac php-5.1.0b3.tar.bz2 5938988
diff --git a/dev-php/php/files/php-5.0.3-gcc4.patch b/dev-php/php/files/php-5.0.3-gcc4.patch
deleted file mode 100644
index fdee5f406b31..000000000000
--- a/dev-php/php/files/php-5.0.3-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur php-5.0.3-orig/Zend/zend_modules.h php-5.0.3/Zend/zend_modules.h
---- php-5.0.3-orig/Zend/zend_modules.h	2005-05-28 16:57:04.000000000 -0400
-+++ php-5.0.3/Zend/zend_modules.h	2005-05-28 16:59:59.000000000 -0400
-@@ -23,6 +23,7 @@
- #define MODULES_H
- 
- #include "zend.h"
-+#include "zend_compile.h"
- 
- #define INIT_FUNC_ARGS		int type, int module_number TSRMLS_DC
- #define INIT_FUNC_ARGS_PASSTHRU	type, module_number TSRMLS_CC
diff --git a/dev-php/php/files/php5_soap_persistence_session.diff b/dev-php/php/files/php5_soap_persistence_session.diff
deleted file mode 100644
index 626ac67f9081..000000000000
--- a/dev-php/php/files/php5_soap_persistence_session.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c
---- php-5.0.0RC3.orig/ext/soap/soap.c	2004-06-22 19:35:59.801348936 +0300
-+++ php-5.0.0RC3/ext/soap/soap.c	2004-06-29 13:39:00.506820928 +0300
-@@ -1341,16 +1341,21 @@
- 		soap_obj = NULL;
- #if HAVE_PHP_SESSION
- 		/* If persistent then set soap_obj from from the previous created session (if available) */
-+		char soapname[32+sizeof("_bogus_session_name")]; //Now we use  max 32 chars from class name, must be overwriten with dynamic allocation with exact length!!
- 		if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
- 			zval **tmp_soap;
- 
-+			bzero(soapname,32+sizeof("_bogus_session_name"));
-+                        strncpy(soapname,service->soap_class.ce->name,32);
-+                        strcat(soapname,"_bogus_session_name");
-+
- 			if (PS(session_status) != php_session_active &&
- 			    PS(session_status) != php_session_disabled) {
- 				php_session_start(TSRMLS_C);
- 			}
- 
- 			/* Find the soap object and assign */
--			if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS &&
-+			if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS &&
- 			    Z_TYPE_PP(tmp_soap) == IS_OBJECT &&
- 			    Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) {
- 				soap_obj = *tmp_soap;
-@@ -1432,7 +1437,7 @@
- 			/* If session then update session hash with new object */
- 			if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
- 				zval **tmp_soap_pp;
--				if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
-+				if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
- 					soap_obj = *tmp_soap_pp;
- 				}
- 			} else {
diff --git a/dev-php/php/php-5.0.4-r1.ebuild b/dev-php/php/php-5.0.4-r1.ebuild
deleted file mode 100644
index ce0186e64b7f..000000000000
--- a/dev-php/php/php-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.7 2005/08/16 04:07:37 vapier Exp $
-
-PHPSAPI="cli"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-PROVIDE="virtual/php"
-SLOT="0"
-
-PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
-
-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-cgi --enable-cli"
-	php5-sapi-r2_src_compile
-}
diff --git a/dev-php/php/php-5.1.0_beta-r2.ebuild b/dev-php/php/php-5.1.0_beta-r2.ebuild
deleted file mode 100644
index 3f5502de62de..000000000000
--- a/dev-php/php/php-5.1.0_beta-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.1.0_beta-r2.ebuild,v 1.3 2005/07/16 15:25:44 swegener Exp $
-
-PHPSAPI="cli"
-MY_PV="5.1.0b3"
-MY_PHP_P="php-${MY_PV}"
-PHP_S="${WORKDIR}/${MY_PHP_P}"
-PHP_PACKAGE=1
-
-inherit php5-sapi-r3 eutils
-
-DESCRIPTION="PHP Shell Interpreter"
-LICENSE="PHP"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-PDEPEND=">=dev-php/PEAR-PEAR-1.3.5-r1"
-PROVIDE="virtual/php"
-SLOT="0"
-
-PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli"
-
-src_unpack() {
-	php5-sapi-r3_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-cgi --enable-cli"
-	php5-sapi-r3_src_compile
-}