Remove old versions.

(Portage version: 2.1.1_rc1-r2)
 (Unsigned Manifest commit)

5 files changed, 4 insertions, 1036 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8fad4a21d036..35328b98eb2a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -37,9 +37,7 @@ DIST hardening-patch-4.4.2-0.4.9-gentoo.patch.gz 59219 RMD160 6802aa02189489cf1e
 DIST hardening-patch-4.4.3-0.4.13-gentoo.patch.gz 60572 RMD160 bef0106227dd0e23a67e59d9d0a5735478c2dec2 SHA1 d0284ed0f7213e5afb326411cdaf2dfbdd007949 SHA256 4e09cd6cbd00e3a2199e6a68ab58875b133fea685500f2a35a2f7d348eaab44b
 DIST hardening-patch-4.4.4-0.4.14-gentoo.patch.gz 60772 RMD160 9f55babe9a2847f68574f94d9d49bb6eef1960b0 SHA1 6bf249422693c0ed6f1958b11d6594d1ad08e09d SHA256 454b23922ce1cdcb7ac61d02b198a21db08f2069cd9f7b2fb5f46291f0e24989
 DIST hardening-patch-5.0.5-0.4.8-gentoo.patch.gz 57864 RMD160 f68e2870ef56f005ae062f53053ecffd87b2059d SHA1 3f69694a541c9014c5b52669c4259ce11209da7b SHA256 6d8e61ff1fa10ce238600e936de1eac665c5237482ae6c3b4db05c6b7d684a7c
-DIST hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168 RMD160 8fe4085261c939944567a796e4be8d0af9fc4a66 SHA1 3b99af61fccc566e4a8170198900012f4524b74a SHA256 fd07ac145966e931f961c392ca087a2a7e93ba9c6bcc0ff382ca80d5019480d6
 DIST hardening-patch-5.1.4-0.4.13-gentoo.patch.gz 59457 RMD160 301592ee7fd7290e1c61d5e90f9a88a683ab8b3b SHA1 14604a1ed1120155f277c5d7dea4828ecac21a77 SHA256 ab3da7f799eaecda3fecf5971ed821ba60a3a8e0f4a931114122791542d95ddc
-DIST hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671 RMD160 c9e16019388d55a17d1c198f24492d7d07d68847 SHA1 260a47db36bdab64f122d6fa67234110047b9341 SHA256 f877989c03d13bb3b51e9af4e9a67d535da35784ceabd19dcd85be64ff6b9efa
 DIST hardening-patch-5.1.6-0.4.14-gentoo.patch.gz 60949 RMD160 4636e215cf13d50bcbdd75da45ef624d1c19ed5d SHA1 fa0cd8f4d630222a00c8b51fd566c5de10b6c464 SHA256 515687900f7976872cb14f5b052890b22c4b1cbea1dcfbab852b79dab13831bf
 DIST php-4.3.11.tar.bz2 4012575 RMD160 fe44f6c2783ddd469b94744e440e836cff3329e5 SHA1 617ce50bb125ee841f71e67638c492999cd3bd18 SHA256 6b133db9ac17d4e1f393003683c1b4d15dff3197559c85fd8dd63ba4868a21c5
 DIST php-4.4.2.tar.bz2 4371185 RMD160 cbef0fa4e233529422bc0944dcfb79d866013f5e SHA1 88f2e9efff0add8d8e3034d4ce3a948429b88756 SHA256 a2024d665125a41611eb64451648d37a81e3579594c8810bb41ac8b2b63f81eb
@@ -55,8 +53,6 @@ DIST php-patchset-4.4.2-r7.tar.bz2 24079 RMD160 9bd72618cb3ac7584bcbf5f41c7c7926
 DIST php-patchset-4.4.3-r3.tar.bz2 22764 RMD160 e9ec6ffcdebb696f13c177e57ad8d78763df439a SHA1 6e2961f3743f9b1d6fdd333639342287cba24bf8 SHA256 457f003521d930be27068cce80f4adfdedcb715789e1677b47b4dfbb86559819
 DIST php-patchset-4.4.4-r1.tar.bz2 19969 RMD160 e420d6b849c115ea987791875e019420292be9fd SHA1 ade335e6fbf04e15f510e1cc78163dcc7c989545 SHA256 5d739336ef5dfabe5dd884f06e2261e1014ae7e0126369aef547b61fc6d8ee92
 DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
