Removing php-4 (bug 189172); use the php-4 (layman) overlay instead, if you really insist on keeping it installed

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 16 insertions, 456 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index fbd43abd3bd2..d4c4dcc4a051 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.290 2008/08/08 19:22:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.291 2008/08/09 21:52:01 hoffie Exp $
+
+  09 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.8.ebuild:
+  Removing php-4 (bug 189172); use the php-4 (layman) overlay instead, if
+  you really insist on keeping it installed
 
   08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.6-r6.ebuild:
   ppc stable, bug #234102
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index be97cc33987a..5b6a1c28c5f7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php.conf-apache2 454 RMD160 7e99b278a010c958d698454a2aa43e1a351c69e8 SHA1 895e986f880a1dee9b0a45fdcd99ccce44999a6b SHA256 dd7116f3439e06ef2d6126403360c2722355f8481552fdce0cb601af331f81ee
@@ -6,23 +9,26 @@ AUX 70_mod_php5_concurr.conf-apache2 414 RMD160 1783b6c830119f021c3fb6cb35a631f4
 AUX 70_mod_php_concurr.conf-apache2 329 RMD160 364e071b494b84b78881c566b7c1b46261f62c19 SHA1 9d775784993b46a8be1a7e31f02a3482542385df SHA256 092178aa0cf3272b6411abc85b3820665322598932d249c284a8fa4108d5835a
 AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb80e2ecc6ee6faae30bf7dbb1727651 SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
-DIST php-4.4.8.tar.bz2 4546525 RMD160 dedf4a1a853b19bd3fb91a6028a256facb2d3224 SHA1 fca6259fd3e8e3a7a37343e9a81651f5b6d4835c SHA256 30d8e281cf1b785301f0ce2ba6a803bda72fb229942d415ae601ef176b46d5c1
 DIST php-5.2.5.tar.bz2 7773024 RMD160 2d5755f2ae8884e80f0a5c70e8fdfdb6deed46bc SHA1 6b46fd095891183b328163b70cdb5acd30a24b7a SHA256 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
 DIST php-5.2.6.tar.bz2 9571312 RMD160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b SHA1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 SHA256 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
-DIST php-patchset-4.4.8-r0.tar.bz2 18948 RMD160 c2f3cd05b161e144a65e9bde12f66eb44869b0f2 SHA1 174c325916bb2d0e6b03c1aab055ba6e8bb78314 SHA256 7fafaefd29b73f76ff8a2a90b827d213043be30b4e3ca4afd18b843cdcf16ab3
 DIST php-patchset-5.2.5-r1.tar.bz2 15350 RMD160 777f77e351ed024952f2adf323261db28f98c428 SHA1 d794d02e57ae400cf32638e1168f3dd6d213911b SHA256 50860764cf068465af09acc5ed32ad89f2e8ee0e03b02b2dd70fa19bd1176f10
 DIST php-patchset-5.2.6-r0.tar.bz2 10713 RMD160 408d25f1c28c582c5053c4eaf21c02e63e420d52 SHA1 b6b3b3c5d69288352a27075dddc2e00c87360d04 SHA256 161c9febd0f14fe8fa64f58016c2cf52ae39105f40c0735098218c122debed56
 DIST php-patchset-5.2.6-r2.tar.bz2 15621 RMD160 baee575d1e4c67eede70ceeb3a8119df2062c0cc SHA1 f3b57129e1e0ca56a61cceed2f7bbe796334cf43 SHA256 f49be3db0c4eb09918c1797eb304a91a0ef56fdd1db0c6d47504b785f718e995
 DIST php-patchset-5.2.6-r7.tar.bz2 26988 RMD160 186e1b132ee8ffc7b9005d0784ef190fe42c0fb0 SHA1 826445f967a31aaa3ec65979ab0aa88861c96c0b SHA256 c6223eb75fbb487a317f715a84b1b40eb0f9e170b7818091edb6d4289a9a4579
