Removed obsolete versions

(Portage version: 2.0.51.22-r2)

9 files changed, 5 insertions, 297 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 95c672aee146..4bedefe973a1 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.263 2005/08/25 12:31:35 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.264 2005/09/04 17:37:14 stuart Exp $
+
+  04 Sep 2005; Stuart Herbert <stuart@gentoo.org> -mod_php-5.0.4.ebuild,
+  -mod_php-5.1.0_beta-r2.ebuild:
+  Removed obsolete version
 
   25 Aug 2005; Stuart Herbert <stuart@gentoo.org> mod_php-4.4.0-r1.ebuild,
   mod_php-4.4.0.ebuild:
diff --git a/dev-php/mod_php/files/5.0.4/70_mod_php5.conf b/dev-php/mod_php/files/5.0.4/70_mod_php5.conf
deleted file mode 100644
index d8cfa377aee7..000000000000
--- a/dev-php/mod_php/files/5.0.4/70_mod_php5.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: ft=apache sw=4 ts=4
-<IfDefine PHP5>
-
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddType application/x-httpd-php .php
-		AddType application/x-httpd-php .phtml
-		AddType application/x-httpd-php .php3
-		AddType application/x-httpd-php .php4
-		AddType application/x-httpd-php .php5
-		AddType application/x-httpd-php-source .phps
-	</IfModule>
-
-	AddDirectoryIndex index.php index.phtml index.php5
-</IfDefine>
diff --git a/dev-php/mod_php/files/70_mod_php5.conf b/dev-php/mod_php/files/70_mod_php5.conf
deleted file mode 100644
index 37a8e41c88a7..000000000000
--- a/dev-php/mod_php/files/70_mod_php5.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: ft=apache sw=4 ts=4
-<IfDefine PHP5>
-
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddType application/x-httpd-php .php
-		AddType application/x-httpd-php .phtml
-		AddType application/x-httpd-php .php3
-		AddType application/x-httpd-php .php4
-		AddType application/x-httpd-php .php5
-		AddType application/x-httpd-php-source .phps
-	</IfModule>
-
-</IfDefine>
diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.4 b/dev-php/mod_php/files/digest-mod_php-5.0.4
deleted file mode 100644
index 0c63f459d7d7..000000000000
--- a/dev-php/mod_php/files/digest-mod_php-5.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fb1aac107870f897d26563a9cc5053c0 php-5.0.4.tar.bz2 4731383
-MD5 13d1cec199f3144f9715194a59db3a8f hardening-patch-5.0.4-0.3.2.patch.gz 78117
diff --git a/dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2 b/dev-php/mod_php/files/digest-mod_php-5.1.0_beta-r2
deleted file mode 100644
index 36de97e6a7c9..000000000000
--- a/dev-php/mod_php/files/digest-mod_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/mod_php/files/php5-prefork.patch b/dev-php/mod_php/files/php5-prefork.patch
deleted file mode 100644
index 135579c33d82..000000000000
--- a/dev-php/mod_php/files/php5-prefork.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u --recursive php-5.0.4-orig/sapi/apache2filter/config.m4 php-5.0.4/sapi/apache2filter/config.m4
---- php-5.0.4-orig/sapi/apache2filter/config.m4	2005-03-13 20:30:44.767051120 +0000
-+++ php-5.0.4/sapi/apache2filter/config.m4	2005-03-13 20:32:01.999310032 +0000
-@@ -115,9 +115,6 @@
-     ;;
-   esac
- 
--  if test "$APXS_MPM" != "prefork"; then
--    PHP_BUILD_THREAD_SAFE
--  fi
-   AC_MSG_RESULT(yes)
-   
-   PHP_SUBST(APXS)
-diff -u --recursive php-5.0.4-orig/sapi/apache2handler/config.m4 php-5.0.4/sapi/apache2handler/config.m4
---- php-5.0.4-orig/sapi/apache2handler/config.m4	2005-03-13 20:30:44.771050512 +0000
-+++ php-5.0.4/sapi/apache2handler/config.m4	2005-03-13 20:31:50.106118072 +0000
-@@ -114,9 +114,6 @@
-     ;;
-   esac
- 
--  if test "$APXS_MPM" != "prefork"; then
--    PHP_BUILD_THREAD_SAFE
--  fi
-   AC_MSG_RESULT(yes)
- 
-   PHP_SUBST(APXS)
diff --git a/dev-php/mod_php/files/php5_soap_persistence_session.diff b/dev-php/mod_php/files/php5_soap_persistence_session.diff
deleted file mode 100644
index 626ac67f9081..000000000000
--- a/dev-php/mod_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/mod_php/mod_php-5.0.4.ebuild b/dev-php/mod_php/mod_php-5.0.4.ebuild
deleted file mode 100644
index 3246b14e395a..000000000000
--- a/dev-php/mod_php/mod_php-5.0.4.ebuild
+++ /dev/null
@@ -1,96 +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/mod_php/mod_php-5.0.4.ebuild,v 1.9 2005/08/16 04:07:44 vapier Exp $
-
-IUSE="apache2"
-
-# this duplicates the code from depend.apache.eclass, but it's the
-# only way to do this here
-
-if useq apache2 ; then
-	APACHE_VERSION=2
-else
-	APACHE_VERSION=1
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-PROVIDE="virtual/httpd-php"
-
-SLOT="${APACHE_VERSION}"
-
-PHPSAPI="apache${APACHE_VERSION}"
-MY_PHP_P="php-${PV}"
-PHP_S="${WORKDIR}/php-${PV}"
-PHP_PACKAGE=1
-
-# BIG FAT WARNING!
-# the php eclass requires the PHPSAPI setting!
-inherit eutils php5-sapi-r2 apache-module
-
-need_apache
-
-DESCRIPTION="Apache module for PHP 5"
-
-pkg_setup() {
-
-	# the list of safe MPM's may need revising
-	if ! useq threads ; then
-		APACHE2_SAFE_MPMS="prefork"
-	else
-		APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool"
-	fi
-
-	apache-module_pkg_setup
-	php5-sapi-r2_pkg_setup
-}
-
-src_unpack() {
-	php5-sapi-r2_src_unpack
-
-	# if we're not using threads, we need to force them to be switched
-	# off by patching php's configure script
-	cd ${S}
-	if ! useq threads ; then
-		epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support"
-		einfo "Rebuilding configure script"
-		WANT_AUTOCONF=2.5 \
-		autoconf -W no-cross || die "Unable to regenerate configure script"
-	fi
-
-	#########################################################################
-	# DO NOT ADD PATCHES HERE UNLESS THEY ARE UNIQUE TO MOD_PHP
-	#
-	# Please add your patches to the eclass, where they belong ;-)
-	#
-	# Best regards,
-	# Stu
-	#########################################################################
-}
-
-src_compile() {
-	if [ "${APACHE_VERSION}" = "2" ]; then
-			if useq threads ; then
-				my_conf="${my_conf} --enable-experimental-zts"
-				ewarn "Enabling ZTS for Apache2 MPM"
-			fi
-	fi
-
-	my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-
-	php5-sapi-r2_src_compile
-}
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php5-sapi-r2_src_install
-
-	if [ -n "${USE_APACHE2}" ] ; then
-		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins "${FILESDIR}/5.0.4/70_mod_php5.conf"
-	else
-		einfo "Installing a Apache config for PHP (mod_php5.conf)"
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php5.conf
-	fi
-}
diff --git a/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild b/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild
deleted file mode 100644
index db880803d479..000000000000
--- a/dev-php/mod_php/mod_php-5.1.0_beta-r2.ebuild
+++ /dev/null
@@ -1,97 +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/mod_php/mod_php-5.1.0_beta-r2.ebuild,v 1.2 2005/07/16 15:23:54 swegener Exp $
-
-IUSE="apache2"
-
-# this duplicates the code from depend.apache.eclass, but it's the
-# only way to do this here
-
-if useq apache2 ; then
-	APACHE_VERSION=2
-else
-	APACHE_VERSION=1
-fi
-
-KEYWORDS="~x86 ~amd64 ~ppc64"
-PROVIDE="virtual/httpd-php"
-
-SLOT="${APACHE_VERSION}"
-
-PHPSAPI="apache${APACHE_VERSION}"
-MY_PVR="5.1.0b3"
-MY_PHP_P="php-${MY_PVR}"
-PHP_S="${WORKDIR}/php-${MY_PVR}"
-PHP_PACKAGE=1
-
-# BIG FAT WARNING!
-# the php eclass requires the PHPSAPI setting!
-inherit eutils php5-sapi-r3 apache-module
-
-need_apache
-
-DESCRIPTION="Apache module for PHP 5"
-
-pkg_setup() {
-
-	# the list of safe MPM's may need revising
-	if ! useq threads ; then
-		APACHE2_SAFE_MPMS="prefork"
-	else
-		APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool"
-	fi
-
-	apache-module_pkg_setup
-	php5-sapi-r3_pkg_setup
-}
-
-src_unpack() {
-	php5-sapi-r3_src_unpack
-
-	# if we're not using threads, we need to force them to be switched
-	# off by patching php's configure script
-	cd ${S}
-	if ! useq threads ; then
-		epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support"
-		einfo "Rebuilding configure script"
-		WANT_AUTOCONF=2.5 \
-		autoconf -W no-cross || die "Unable to regenerate configure script"
-	fi
-
-	#########################################################################
-	# DO NOT ADD PATCHES HERE UNLESS THEY ARE UNIQUE TO MOD_PHP
-	#
-	# Please add your patches to the eclass, where they belong ;-)
-	#
-	# Best regards,
-	# Stu
-	#########################################################################
-}
-
-src_compile() {
-	if [ "${APACHE_VERSION}" = "2" ]; then
-			if useq threads ; then
-				my_conf="${my_conf} --enable-experimental-zts"
-				ewarn "Enabling ZTS for Apache2 MPM"
-			fi
-	fi
-
-	my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
-
-	php5-sapi-r3_src_compile
-}
-
-src_install() {
-	PHP_INSTALLTARGETS="install"
-	php5-sapi-r3_src_install
-
-	if [ -n "${USE_APACHE2}" ] ; then
-		einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)"
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins "${FILESDIR}/5.0.4/70_mod_php5.conf"
-	else
-		einfo "Installing a Apache config for PHP (mod_php5.conf)"
-		insinto ${APACHE_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php5.conf
-	fi
-}