-DIST php-patchset-5.1.4-r1.tar.bz2 7330 RMD160 ed33ee236286539a0614709d944ac636b84bca45 SHA1 acf60f1f750cb8c2a42d0b5478cf295c2c5a37ea SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961
-DIST php-patchset-5.1.4-r5.tar.bz2 21025 RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea SHA1 c0d23e0437878a54c8c06790cfe71de940ca2fa8 SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f
 DIST php-patchset-5.1.4-r6.tar.bz2 29925 RMD160 06e4cc0d2937786ac64446db9954897af2bd15c6 SHA1 e5b9f97e80c798078f7e39a05af2c50e4ace1bd9 SHA256 9a29de8dba649f91057d7c2f1b853dc81228936c78d0fb787287531eaf316b39
 DIST php-patchset-5.1.6-r1.tar.bz2 22390 RMD160 9bb28e7b2c247e890e386e89a820dc89a5ae3f05 SHA1 53d4d5b7400f814adba4c69b3258d0678fc7c1d3 SHA256 a3d1fb8926c8fd4a545559c859a2787ba08d94f60fd352512d8c5b2a3d98c14c
 DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
@@ -88,26 +84,18 @@ EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996
 MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
 RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
 SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb php-5.0.5-r5.ebuild 10457
-EBUILD php-5.1.4-r4.ebuild 14582 RMD160 84913912df1c476350ff504d2a4aec3c5eb0b0dd SHA1 c767d5c2f484f2d1453cfa01c9355ca26aea4071 SHA256 faffff64a47547f55cab9c1609b8825c4cefe55b4300dd9deb31cc2055313464
-MD5 cb663936b933d6d1fcfb7fba8ee35873 php-5.1.4-r4.ebuild 14582
-RMD160 84913912df1c476350ff504d2a4aec3c5eb0b0dd php-5.1.4-r4.ebuild 14582
-SHA256 faffff64a47547f55cab9c1609b8825c4cefe55b4300dd9deb31cc2055313464 php-5.1.4-r4.ebuild 14582
 EBUILD php-5.1.4-r6.ebuild 15386 RMD160 e5e1721339ac6cedd4a6bc0af5151670038dc044 SHA1 08c20a0beaf551fa0d33279b5a6c716eb216161d SHA256 f61d0b649adc0097f809b138546ae5fbbe759ba24ae6d585675892a4a7e09060
 MD5 c622e9b69242bf90ec5cfcdc62833d73 php-5.1.4-r6.ebuild 15386
 RMD160 e5e1721339ac6cedd4a6bc0af5151670038dc044 php-5.1.4-r6.ebuild 15386
 SHA256 f61d0b649adc0097f809b138546ae5fbbe759ba24ae6d585675892a4a7e09060 php-5.1.4-r6.ebuild 15386
-EBUILD php-5.1.4.ebuild 14575 RMD160 798bb61e46536dbb1429df96a5ab596457b01543 SHA1 690b5a8e83f1a6a81644596f5a0e89b974498f22 SHA256 5055ab37f0e18f503f49e012bd01a02d1e8dd824cfed9aa76d27c44988b21123
-MD5 36747f311302de82fcacf093713361bb php-5.1.4.ebuild 14575
-RMD160 798bb61e46536dbb1429df96a5ab596457b01543 php-5.1.4.ebuild 14575
-SHA256 5055ab37f0e18f503f49e012bd01a02d1e8dd824cfed9aa76d27c44988b21123 php-5.1.4.ebuild 14575
 EBUILD php-5.1.6-r2.ebuild 15397 RMD160 562f3b1c791e78a5138a906ae888bcd1ee3a2b33 SHA1 e59fd36464dff02b7389dbb330dc09bb1ec68f2b SHA256 51ee3ee52dc72ace26eeba435b3a304504aec2808a6f586d27c978c45bce9c93
 MD5 72beb5fd0d866ea6cc9fcb3b25452f17 php-5.1.6-r2.ebuild 15397
 RMD160 562f3b1c791e78a5138a906ae888bcd1ee3a2b33 php-5.1.6-r2.ebuild 15397
 SHA256 51ee3ee52dc72ace26eeba435b3a304504aec2808a6f586d27c978c45bce9c93 php-5.1.6-r2.ebuild 15397
