add 4.3.11 + fix deps

Package-Manager: portage-2.0.51.22-r2

6 files changed, 309 insertions, 20 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 58ca883ff269..81feb17b3019 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.39 2005/09/09 13:14:28 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.40 2005/09/11 18:57:09 hollow Exp $
+
+*php-4.3.11 (11 Sep 2005)
+
+  11 Sep 2005; Benedikt Boehm <hollow@gentoo.org> +php-4.3.11.ebuild:
+  add 4.3.11, b/c 4.4.0 breaks compatibility
+  remove some archs, get your deps tested!
 
   09 Sep 2005; Jason Wever <weeve@gentoo.org> php-4.4.0.ebuild,
   php-5.0.4.ebuild:
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 46c7b1ceaad4..b1d418eb3945 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,9 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28a5d087f70eed6faefd37c50299701f ChangeLog 1309
-MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0/apache-1.3/70_mod_php.conf 484
-MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0/apache-2.0/70_mod_php.conf 485
+MD5 d7ac597049e4e064ad44ecf2c62704a6 ChangeLog 1496
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 3c547176a34217b2812f1019d3dc7b00 php-4.4.0.ebuild 7341
+MD5 8882be9b18af873ee09f46991d89219f php-5.0.4.ebuild 4294
+MD5 9a011bbcc7625fccae9844fb4a882615 php-5.0.5.ebuild 4296
+MD5 d3c798c1aa53e3d4ad3a26947d06d469 php-4.3.11.ebuild 7342
+MD5 c7b9dd0187054446166a5c9fb1a6b4d5 files/digest-php-4.3.11 146
+MD5 43c95e9c27a1e40cf1fbb3408fd4a894 files/digest-php-4.4.0 144
+MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
+MD5 ef5a57ba8c9e35be8cb39c8ed1bc5235 files/digest-php-5.0.5 143
 MD5 030fb5433c0418ee3034d5b502d32548 files/4.4.0/fastbuild.patch 9004
 MD5 0b33a5e7250bf9ae8c240cd9d4963889 files/4.4.0/php4-hphp-acinclude.patch 618
 MD5 6d2047e069da7178fc841c4c7c890aa8 files/4.4.0/php4-imap-symlink.diff 620
@@ -12,24 +19,19 @@ MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4.4.0/php4-with-iodbc.diff 443
 MD5 fb08e1d8551091bc65872148dd2e46d1 files/5.0.0/php5-hphp-acinclude.patch 618
 MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0.0/php5-imap-symlink.diff 620
 MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
-MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1.0/apache-1.3/70_mod_php5.conf 524
-MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1.0/apache-2.0/70_mod_php5.conf 525
 MD5 2aca8867fada1d3345859f201ce7e428 files/5.1.0/php5-imap-symlink.diff 652
 MD5 63c7937867dd8cc04b5089c3678ef359 files/5.1.0/php5-iodbc-config.diff 519
 MD5 058042718bc876bf27ab902673919ca9 files/5.1.0/php5-prefork.patch 850
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1.0/php5-with-iodbc.diff 443
 MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1.0/php5_soap_persistence_session.diff 1976
