Removed older alphas and rcs

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

7 files changed, 7 insertions, 1757 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 03c97d337c9f..b74cfe92a93d 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.501 2011/08/21 13:58:36 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.502 2011/08/21 14:06:56 olemarkus Exp $
+
+  21 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc2.ebuild,
+  -php-5.3.7_rc3.ebuild, -php-5.3.7.ebuild, -php-5.4.0_alpha1.ebuild,
+  -php-5.5.0_pre201105211430.ebuild:
+  Removed older alphas and rcs
 
   21 Aug 2011; Ole Markus With <olemarkus@gentoo.org>
   -files/eblits/src_configure-v52.eblit, -php-5.2.14.ebuild,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d1cff7bae6b4..f0289f889ad1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -37,32 +37,17 @@ AUX php-fpm.init 385 RMD160 0e266738ceb3853ce335db6375b5438bdea597db SHA1 bce556
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
 DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
 DIST php-5.3.6.tar.bz2 10952171 RMD160 619bf96cf24bf6aa0988494186f8914fde94d44d SHA1 0e0b9b4d9117f22080e2204afa9383469eb0dbbd SHA256 30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198
-DIST php-5.3.7.tar.bz2 11144328 RMD160 d14c52036f35d79193783b590c0cf131e1cd00c0 SHA1 811e84b75d41ad997c075e3ebc8470f5c26d03ea SHA256 58b490af6f919acfafb6e176957b88e3d814eabee68cc147b4d8d20697d88b96
-DIST php-5.3.7RC2.tar.bz2 11135548 RMD160 446f53e0af86dfaaab025869996fff5b82493904 SHA1 c333becfba3da5d5ee45419d8f66bcdc644154f3 SHA256 556fd00b84858ee46e7c19e3d9fdf17fbb03725211dc39d6cbd44e8060dda017
-DIST php-5.3.7RC3.tar.bz2 11135642 RMD160 81945143b1ccfa20139c685e1341ed9a8853d7fe SHA1 6c1ddd5ace11cebb4cdce1979780c4413cae3371 SHA256 19d543aba7b6e88390050ce68df99bcfeb10daa6150c8b46347873595abb6f9f
 DIST php-5.3.7RC5.tar.bz2 11140021 RMD160 177e483959c9e23e4b12a3c63086ac755d6d67e7 SHA1 675bc619f54414b09c38a9fb0271561892c07baa SHA256 d869ccabe05feb244c795514a3dd769e846b6b54e6ac362008e90c5cd57ea58a
-DIST php-5.4.0alpha1.tar.bz2 11015848 RMD160 2f0d10fa22465d984fa584cc62924717e5deb1fc SHA1 40ba6c57ad4e364667170dc0ea448e38e2695ccf SHA256 d06d1b2b598d4a7773b6f90bda64c82ef3028f12cf1bc838f4c4de8bb24c1169
 DIST php-5.4.0alpha3.tar.bz2 11112693 RMD160 3b731cf7b2230013b7752c20c8e3dc695877c38e SHA1 400af62e1a5d495fe87d98432a38a692abfd0649 SHA256 263282185d2c50ccb1cd4c051157411c6da05cf0384c64f8bdff71c0d50113e1
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
 DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7a231c405 SHA1 cd9e5ae79595adf7ca42d6e2fe81dd275a8b7575 SHA256 544aae373fcff288bf22706a30f06da6bcc29695d0014dc7768585197c80aaeb