-MISC ChangeLog 26818 RMD160 72c1bd4cb7d0d452f52d3d4346a3296ef44c1c8a SHA1 a559cbc7cbe4043d6500e2b1093d3527eb6ee12e SHA256 70f3352fbec8851032a9de924bd4313297f962dbba29a9d6f27c633d85aad75e
-MD5 b2a94c9d2c17d4fc2c7047064b9bd378 ChangeLog 26818
-RMD160 72c1bd4cb7d0d452f52d3d4346a3296ef44c1c8a ChangeLog 26818
-SHA256 70f3352fbec8851032a9de924bd4313297f962dbba29a9d6f27c633d85aad75e ChangeLog 26818
+MISC ChangeLog 26936 RMD160 88acabb5d791d7016a9e7b7da25304e66b487701 SHA1 8a8843d1396e5235175dd8e8c7dbcd17678abae3 SHA256 d300f5a33df365734d10aacc5536e7192e03254f0e1aad325f5051c2c6e96ff9
+MD5 a3f40b33b558fc7bed5d1be92d47c177 ChangeLog 26936
+RMD160 88acabb5d791d7016a9e7b7da25304e66b487701 ChangeLog 26936
+SHA256 d300f5a33df365734d10aacc5536e7192e03254f0e1aad325f5051c2c6e96ff9 ChangeLog 26936
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -133,12 +121,6 @@ SHA256 3db950a751ed3604c160e9f8e16bc36afd35f508ed9da858486e20d16c32795f files/di
 MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
 RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
 SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
-MD5 78fdb982f372be33b5285f276e01f126 files/digest-php-5.1.4 804
-RMD160 f37e782353d9fa85c24e11abdd9e476c3327cd24 files/digest-php-5.1.4 804
-SHA256 5d45c4a6e90865308f6b39b50351c7c216bc961aaa19ed1b448ac193c2fe7104 files/digest-php-5.1.4 804
-MD5 bdc8da5df48bab5c218ee207a4be22ee files/digest-php-5.1.4-r4 819
-RMD160 41661c49b35a90af46c63e867c2b0a82da6beff1 files/digest-php-5.1.4-r4 819
-SHA256 027d2b030bf9fa6d73c254dffb37ca42c4c1bd511c03c4b7e6271c16434a1b88 files/digest-php-5.1.4-r4 819
 MD5 e2701fcf4348406615cae33fd3cfed04 files/digest-php-5.1.4-r6 810
 RMD160 562ec3d2dfb41b85785155e09a3d9f7a26fe0213 files/digest-php-5.1.4-r6 810
 SHA256 d52a40e6f7f350a5ac2baa46095fb8e71e062d7b3cab3d890bc2c6a29c3ef91d files/digest-php-5.1.4-r6 810