-MD5 43c95e9c27a1e40cf1fbb3408fd4a894 files/digest-php-4.4.0 144
-MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
-MD5 ef5a57ba8c9e35be8cb39c8ed1bc5235 files/digest-php-5.0.5 143
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 2487b2739ed3ee84437b1ca34407c893 php-4.4.0.ebuild 7348
-MD5 fda1bae1965fec9be04093e7028e5094 php-5.0.4.ebuild 4308
-MD5 9a011bbcc7625fccae9844fb4a882615 php-5.0.5.ebuild 4296
+MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0/apache-1.3/70_mod_php.conf 484
+MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0/apache-2.0/70_mod_php.conf 485
+MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1.0/apache-1.3/70_mod_php5.conf 524
+MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1.0/apache-2.0/70_mod_php5.conf 525
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIcZ0I1lqEGTUzyQRAg/4AKCaB/Nu1sWAr2jXq8cUnNCBEFgpSwCgjbkw
-P0yepHN2hiSzvdAVpcW+c8g=
-=J19v
+iD8DBQFDJH5ImPFBzbX68WERAjpFAJoCrRhlnX90GWxvrfR0/1amU+CLRgCgiJ+j
+SgTgORxXxWtdGhr9geZ67Vk=
+=/HE+
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/digest-php-4.3.11 b/dev-lang/php/files/digest-php-4.3.11
new file mode 100644
index 000000000000..137f89aa7bca
--- /dev/null
+++ b/dev-lang/php/files/digest-php-4.3.11
@@ -0,0 +1,2 @@
+MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575
+MD5 bff79f1e088f09337e1a7df03a62ac2f hardening-patch-4.3.11-0.4.2.patch.gz 101840
diff --git a/dev-lang/php/php-4.3.11.ebuild b/dev-lang/php/php-4.3.11.ebuild
new file mode 100644
index 000000000000..19fcf1228bcb
--- /dev/null
+++ b/dev-lang/php/php-4.3.11.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11.ebuild,v 1.1 2005/09/11 18:57:09 hollow Exp $
+
+IUSE="cgi cli discard-path force-cgi-redirect"
+KEYWORDS="~sparc ~x86"
+
+# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
+#		that have been enabled, so we have to PROVIDE everything for now
+#		and hope for the best
+#
+#		This will be sorted out when GLEP 37 is implemented
+
+PROVIDE="virtual/php virtual/httpd-php"
+
+SLOT="4"
+PHPSAPI_ALLOWED="cli cgi apache apache2"
+MY_PHP_P="php-${PV}"
+PHP_S="${WORKDIR}/${MY_PHP_P}"
+PHP_PACKAGE=1
+
+inherit eutils php4_4-sapi apache-module
+
+want_apache
+
+DESCRIPTION="The PHP language runtime engine"
+
+DEPEND="${DEPEND} app-admin/eselect-php"
+RDEPEND="${RDEPEND} app-admin/eselect-php"
+
+pkg_setup() {
+	# make sure the user has specified a SAPI
+	einfo "Determining SAPI(s) to build"
+	confutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+
+	if useq apache || useq apache2 ; then
+		if [ "${APACHE_VERSION}" != "0" ] ; then
+			if ! useq threads ; then
+				APACHE2_SAFE_MPMS="peruser prefork"
+			else
+				APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
+			fi
+
+			ewarn
+			ewarn "If this package fails with a fatal error about Apache2 not having"
+			ewarn "been compiled with a compatible MPM, this is normally because you"
+			ewarn "need to toggle the 'threads' USE flag."
+			ewarn
+			ewarn "If 'threads' is off, try switching it on."
+			ewarn "If 'threads' is on, try switching it off."
+			ewarn
+
+			apache-module_pkg_setup
+		fi
+	fi
+
+	if useq fastbuild ; then
+		ewarn
+		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
+		ewarn "This is an experimental feature, which may fail to compile"
+		ewarn "and may produce PHP binaries which are broken."
+		ewarn
+		ewarn "Rebuild without 'fastbuild' and reproduce any bugs before filing"
+		ewarn "any bugs in Gentoo's Bugzilla or bugs.php.net."
+		ewarn
+	fi
+
+	php4_4-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+
+	# holds the list of sapis that we want to build
+	PHPSAPIS=
+
+	if useq cli ; then
+		PHPSAPIS="${PHPSAPIS} cli"
+	fi
+
+	if useq cgi ; then
+		PHPSAPIS="${PHPSAPIS} cgi"
+	fi
+
+	# note - we can only build one apache sapi for now
+	# note - apache SAPI comes after the simpler cli/cgi sapis
+
+	if useq apache || useq apache2 ; then
+		if [ "${APACHE_VERSION}" != "0" ]; then
+			PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+		fi
+	fi
+}
+
+src_compile() {
+	if useq fastbuild ; then
+		src_compile_fastbuild
+	else
+		src_compile_normal
+	fi
+}
+
+src_compile_fastbuild() {
+	php_determine_sapis
+
+	build_cli=0
+	build_cgi=0
+	build_apache=0
+
+	for x in ${PHPSAPIS} ; do
+		case ${x} in
+			cli)
+				build_cli=1
+				;;
+			cgi)
+				build_cgi=1
+				;;
+			apache*)
+				build_apache=1
+				;;
+		esac
+	done
+
+	if [[ ${build_cli} = 1 ]] ; then
+		my_conf="${my_conf} --enable-cli"
+	else
+		my_conf="${my_conf} --disable-cli"
+	fi
+
+	if [[ ${build_cgi} = 1 ]] ; then
+		my_conf="${my_conf} --enable-cgi --enable-fastcgi"
+		enable_extension_enable "discard-path" "discard-path" 0
+		enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+	else
+		my_conf="${my_conf} --disable-cgi"
+	fi
+
+	if [[ ${build_apache} = 1 ]] ; then
+		my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+	fi
+
+	# now we know what we are building, build it
+	php4_4-sapi_src_compile
+
+	# to keep the separate php.ini files for each SAPI, we change the
+	# build-defs.h and recompile
+
+	if [[ ${build_cli} = 1 ]] ; then
+		einfo
+		einfo "Building CLI SAPI"
+		einfo
+
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php4"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/ext"|g;' -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make sapi/cli/php || die "Unable to make CLI SAPI"
+		cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+	fi
+	if [[ ${build_cgi} = 1 ]] ; then
+		einfo
+		einfo "Building CGI SAPI"
+		einfo
+
+		sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php4"|g;' -i main/build-defs.h
+		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/ext"|g;' -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make sapi/cgi/php || die "Unable to make CGI SAPI"
+		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+	fi
+	if [[ ${build_apache} = 1 ]] ; then
+		einfo
+		einfo "Building apache${USE_APACHE2} SAPI"
+		einfo
+
+		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${USE_APACHE2}-php4\"|g;" -i main/build-defs.h
+		sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${USE_APACHE2}-php4/ext\"|g;" -i main/build-defs.h
+		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+			[[ -f ${x} ]] && rm -f ${x}
+		done
+		make || die "Unable to build mod_php"
+	fi
+}
+
+src_compile_normal() {
+	php_determine_sapis
+
+	CLEAN_REQUIRED=0
+
+	for x in ${PHPSAPIS} ; do
+		if [ "${CLEAN_REQUIRED}" = 1 ]; then
+			make clean
+			# echo > /dev/null
+		fi
+
+		PHPSAPI=${x}
+		case ${x} in
+			cli)
+				my_conf="--enable-cli --disable-cgi"
+				php4_4-sapi_src_compile
+				cp sapi/cli/php php-cli
+				;;
+			cgi)
+				my_conf="${orig_conf} --disable-cli --enable-cgi --enable-fastcgi"
+				enable_extension_enable "discard-path" "discard-path" 0
+				enable_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+				php4_4-sapi_src_compile
+				cp sapi/cgi/php php-cgi
+				;;
+			apache*)
+				my_conf="${orig_conf} --disable-cli --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+				php4_4-sapi_src_compile
+				;;
+		esac
+
+		CLEAN_REQUIRED=1
+	done
+}
+
+src_install() {
+	php_determine_sapis
+
+	destdir=/usr/$(get_libdir)/php4
+
+	# let the eclass do the heavy lifting
+	php4_4-sapi_src_install
+
+	einfo
+	einfo "Installing SAPI(s) ${PHPSAPIS}"
+	einfo
+
+	for x in ${PHPSAPIS} ; do
+		PHPSAPI=${x}
+		case ${x} in
+			cli)
+				einfo "Installing CLI SAPI"
+				into ${destdir}
+				newbin php-cli php || die "Unable to install ${x} sapi"
+				php4_4-sapi_install_ini
+				;;
+			cgi)
+				einfo "Installing CGI SAPI"
+				into ${destdir}
+				dobin php-cgi || die "Unable to install ${x} sapi"
+				php4_4-sapi_install_ini
+				;;
+			apache*)
+				einfo "Installing apache${USE_APACHE2} SAPI"
+				make INSTALL_ROOT=${D} install-sapi || die "Unable to install ${x} SAPI"
+				if [ -n "${USE_APACHE2}" ] ; then
+					einfo "Installing Apache2 config for PHP (70_mod_php.conf)"
+					insinto ${APACHE_MODULES_CONFDIR}
+					doins "${FILESDIR}/4.4.0/apache-2.0/70_mod_php.conf"
+				else
+					einfo "Installing Apache config for PHP (70_mod_php.conf)"
+					insinto ${APACHE_MODULES_CONFDIR}
+					doins "${FILESDIR}/4.4.0/apache-1.3/70_mod_php.conf"
+				fi
+				php4_4-sapi_install_ini
+				;;
+		esac
+	done
+
+}
+
+pkg_postinst()
+{
+	# Output some general info to the user
+	if useq apache || useq apache2 ; then
+		APACHE1_MOD_DEFINE="PHP4"
+		APACHE1_MOD_CONF="70_mod_php.conf"
+		APACHE2_MOD_DEFINE="PHP4"
+		APACHE2_MOD_CONF="70_mod_php.conf"
+		apache-module_pkg_postinst
+	fi
+	php4_4-sapi_pkg_postinst
+}
diff --git a/dev-lang/php/php-4.4.0.ebuild b/dev-lang/php/php-4.4.0.ebuild
index 342e5b2c318e..d7a701fe20d4 100644
--- a/dev-lang/php/php-4.4.0.ebuild
+++ b/dev-lang/php/php-4.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0.ebuild,v 1.5 2005/09/09 17:29:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0.ebuild,v 1.6 2005/09/11 18:57:09 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/php/php-5.0.4.ebuild b/dev-lang/php/php-5.0.4.ebuild
index dd3da7d87cea..40361abd68ca 100644
--- a/dev-lang/php/php-5.0.4.ebuild
+++ b/dev-lang/php/php-5.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4.ebuild,v 1.6 2005/09/09 17:29:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4.ebuild,v 1.7 2005/09/11 18:57:09 hollow Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now