-DIST php-patchset-5.3.7-r0.tar.bz2 7525 RMD160 493f2206c490d759d6da8a7976290046946e111b SHA1 c363e4163cd92d6d469eb89efad801ff315cefbb SHA256 e06871054e1c57f0bee0f95e5ad4307abe4d9cec71f8ccdf68e1a2461367acb1
-DIST php-patchset-5.3.7_rc2-r0.tar.bz2 9258 RMD160 97c5be732f3b1d0cdd9f6af3e586e273a9941e9a SHA1 d03b80319fac25aaedf2de7f758bff94f7ec018b SHA256 318ccba899b3af78ba10b74da4dcdde7ca5556650bc5d1ea0a7d68957b4b3811
-DIST php-patchset-5.3.7_rc3-r0.tar.bz2 7528 RMD160 7f0389d957fa9048aed4d8787650d3162df742fa SHA1 e1c3354a5cd62b0b00f294bf412ae82fabb76610 SHA256 685fd20a301f42493e5c9f490642402e9da291a1a39d440567f4a9775195aed8
 DIST php-patchset-5.3.7_rc5-r0.tar.bz2 7519 RMD160 ec76e0b1d60d2f8f48c835e1bf9e3d3fd912688f SHA1 2a672db9d742330f6a3b122ad170a7ab6282a9eb SHA256 8faf9573fd0a255413ead940323e11c439e3a74eb9eb4bad71959334a81e2da1
-DIST php-patchset-5.4.0_alpha1-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST php-patchset-5.4.0_alpha3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
-DIST php-patchset-5.5.0_pre201105211430-r0.tar.bz2 9532 RMD160 8ef9cafc7652db45aef4421bafd51928f07dabff SHA1 44d7720208895b00a713e0f9ee777ea40a8fcf8a SHA256 3c348d8e09545beb33971c018ff948f4534766349821a477bd28c1b088b09b65
-DIST php-trunk-201105211430.tar.bz2 11158099 RMD160 9df5f2a1336367618a53f49123b6b11660c8bbd6 SHA1 2f986aca0094bd6950867d10c84c1df790c7a6b2 SHA256 77e808a91ea1046f9dd47830d029a5c5a416b741d0955d7097e11e4d795062f1
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
 EBUILD php-5.2.17.ebuild 9485 RMD160 3c6079bff58c1cb97302a03a207dfe1d0ad5a64f SHA1 56d7b3d08d1c08385bf1e4e783380bb1ef3357b5 SHA256 117bbe4abb70de4b2b3e4bafd1c8c5b76e8f5d9a16e25e3c78326e53350535ab
 EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d SHA1 ccdd5c0fdcd169b4819d924ff0f5f5a6caaf934b SHA256 97ffbe697c6d607b748b89044baed1b4a91fc7a09790d0abfce6acc47ca45703
 EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
-EBUILD php-5.3.7.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
-EBUILD php-5.3.7_rc2.ebuild 9543 RMD160 88a46bcac38f3ebc873f48406cb124f23f402126 SHA1 2100316c2586e434a97c8a508b1d985b02c74a03 SHA256 659d078fa2399ae800734f701357c9a64fbc787693c04d1908470602797fcf75
-EBUILD php-5.3.7_rc3.ebuild 9586 RMD160 59388df6b23c096945bc9a44e570949477c9da0a SHA1 24fe50e43390e12dada7fd87a76b159678bfe63d SHA256 11fff86b394f532fe87be99f2424e0a9f92f990cbee7b924ba63c604f69c9045
 EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
-EBUILD php-5.4.0_alpha1.ebuild 8538 RMD160 194abead36de3e3c7cba14ee4d0191de1fc6003d SHA1 665b74f0b909bac24a331cecc047c6baf58490fe SHA256 5a6c9526d65968cdc50a866ce0a02a1d0e24c826641f6b66e251cfa61c5f67b3
 EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68