diff --git a/dev-lang/php/files/digest-php-5.1.4 b/dev-lang/php/files/digest-php-5.1.4
deleted file mode 100644
index 168d286efc84..000000000000
--- a/dev-lang/php/files/digest-php-5.1.4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 6d0b7d563e5c18bc9cdd612737fc6982 hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671
-RMD160 c9e16019388d55a17d1c198f24492d7d07d68847 hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671
-SHA256 f877989c03d13bb3b51e9af4e9a67d535da35784ceabd19dcd85be64ff6b9efa hardening-patch-5.1.4-0.4.9-gentoo.patch.gz 57671
-MD5 66a806161d4a2d3b5153ebe4cd0f2e1c php-5.1.4.tar.bz2 6356171
-RMD160 d4ab11884a3a899f21eef777767a553cf81584ce php-5.1.4.tar.bz2 6356171
-SHA256 b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32 php-5.1.4.tar.bz2 6356171
-MD5 5e1e40f3f7fecf45d30f599cd3c17529 php-patchset-5.1.4-r1.tar.bz2 7330
-RMD160 ed33ee236286539a0614709d944ac636b84bca45 php-patchset-5.1.4-r1.tar.bz2 7330
-SHA256 5a780b331343fa1fb6c3c4a76bf87e24e586ca2f41c5cd3824291f1b0037e961 php-patchset-5.1.4-r1.tar.bz2 7330
diff --git a/dev-lang/php/files/digest-php-5.1.4-r4 b/dev-lang/php/files/digest-php-5.1.4-r4
deleted file mode 100644
index 0ec44b224cd8..000000000000
--- a/dev-lang/php/files/digest-php-5.1.4-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5c05d2abcc496454c17deb1889c6131c hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
-RMD160 8fe4085261c939944567a796e4be8d0af9fc4a66 hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
-SHA256 fd07ac145966e931f961c392ca087a2a7e93ba9c6bcc0ff382ca80d5019480d6 hardening-patch-5.1.4-0.4.11-gentoo-r1.patch.gz 58168
-MD5 66a806161d4a2d3b5153ebe4cd0f2e1c php-5.1.4.tar.bz2 6356171
-RMD160 d4ab11884a3a899f21eef777767a553cf81584ce php-5.1.4.tar.bz2 6356171
-SHA256 b55253e9557eceb901d83217ec192da22c28c7b2fdf714d3f151f1db663b5a32 php-5.1.4.tar.bz2 6356171
-MD5 1563ba29dae55380ef1b88be07fe39c6 php-patchset-5.1.4-r5.tar.bz2 21025
-RMD160 ebe867eff66440c1714ac2cb87c11ee17f15d8ea php-patchset-5.1.4-r5.tar.bz2 21025
-SHA256 8d682d0b26dcbd5ee420bc2c2e1483a68a34ede6eecf7ae83f1ea9ca36a6c57f php-patchset-5.1.4-r5.tar.bz2 21025
diff --git a/dev-lang/php/php-5.1.4-r4.ebuild b/dev-lang/php/php-5.1.4-r4.ebuild
deleted file mode 100644
index 2c48e62d42ad..000000000000
--- a/dev-lang/php/php-5.1.4-r4.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4-r4.ebuild,v 1.9 2006/08/06 16:28:37 vapier 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="5"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE="1"
-
-# php patch settings, general
-PHP_PATCHSET_REV="5"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.11-gentoo-r1.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 php5_1-sapi apache-module
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache 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 apache apache2
-
-	# Threaded Apache2 support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if ! useq threads ; then
-				APACHE2_SAFE_MPMS="itk 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
-
-	# Concurrent PHP Apache2 modules support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if useq 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
-	fi
-
-	# fastbuild support
-	if useq 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
-
-	php5_1-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if useq cli || phpconfutils_usecheck 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_unpack() {
-	if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-		unpack ${A}
-	fi
-
-	cd "${S}"
-
-	# Concurrent PHP Apache2 modules support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if useq 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
-	fi
-
-	# fastbuild support
-	if useq 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
-	php5_1-sapi_src_unpack
-}
-
-src_compile() {
-	if useq 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_apache1=0
-	build_apache2=0
-	my_conf=""
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache1)
-				build_apache1=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_apache1} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
-	fi
-
-	if [[ ${build_apache2} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-		# Threaded Apache2 support
-		if useq threads ; then
-			my_conf="${my_conf} --enable-maintainer-zts"
-			ewarn "Enabling ZTS for Apache2 MPM"
-		fi
-
-		# Concurrent PHP Apache2 modules support
-		if useq concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-		fi
-	fi
-
-	# Now we know what we are building, build it
-	php5_1-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-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/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-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/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_apache1} = 1 ]] || [[ ${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}-php5\"|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}-php5/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 useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			# Concurrent PHP Apache2 modules support
-			if useq concurrentmodphp ; then
-				append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-			fi
-		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 useq apache2 ; then
-			if [[ "${APACHE_VERSION}" != "0" ]] ; then
-				# Threaded Apache2 support
-				if useq threads ; then
-					my_conf="${my_conf} --enable-maintainer-zts"
-					ewarn "Enabling ZTS for Apache2 MPM"
-				fi
-			fi
-		fi
-
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI="${x}"
-
-		case ${x} in
-			cli)
-				my_conf="${my_conf} --enable-cli --disable-cgi"
-				php5_1-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
-				php5_1-sapi_src_compile
-				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-				;;
-			apache1)
-				my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
-				php5_1-sapi_src_compile
-				;;
-			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-				php5_1-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-		my_conf=""
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php5
-
-	# Let the eclass do the common work
-	php5_1-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"
-				php5_1-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php5_1-sapi_install_ini
-				;;
-			apache1)
-				einfo "Installing Apache${APACHE_VERSION} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-				insinto ${APACHE_MODULES_CONFDIR}
-				newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
-				php5_1-sapi_install_ini
-				;;
-			apache2)
-				einfo "Installing Apache${APACHE_VERSION} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if useq concurrentmodphp ; then
-					einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_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}/php5-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 PHP5 (70_mod_php5.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
-				fi
-				php5_1-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP5"
-		APACHE1_MOD_CONF="70_mod_php5"
-		APACHE2_MOD_DEFINE="PHP5"
-		if useq concurrentmodphp ; then
-			APACHE2_MOD_CONF="70_mod_php5_concurr"
-		else
-			APACHE2_MOD_CONF="70_mod_php5"
-		fi
-		apache-module_pkg_postinst
-	fi
-
-	# Update Apache1 to use mod_php
-	if useq apache ; then
-		"${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache1 php5
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache1 is configured to load a different version of PHP."
-			ewarn "To make Apache1 use PHP v5, use php-select:"
-			ewarn
-			ewarn "    php-select apache1 php5"
-			ewarn
-		fi
-	fi
-
-	# Update Apache2 to use mod_php
-	if useq apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache2 php5
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache2 is configured to load a different version of PHP."
-			ewarn "To make Apache2 use PHP v5, use php-select:"
-			ewarn
-			ewarn "    php-select apache2 php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cli
-	if useq cli || phpconfutils_usecheck cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php php5
-		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 v5, use php-select:"
-			ewarn
-			ewarn "    php-select php php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cgi
-	if useq cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php-cgi php5
-		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 v5, use php-select:"
-			ewarn
-			ewarn "    php-select php-cgi php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-	exitStatus=$?
-	if [[ $exitStatus == 5 ]] ; then
-		php-select php-devel php5
-	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 v5, use"
-		ewarn "php-select:"
-		ewarn
-		ewarn "    php-select php-devel php5"
-		ewarn
-	fi
-
-	php5_1-sapi_pkg_postinst
-}
diff --git a/dev-lang/php/php-5.1.4.ebuild b/dev-lang/php/php-5.1.4.ebuild
deleted file mode 100644
index 64ca6f722488..000000000000
--- a/dev-lang/php/php-5.1.4.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.4.ebuild,v 1.13 2006/07/20 14:26:12 chtekk 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="5"
-MY_PHP_PV="${PV}"
-MY_PHP_P="php-${MY_PHP_PV}"
-PHP_PACKAGE="1"
-
-# php patch settings, general
-PHP_PATCHSET_REV="1"
-HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.9-gentoo.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 php5_1-sapi apache-module
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache 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 apache apache2
-
-	# Threaded Apache2 support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if ! useq threads ; then
-				APACHE2_SAFE_MPMS="itk 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
-
-	# Concurrent PHP Apache2 modules support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if useq 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
-	fi
-
-	# fastbuild support
-	if useq 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
-
-	php5_1-sapi_pkg_setup
-}
-
-php_determine_sapis() {
-	# holds the list of sapis that we want to build
-	PHPSAPIS=
-
-	if useq cli || phpconfutils_usecheck 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_unpack() {
-	if [[ "${PHP_PACKAGE}" == 1 ]] ; then
-		unpack ${A}
-	fi
-
-	cd "${S}"
-
-	# Concurrent PHP Apache2 modules support
-	if useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			if useq 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
-	fi
-
-	# fastbuild support
-	if useq 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
-	php5_1-sapi_src_unpack
-}
-
-src_compile() {
-	if useq 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_apache1=0
-	build_apache2=0
-	my_conf=""
-
-	for x in ${PHPSAPIS} ; do
-		case ${x} in
-			cli)
-				build_cli=1
-				;;
-			cgi)
-				build_cgi=1
-				;;
-			apache1)
-				build_apache1=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_apache1} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
-	fi
-
-	if [[ ${build_apache2} = 1 ]] ; then
-		my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
-
-		# Threaded Apache2 support
-		if useq threads ; then
-			my_conf="${my_conf} --enable-maintainer-zts"
-			ewarn "Enabling ZTS for Apache2 MPM"
-		fi
-
-		# Concurrent PHP Apache2 modules support
-		if useq concurrentmodphp ; then
-			append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-		fi
-	fi
-
-	# Now we know what we are building, build it
-	php5_1-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-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/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-php5"|g;' -i main/build-defs.h
-		sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/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_apache1} = 1 ]] || [[ ${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}-php5\"|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}-php5/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 useq apache2 ; then
-		if [[ "${APACHE_VERSION}" != "0" ]] ; then
-			# Concurrent PHP Apache2 modules support
-			if useq concurrentmodphp ; then
-				append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
-			fi
-		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 useq apache2 ; then
-			if [[ "${APACHE_VERSION}" != "0" ]] ; then
-				# Threaded Apache2 support
-				if useq threads ; then
-					my_conf="${my_conf} --enable-maintainer-zts"
-					ewarn "Enabling ZTS for Apache2 MPM"
-				fi
-			fi
-		fi
-
-		if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
-			make clean
-		fi
-
-		PHPSAPI="${x}"
-
-		case ${x} in
-			cli)
-				my_conf="${my_conf} --enable-cli --disable-cgi"
-				php5_1-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
-				php5_1-sapi_src_compile
-				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
-				;;
-			apache1)
-				my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
-				php5_1-sapi_src_compile
-				;;
-			apache2)
-				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
-				php5_1-sapi_src_compile
-				;;
-		esac
-
-		CLEAN_REQUIRED=1
-		my_conf=""
-	done
-}
-
-src_install() {
-	php_determine_sapis
-
-	destdir=/usr/$(get_libdir)/php5
-
-	# Let the eclass do the common work
-	php5_1-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"
-				php5_1-sapi_install_ini
-				;;
-			cgi)
-				einfo "Installing CGI SAPI"
-				into ${destdir}
-				dobin php-cgi || die "Unable to install ${x} sapi"
-				php5_1-sapi_install_ini
-				;;
-			apache1)
-				einfo "Installing Apache${APACHE_VERSION} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
-				insinto ${APACHE_MODULES_CONFDIR}
-				newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
-				php5_1-sapi_install_ini
-				;;
-			apache2)
-				einfo "Installing Apache${APACHE_VERSION} SAPI"
-				make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
-				if useq concurrentmodphp ; then
-					einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_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}/php5-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 PHP5 (70_mod_php5.conf)"
-					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
-				fi
-				php5_1-sapi_install_ini
-				;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if useq apache || useq apache2 ; then
-		APACHE1_MOD_DEFINE="PHP5"
-		APACHE1_MOD_CONF="70_mod_php5"
-		APACHE2_MOD_DEFINE="PHP5"
-		if useq concurrentmodphp ; then
-			APACHE2_MOD_CONF="70_mod_php5_concurr"
-		else
-			APACHE2_MOD_CONF="70_mod_php5"
-		fi
-		apache-module_pkg_postinst
-	fi
-
-	# Update Apache1 to use mod_php
-	if useq apache ; then
-		"${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache1 php5
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache1 is configured to load a different version of PHP."
-			ewarn "To make Apache1 use PHP v5, use php-select:"
-			ewarn
-			ewarn "    php-select apache1 php5"
-			ewarn
-		fi
-	fi
-
-	# Update Apache2 to use mod_php
-	if useq apache2 ; then
-		"${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 2 ]] ; then
-			php-select apache2 php5
-		elif [[ ${exitStatus} == 4 ]] ; then
-			ewarn
-			ewarn "Apache2 is configured to load a different version of PHP."
-			ewarn "To make Apache2 use PHP v5, use php-select:"
-			ewarn
-			ewarn "    php-select apache2 php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cli
-	if useq cli || phpconfutils_usecheck cli ; then
-		"${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php php5
-		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 v5, use php-select:"
-			ewarn
-			ewarn "    php-select php php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-cgi
-	if useq cgi ; then
-		"${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
-		exitStatus=$?
-		if [[ ${exitStatus} == 5 ]] ; then
-			php-select php-cgi php5
-		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 v5, use php-select:"
-			ewarn
-			ewarn "    php-select php-cgi php5"
-			ewarn
-		fi
-	fi
-
-	# Create the symlinks for php-devel
-	"${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
-	exitStatus=$?
-	if [[ $exitStatus == 5 ]] ; then
-		php-select php-devel php5
-	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 v5, use"
-		ewarn "php-select:"
-		ewarn
-		ewarn "    php-select php-devel php5"
-		ewarn
-	fi
-
-	php5_1-sapi_pkg_postinst
-}