-DIST suhosin-patch-4.4.8-0.9.6.patch.gz 22246 RMD160 01b59d520b987de1995bce7ab74f5d92ece2a89f SHA1 0354436d109ae3872949fb436d45e9534355cb1c SHA256 eff5b6ed79dd76c59bd63ac591f778266c2d518cfab2cede716637cf8fc99630
 DIST suhosin-patch-5.2.5-0.9.6.2.patch.gz 23157 RMD160 25863ad76bea4a8e5bf50bd916835b5d9324452c SHA1 1102e2e1de922b5199462100a7bbbb7cef5c3f58 SHA256 fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
 DIST suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.patch.gz 22985 RMD160 330d248a64790552945b5f94be749391acec5b26 SHA1 e087ad94cdddf03e8fa8fb49357963e75aae97bc SHA256 e3ac5634dc481b829b42d6f1521e10b1ce8a3cdbeca50822cab8937db8d4566f
 DIST suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz 22987 RMD160 9c7bc7441e16686382a2b91f68c6e56a84683304 SHA1 0869e555e722615881d6bf1f642d656c53b41bd0 SHA256 40fdd5b92c4e1595250ffc58f317887acd1ef6681e6b6fdca098110c4bfa5bbc
 DIST suhosin-patch-5.2.6-0.9.6.2.patch.gz 22986 RMD160 f5e5e6d88b91506a49988e3b7f371c8a62b657ab SHA1 b19fcb8baa5e30b4533c662950883c29e185c1f5 SHA256 dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
-EBUILD php-4.4.8.ebuild 13382 RMD160 17daef3621eff68c2f5e73f456e33eb8e57272bd SHA1 861b9ebfbcedd3b0d58337f493ec6f8403133ea6 SHA256 24bc333ebccaed00a396fe9f919d51bd1c9bac5387d5c897a8ee61d5befa626c
 EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab
 EBUILD php-5.2.6-r2.ebuild 15423 RMD160 640e51f190cdfe93ea36f7098b0c25a3e62d3d84 SHA1 d1a773b35c40c6d41a8cf0cd070cfe3febc96f48 SHA256 5c982bf757f54f4342567bca415dbdc571ac125fb99a11414cd4b63a0a30397b
 EBUILD php-5.2.6-r6.ebuild 15511 RMD160 15b73a86cac0bafd5ff4f7726aabfb31a009c660 SHA1 7498ce1432bcd8158a4a95d0c0dc6c9b29bcc3be SHA256 7e681a66bb94d23d723ddc96ffd9edf37333cd6c70f270611a3bb5e235679858
 EBUILD php-5.2.6.ebuild 15292 RMD160 f6157ccdaffbf24252e4d07e26ffa55cb46f3ff9 SHA1 dd479cc008ae5aee86a29e4eeb2297daadb60f3a SHA256 47285d81ade0c4323c862924251b1fdc4b34e29f461759a471494d96c9be422e