-EBUILD php-5.5.0_pre201105211430.ebuild 9523 RMD160 ed8fb75cb33d9ac955897bbeffd559e8e91dff3b SHA1 7557061d6f4e0dd38710af7b417f3fa37a8f2214 SHA256 187d2434b926db70e7a2c1f89141a09cc869c431ebb6e0d857913eaa50da7ce2
-MISC ChangeLog 85279 RMD160 fa5b40058212fc23ca498af295677e106c590e5e SHA1 02132bd2b9e6f29c94bb1487d17fd4f17a6b01b9 SHA256 2f3d7b97331a09222bde421d92f83b99820f51e07a871c042f64d26381f9482e
+MISC ChangeLog 85731 RMD160 33a7efcce5962eb68b9cd6bf9e1f787bef6bf939 SHA1 5558e3b63e95d3903e0cafee29fba1ebf7a18c42 SHA256 06297e9560f4d09f563cab3c527393cb90f01be98d98c91cb94982a77142f226
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
diff --git a/dev-lang/php/php-5.3.7.ebuild b/dev-lang/php/php-5.3.7.ebuild
deleted file mode 100644
index 148855d6a305..000000000000
--- a/dev-lang/php/php-5.3.7.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.7.ebuild,v 1.1 2011/08/21 13:58:36 olemarkus Exp $
-
-EAPI=4
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/ilia/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
-	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
-	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls oci8
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode sapdb +session sharedext sharedmem
-	+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	birdstep? ( >=dev-db/unixODBC-1.8.13 )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	db2? ( >=dev-db/unixODBC-1.8.13 )
-	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
-	enchant? ( app-text/enchant )
-	esoob? ( >=dev-db/unixODBC-1.8.13 )
-	exif? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gd-external? ( media-libs/gd )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
-	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sapdb? ( >=dev-db/unixODBC-1.8.13 )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	solid? ( >=dev-db/unixODBC-1.8.13 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) )
-	sqlite3? ( >=dev-db/sqlite-3.7.7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? ( !gd-external? (
-			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( || ( gd gd-external ) )
-	cjk? ( || ( gd gd-external ) )
-	exif? ( || ( gd gd-external ) )
-
-	xpm? ( gd )
-	gd? ( zlib !gd-external )
-	gd-external? ( !gd )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap !oci8 )
-	adabas? ( odbc )
-	birdstep? ( odbc )
-	dbmaker? ( odbc )
-	empress-bcs? ( empress )
-	empress? ( odbc )
-	esoob? ( odbc )
-	db2? ( odbc )
-	sapdb? ( odbc )
-	solid? ( odbc )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	oci8? ( !oci8-instant-client !ldap-sasl )
-	oci8-instant-client? ( !oci8 )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	firebird? ( !interbase )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v2
-
-src_prepare() { eblit-run src_prepare v3 ; }
-src_configure() { eblit-run src_configure v2 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v2 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }
diff --git a/dev-lang/php/php-5.3.7_rc2.ebuild b/dev-lang/php/php-5.3.7_rc2.ebuild
deleted file mode 100644
index a3948c8cb85a..000000000000
--- a/dev-lang/php/php-5.3.7_rc2.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.7_rc2.ebuild,v 1.1 2011/07/01 11:45:01 olemarkus Exp $
-
-EAPI=4
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/ilia/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
-	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
-	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls oci8
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode sapdb +session sharedext sharedmem
-	+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	birdstep? ( >=dev-db/unixODBC-1.8.13 )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	db2? ( >=dev-db/unixODBC-1.8.13 )
-	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
-	enchant? ( app-text/enchant )
-	esoob? ( >=dev-db/unixODBC-1.8.13 )
-	exif? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gd-external? ( media-libs/gd )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
-	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sapdb? ( >=dev-db/unixODBC-1.8.13 )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	solid? ( >=dev-db/unixODBC-1.8.13 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.6.3 ) )
-	sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? ( !gd-external? (
-			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( || ( gd gd-external ) )
-	cjk? ( || ( gd gd-external ) )
-	exif? ( || ( gd gd-external ) )
-
-	xpm? ( gd )
-	gd? ( zlib !gd-external )
-	gd-external? ( !gd )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap !oci8 )
-	adabas? ( odbc )
-	birdstep? ( odbc )
-	dbmaker? ( odbc )
-	empress-bcs? ( empress )
-	empress? ( odbc )
-	esoob? ( odbc )
-	db2? ( odbc )
-	sapdb? ( odbc )
-	solid? ( odbc )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	oci8? ( !oci8-instant-client !ldap-sasl )
-	oci8-instant-client? ( !oci8 )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	firebird? ( !interbase )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v2
-
-src_prepare() { eblit-run src_prepare v3 ; }
-src_configure() { eblit-run src_configure v2 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v2 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }
diff --git a/dev-lang/php/php-5.3.7_rc3.ebuild b/dev-lang/php/php-5.3.7_rc3.ebuild
deleted file mode 100644
index 4e536ff91853..000000000000
--- a/dev-lang/php/php-5.3.7_rc3.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.7_rc3.ebuild,v 1.1 2011/07/23 10:14:46 olemarkus Exp $
-
-EAPI=4
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/ilia/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
-	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
-	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls oci8
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode sapdb +session sharedext sharedmem
-	+simplexml snmp soap sockets solid spell sqlite sqlite3 ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	birdstep? ( >=dev-db/unixODBC-1.8.13 )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	db2? ( >=dev-db/unixODBC-1.8.13 )
-	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
-	enchant? ( app-text/enchant )
-	esoob? ( >=dev-db/unixODBC-1.8.13 )
-	exif? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gd-external? ( media-libs/gd )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
-	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sapdb? ( >=dev-db/unixODBC-1.8.13 )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	solid? ( >=dev-db/unixODBC-1.8.13 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.6.3 ) )
-	sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? ( !gd-external? (
-			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( || ( gd gd-external ) )
-	cjk? ( || ( gd gd-external ) )
-	exif? ( || ( gd gd-external ) )
-
-	xpm? ( gd )
-	gd? ( zlib !gd-external )
-	gd-external? ( !gd )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap !oci8 )
-	adabas? ( odbc )
-	birdstep? ( odbc )
-	dbmaker? ( odbc )
-	empress-bcs? ( empress )
-	empress? ( odbc )
-	esoob? ( odbc )
-	db2? ( odbc )
-	sapdb? ( odbc )
-	solid? ( odbc )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	oci8? ( !oci8-instant-client !ldap-sasl )
-	oci8-instant-client? ( !oci8 )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	firebird? ( !interbase )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v2
-
-src_prepare() { eblit-run src_prepare v3 ; }
-src_configure() { eblit-run src_configure v2 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v2 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }
diff --git a/dev-lang/php/php-5.4.0_alpha1.ebuild b/dev-lang/php/php-5.4.0_alpha1.ebuild
deleted file mode 100644
index 7330bbc36c55..000000000000
--- a/dev-lang/php/php-5.4.0_alpha1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha1.ebuild,v 1.3 2011/07/02 15:14:41 olemarkus Exp $
-
-EAPI=4
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-stas")
-			echo "http://downloads.php.net/stas/${2}"
-		;;
-		"php-pre")
-			echo "http://downloads.php.net/johannes/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PV/_alpha/alpha}"
-PHP_RELEASE="php-stas"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers debug doc
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode +session sharedmem
-	+simplexml snmp soap sockets spell sqlite3 ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.12[unicode]
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg media-libs/libpng sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v3
-
-src_prepare() { eblit-run src_prepare v4 ; }
-src_configure() { eblit-run src_configure v3 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v3 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }
diff --git a/dev-lang/php/php-5.5.0_pre201105211430.ebuild b/dev-lang/php/php-5.5.0_pre201105211430.ebuild
deleted file mode 100644
index 3651d9c69ca1..000000000000
--- a/dev-lang/php/php-5.5.0_pre201105211430.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.0_pre201105211430.ebuild,v 1.1 2011/05/22 07:17:51 olemarkus Exp $
-
-EAPI=4
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-SUHOSIN_VERSION=""
-FPM_VERSION="builtin"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/johannes/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"suhosin")
-			echo "http://download.suhosin.org/${2}"
-		;;
-		"olemarkus")
-			echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="$(get_version_component_range 4 )"
-PHP_PV="${PHP_PV/pre/trunk-}"
-
-PHP_RELEASE="olemarkus"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="0"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
-	# in some cases we use our own suhosin patch (very recent version,
-	# patch conflicts, etc.)
-	SUHOSIN_TYPE="gentoo"
-else
-	SUHOSIN_TYPE="suhosin"
-fi
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
-	SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-fi
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}
-	"
-
-if [[ -n ${SUHOSIN_VERSION} ]]; then
-	SRC_URI="${SRC_URI}
-		suhosin? ( ${SUHOSIN_URI} )"
-fi
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-SLOT="5.5"
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
-	empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
-	interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls oci8
-	oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
-	readline recode sapdb +session sharedext sharedmem
-	+simplexml snmp soap sockets solid spell sqlite ssl
-	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
-	xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
-
-# Enable suhosin if available
-[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-
-DEPEND="!dev-lang/php:5
-	>=app-admin/eselect-php-0.6.2
-	>=dev-libs/libpcre-8.11[unicode]
-	adabas? ( >=dev-db/unixODBC-1.8.13 )
-	apache2? ( www-servers/apache[threads=] )
-	berkdb? ( =sys-libs/db-4* )
-	birdstep? ( >=dev-db/unixODBC-1.8.13 )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	db2? ( >=dev-db/unixODBC-1.8.13 )
-	dbmaker? ( >=dev-db/unixODBC-1.8.13 )
-	empress? ( >=dev-db/unixODBC-1.8.13 )
-	empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
-	enchant? ( app-text/enchant )
-	esoob? ( >=dev-db/unixODBC-1.8.13 )
-	exif? ( !gd? ( !gd-external? (
-		virtual/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-	) ) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
-	gd-external? ( media-libs/gd )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	kolab? ( >=net-libs/c-client-2004g-r1 )
-	ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
-	ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sapdb? ( >=dev-db/unixODBC-1.8.13 )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	solid? ( >=dev-db/unixODBC-1.8.13 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.4 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? ( !gd-external? (
-			virtual/jpeg media-libs/libpng sys-libs/zlib ) )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg
-		media-libs/libpng sys-libs/zlib
-	)
-	xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( || ( gd gd-external ) )
-	cjk? ( || ( gd gd-external ) )
-	exif? ( || ( gd gd-external ) )
-
-	xpm? ( gd )
-	gd? ( zlib !gd-external )
-	gd-external? ( !gd )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xsl? ( xml )
-	ldap-sasl? ( ldap !oci8 )
-	adabas? ( odbc )
-	birdstep? ( odbc )
-	dbmaker? ( odbc )
-	empress-bcs? ( empress )
-	empress? ( odbc )
-	esoob? ( odbc )
-	db2? ( odbc )
-	sapdb? ( odbc )
-	solid? ( odbc )
-	kolab? ( imap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	oci8? ( !oci8-instant-client !ldap-sasl )
-	oci8-instant-client? ( !oci8 )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	firebird? ( !interbase )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-DEPEND="${DEPEND}
-	enchant? ( !dev-php5/pecl-enchant )
-	fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
-	filter? ( !dev-php5/pecl-filter )
-	json? ( !dev-php5/pecl-json )
-	phar? ( !dev-php5/pecl-phar )
-	zip? ( !dev-php5/pecl-zip )"
-
-[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
-=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )"
-
-# No longer depend on the extension. The suhosin USE flag only installs the
-# patch
-#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
-	[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
-	local e v func=$1 ver=$2 eval_=$3
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v2
-
-src_prepare() { eblit-run src_prepare snapshots ; }
-src_configure() { eblit-run src_configure snapshots ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v2 ; }
-src_test() { eblit-run src_test v1 ; }
-pkg_postinst() { eblit-run pkg_postinst v2 ; }