-MISC ChangeLog 51941 RMD160 9cde130cccc370593c7d25bd6824aa668284eb2c SHA1 0531d808b9a49affae509e0cba86ec085595d7a2 SHA256 37f0d8491215c37149c08fa4cc7157cdb74e1d0888b1543d1a9ea59d9f36eeca
+MISC ChangeLog 52129 RMD160 4e7cdea81d2c5ed726f2babcd05b398792272040 SHA1 908ff47fd0544a12d8baac4c7a6102c38c70cf31 SHA256 33f3df0baf8759f94d1f4dd7ac349d259914e929f4083adbb183b89d159e7f40
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkieEYcACgkQV6E0EIywUuWC5QCg0mq/mGNcVf4SE/KWsQUGzx7S
+4UcAn3/ZXdkH8vjSFISNeukaV5Pe2ZyA
+=S99e
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-4.4.8.ebuild b/dev-lang/php/php-4.4.8.ebuild
deleted file mode 100644
index 1c4f8ecd3b52..000000000000
--- a/dev-lang/php/php-4.4.8.ebuild
+++ /dev/null
@@ -1,450 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.8.ebuild,v 1.2 2008/03/23 11:53:04 hollow Exp $
-
-CGI_SAPI_USE="discard-path force-cgi-redirect"
-APACHE2_SAPI_USE="concurrentmodphp threads"
-IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-# 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
-PROVIDE="virtual/php virtual/httpd-php"
-
-# php package settings
-SLOT="4"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE="1"
-
-# php patch settings, general
-PHP_PATCHSET_REV="0"
-SUHOSIN_PATCH="suhosin-patch-4.4.8-0.9.6.patch.gz"
-MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
-# php patch settings, ebuild specific
-FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
-CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modules.patch"
-
-inherit php4_4-sapi apache-module
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
-
-DEPEND="app-admin/php-toolkit"
-RDEPEND="${DEPEND}"
-
-want_apache
-
-pkg_setup() {
-	PHPCONFUTILS_AUTO_USE=""
-
-	# Make sure the user has specified at least one SAPI
-	einfo "Determining SAPI(s) to build"
-	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache2
-
-	# Threaded Apache2 support
-	if use apache2 ; then
-		has_apache_threads
-	fi
-
-	# Concurrent PHP Apache2 modules support
-	if use apache2 ; then
-		if use concurrentmodphp ; then
-			ewarn
-			ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
-			ewarn "versioned mod_php's into the same Apache instance. This is done with"
-			ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
-			ewarn "work correctly, so use it at your own risk. Especially, do not use"
-			ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
-			ewarn "you may find in the Portage tree or the PHP Overlay!"
-			ewarn "This is an experimental feature, so please rebuild PHP"
-			ewarn "without the 'concurrentmodphp' USE flag if you experience"
-			ewarn "any problems, and then reproduce any bugs before filing"
-			ewarn "them in Gentoo's Bugzilla or bugs.php.net."
-			ewarn "If you have conclusive evidence that a bug directly"
-			ewarn "derives from 'concurrentmodphp', please file a bug in"
-			ewarn "Gentoo's Bugzilla only."
-			ewarn
-			ebeep 5
-		fi
-	fi
-
-	# fastbuild support
-	if use fastbuild ; then
-		ewarn
-		ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
-		ewarn "This is an experimental feature, so please rebuild PHP"
-		ewarn "without the 'fastbuild' USE flag if you experience"
-		ewarn "any problems, and then reproduce any bugs before filing"
-		ewarn "them in Gentoo's Bugzilla or bugs.php.net."
-		ewarn "If you have conclusive evidence that a bug directly"
-		ewarn "derives from 'fastbuild', please file a bug in"
-		ewarn "Gentoo's Bugzilla only."
-		ewarn
-	fi
-
-	php4_4-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if use cli || phpconfutils_usecheck cli ; then
-		PHPSAPIS="${PHPSAPIS} cli"
-	fi
-
-	if use cgi ; then
-		PHPSAPIS="${PHPSAPIS} cgi"
-	fi
-
-	# note - apache SAPI comes after the simpler cli/cgi sapis
-	if use apache2 ; then
-		PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
-	fi
-}
-
-src_unpack() {
-	if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-		unpack ${A}
-	fi
-
-	cd "${S}"
-
-	# Concurrent PHP Apache2 modules support
-	if use apache2 ; then
-		if use concurrentmodphp ; then
-			if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
-				epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
-			else
-				ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
-			fi
-		fi
-	fi
-
-	# fastbuild support
-	if use fastbuild ; then
-		if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
-			epatch "${WORKDIR}/${FASTBUILD_PATCH}"
-		else
-			ewarn "There is no fastbuild patch available for this PHP release yet!"
-		fi
-	fi
-
-	# Now let the eclass do the rest and regenerate the configure
-	php4_4-sapi_src_unpack
-
-	# Fix Makefile.global:test to consider the CGI SAPI if present
-	if use cgi ; then
-		sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-		sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
-	fi
-}
-
-src_compile() {
-	if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
-		src_compile_fastbuild
-	else
-		src_compile_normal
-	fi
-}
-
-src_compile_fastbuild() {
-	php_determine_sapis
-
-	build_cli=0
-	build_cgi=0
-	build_apache2=0
-	my_conf=""
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache2)
-				build_apache2=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"
-		phpconfutils_extension_enable "discard-path" "discard-path" 0
-		phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-	else
-		my_conf="${my_conf} --disable-cgi"
-	fi
-
-	if [[ ${build_apache2} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-		# Threaded Apache2 support
-		if use threads ; then
-			my_conf="${my_conf} --enable-experimental-zts"
-			ewarn "Enabling ZTS for Apache2 MPM"
-		fi
-
-		# Concurrent PHP Apache2 modules support
-		if use concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
-		fi
-	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-active"|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-active"|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_apache2} = 1 ]] ; then
-		einfo
-		einfo "Building apache${APACHE_VERSION} SAPI"
-		einfo
-
-		sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-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${APACHE_VERSION}-php4/ext-active\"|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 make apache${APACHE_VERSION} SAPI"
-	fi
-}
-
-src_compile_normal() {
-	php_determine_sapis
-
-	CLEAN_REQUIRED=0
-	my_conf=""
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-	if use apache2 ; then
-		# Concurrent PHP Apache2 modules support
-		if use concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
-		fi
-	fi
-
-	for x in ${PHPSAPIS} ; do
-		# Support the Apache2 extras, they must be set globally for all
-		# SAPIs to work correctly, especially for external PHP extensions
-		if use apache2 ; then
-			# Threaded Apache2 support
-			if use threads ; then
-				my_conf="${my_conf} --enable-experimental-zts"
-				ewarn "Enabling ZTS for Apache2 MPM"
-			fi
-		fi
-
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI="${x}"
-
-		case ${x} in
-			cli)
-				my_conf="${my_conf} --enable-cli --disable-cgi"
-				php4_4-sapi_src_compile
-				cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
-				;;
-			cgi)
-				my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi"
-				phpconfutils_extension_enable "discard-path" "discard-path" 0
-				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
-				php4_4-sapi_src_compile
-				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-				;;
-			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-				php4_4-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-		my_conf=""
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php4
-
-	# Let the eclass do the common work
-	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
-				;;
-			apache2)
-				einfo "Installing Apache${APACHE_VERSION} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if use concurrentmodphp ; then
-					einfo "Installing Apache${APACHE_VERSION} config file for PHP4-concurrent (70_mod_php_concurr.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php_concurr.conf-apache2" "70_mod_php_concurr.conf"
-
-					# Put the ld version script in the right place so it's always accessible
-					insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-					doins "${FILESDIR}/php4-ldvs"
-
-					# Redefine the extension dir to have the modphp suffix
-					PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
-				else
-					einfo "Installing Apache${APACHE_VERSION} config file for PHP4 (70_mod_php.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf"
-				fi
-				php4_4-sapi_install_ini
-				;;
-		esac
-	done
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php4-envd" "20php4"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php4"
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP4"
-		if use concurrentmodphp ; then
-			APACHE2_MOD_CONF="70_mod_php_concurr"
-		else
-			APACHE2_MOD_CONF="70_mod_php"
-		fi
-		apache-module_pkg_postinst
-	fi
-
-	# Update Apache2 to use mod_php
-	if use apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache2 php4
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache2 is configured to load a different version of PHP."
-			ewarn "To make Apache2 use PHP v4, use php-select:"
-			ewarn
-			ewarn "    php-select apache2 php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cli
-	if use cli || phpconfutils_usecheck cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php php4
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "/usr/bin/php links to a different version of PHP."
-			ewarn "To make /usr/bin/php point to PHP v4, use php-select:"
-			ewarn
-			ewarn "    php-select php php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cgi
-	if use cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php4 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php-cgi php4
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "/usr/bin/php-cgi links to a different version of PHP."
-			ewarn "To make /usr/bin/php-cgi point to PHP v4, use php-select:"
-			ewarn
-			ewarn "    php-select php-cgi php4"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php4 > /dev/null 2>&1
-	exitStatus=$?
-	if [[ $exitStatus == 5 ]] ; then
-		php-select php-devel php4
-	elif [[ $exitStatus == 4 ]] ; then
-		ewarn
-		ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
-		ewarn "different version of PHP. To make them point to PHP v4, use"
-		ewarn "php-select:"
-		ewarn
-		ewarn "    php-select php-devel php4"
-		ewarn
-	fi
-
-	php4_4-sapi_pkg_postinst
-}
-
-src_test() {
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	if ! emake -j1 test ; then
-		hasq test ${FEATURES} && die "Make test failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make test failed. See above for details."
-	fi
-}