Removing old ebuilds

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

15 files changed, 19 insertions, 946 deletions

diff --git a/dev-php/eaccelerator/ChangeLog b/dev-php/eaccelerator/ChangeLog
index b3ba7e7be7da..c895cb46f7d5 100644
--- a/dev-php/eaccelerator/ChangeLog
+++ b/dev-php/eaccelerator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/eaccelerator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/ChangeLog,v 1.29 2012/08/11 12:43:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/ChangeLog,v 1.30 2012/08/23 16:33:52 olemarkus Exp $
+
+  23 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  -eaccelerator-0.9.6.1-r1.ebuild, -eaccelerator-0.9.6.1-r3.ebuild,
+  -eaccelerator-0.9.6.1-r4.ebuild:
+  Removing old ebuilds
 
   11 Aug 2012; Markus Meier <maekke@gentoo.org> eaccelerator-0.9.6.1-r5.ebuild:
   x86 stable, bug #418897
@@ -208,4 +213,3 @@
   05 Mar 2006; Sebastian Bergmann <sebastian@gentoo.org> +metadata.xml,
   +eaccelerator-0.9.5_beta1.ebuild:
   Initial ebuild.
-
diff --git a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r1.ebuild b/dev-php/eaccelerator/eaccelerator-0.9.6.1-r1.ebuild
deleted file mode 100644
index 658998a76f96..000000000000
--- a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/eaccelerator-0.9.6.1-r1.ebuild,v 1.5 2012/06/07 20:27:42 zmedico Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="eaccelerator"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
-
-inherit php-ext-source-r2 eutils depend.apache user
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A PHP Accelerator & Encoder."
-HOMEPAGE="http://www.eaccelerator.net/"
-SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug disassembler inode doccommentinclusion session"
-
-DEPEND="!dev-php/pecl-apc !dev-php/xcache"
-RDEPEND="${DEPEND}
-	>=dev-lang/php-5.1[zlib,session?]
-	virtual/httpd-php
-"
-
-# Webserver user and group, here for Apache by default
-HTTPD_USER="${HTTPD_USER:-apache}"
-HTTPD_GROUP="${HTTPD_GROUP:-apache}"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	if ! use apache2 ; then
-		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
-			eerror "You did not enable apache2 USE flag, so you need to define"
-			eerror "the user and group that will be used for ${PN} yourself."
-			eerror
-			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
-			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
-			eerror
-			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
-		else
-			enewgroup ${HTTPD_GROUP}
-			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
-		fi
-	fi
-}
-
-src_compile() {
-	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
-	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
-	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
-	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
-	use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
-	php-ext-source-r2_src_compile
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-
-	keepdir "${EACCELERATOR_CACHEDIR}"
-	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
-	fperms 750 "${EACCELERATOR_CACHEDIR}"
-
-	insinto "/usr/share/${PVR}"
-	doins -r doc/php/
-	dodoc AUTHORS ChangeLog NEWS README
-
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
-	php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
-}
-
-pkg_postinst() {
-	elog "Please see the files in ${ROOT}usr/share/${PVR}/ for some"
-	elog "examples and informations on how to use the functions that"
-	elog "eAccelerator adds to PHP."
-}
diff --git a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r3.ebuild b/dev-php/eaccelerator/eaccelerator-0.9.6.1-r3.ebuild
deleted file mode 100644
index 56f86a9dee9c..000000000000
--- a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/eaccelerator-0.9.6.1-r3.ebuild,v 1.5 2012/06/07 20:27:42 zmedico Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="eaccelerator"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
-
-inherit php-ext-source-r2 eutils depend.apache user
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A PHP Accelerator & Encoder."
-HOMEPAGE="http://www.eaccelerator.net/"
-SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug disassembler inode doccommentinclusion session"
-
-DEPEND="!dev-php/pecl-apc !dev-php/xcache"
-RDEPEND="${DEPEND}
-	>=dev-lang/php-5.1[zlib,session?]
-	virtual/httpd-php
-"
-
-# Webserver user and group, here for Apache by default
-HTTPD_USER="${HTTPD_USER:-apache}"
-HTTPD_GROUP="${HTTPD_GROUP:-apache}"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	if ! use apache2 ; then
-		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
-			eerror "You did not enable apache2 USE flag, so you need to define"
-			eerror "the user and group that will be used for ${PN} yourself."
-			eerror
-			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
-			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
-			eerror
-			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
-		else
-			enewgroup ${HTTPD_GROUP}
-			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
-		fi
-	fi
-}
-
-src_configure() {
-	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
-	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
-	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
-	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
-	use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-
-	keepdir "${EACCELERATOR_CACHEDIR}"
-	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
-	fperms 750 "${EACCELERATOR_CACHEDIR}"
-
-	insinto "/usr/share/${PF}"
-	doins -r doc/php/
-	dodoc AUTHORS ChangeLog NEWS README
-
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
-	php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
-}
-
-pkg_postinst() {
-	elog "Please see the files in ${ROOT}usr/share/${PF}/ for some"
-	elog "examples and informations on how to use the functions that"
-	elog "eAccelerator adds to PHP."
-}
diff --git a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild b/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild
deleted file mode 100644
index 678807b10d18..000000000000
--- a/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/eaccelerator-0.9.6.1-r4.ebuild,v 1.7 2012/06/07 20:27:42 zmedico Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="eaccelerator"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
-
-inherit php-ext-source-r2 eutils depend.apache user
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A PHP Accelerator & Encoder."
-HOMEPAGE="http://www.eaccelerator.net/"
-SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug disassembler inode doccommentinclusion session"
-
-DEPEND="!dev-php/pecl-apc !dev-php/xcache"
-RDEPEND="${DEPEND}
-	>=dev-lang/php-5.1[zlib,session?]
-	virtual/httpd-php
-"
-
-# Webserver user and group, here for Apache by default
-HTTPD_USER="${HTTPD_USER:-apache}"
-HTTPD_GROUP="${HTTPD_GROUP:-apache}"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	if ! use apache2 ; then
-		if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
-			eerror "You did not enable apache2 USE flag, so you need to define"
-			eerror "the user and group that will be used for ${PN} yourself."
-			eerror
-			eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
-			eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
-			eerror
-			die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
-		else
-			enewgroup ${HTTPD_GROUP}
-			enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/eaccelerator-openbasedir.patch"
-	php-ext-source-r2_src_prepare
-}
-
-src_configure() {
-	my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
-	use debug && my_conf="${my_conf} --with-eaccelerator-debug"
-	use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
-	! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
-	use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-source-r2_src_install
-
-	keepdir "${EACCELERATOR_CACHEDIR}"
-	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
-	fperms 750 "${EACCELERATOR_CACHEDIR}"
-
-	insinto "/usr/share/${PF}"
-	doins -r doc/php/
-	dodoc AUTHORS ChangeLog NEWS README
-
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
-	php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
-	php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
-	php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
-}
-
-pkg_postinst() {
-	elog "Please see the files in ${ROOT}usr/share/${PF}/ for some"
-	elog "examples and informations on how to use the functions that"
-	elog "eAccelerator adds to PHP."
-}
diff --git a/dev-php/pecl-memcache/ChangeLog b/dev-php/pecl-memcache/ChangeLog
index 179f2e261311..4d349496e67a 100644
--- a/dev-php/pecl-memcache/ChangeLog
+++ b/dev-php/pecl-memcache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/pecl-memcache
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/ChangeLog,v 1.3 2011/11/11 14:30:31 olemarkus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/ChangeLog,v 1.4 2012/08/23 16:36:16 olemarkus Exp $
+
+  23 Aug 2012; Ole Markus With <olemarkus@gentoo.org>
+  -pecl-memcache-2.2.6-r1.ebuild, -pecl-memcache-3.0.5-r2.ebuild,
+  -pecl-memcache-3.0.6.ebuild:
+  Removing old ebuilds
 
 *pecl-memcache-3.0.6-r1 (11 Nov 2011)
 
@@ -263,4 +268,3 @@
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
-
diff --git a/dev-php/pecl-memcache/pecl-memcache-2.2.6-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-2.2.6-r1.ebuild
deleted file mode 100644
index 310a5f33c3c1..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-2.2.6-r1.ebuild,v 1.1 2011/08/17 18:13:51 olemarkus Exp $
-
-EAPI="2"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 hppa ppc64 x86"
-
-DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session"
-
-DEPEND="sys-libs/zlib
-		dev-lang/php[session?]"
-RDEPEND="${DEPEND}"
-
-# upstream does not ship any testsuite, so the PHPize test-runner fails.
-RESTRICT='test'
-
-src_configure() {
-	my_conf="--enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session)"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "memcache.allow_failover" "true"
-	php-ext-source-r2_addtoinifiles "memcache.max_failover_attempts" "20"
-	php-ext-source-r2_addtoinifiles "memcache.chunk_size" "32768"
-	php-ext-source-r2_addtoinifiles "memcache.default_port" "11211"
-	php-ext-source-r2_addtoinifiles "memcache.hash_strategy" "standard"
-	php-ext-source-r2_addtoinifiles "memcache.hash_function" "crc32"
-}
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.5-r2.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.5-r2.ebuild
deleted file mode 100644
index 44406e083ae7..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.5-r2.ebuild,v 1.1 2011/08/17 18:13:51 olemarkus Exp $
-
-EAPI="2"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session"
-
-DEPEND="sys-libs/zlib
-		dev-lang/php[session?]"
-RDEPEND="${DEPEND}"
-
-# upstream does not ship any testsuite, so the PHPize test-runner fails.
-RESTRICT='test'
-
-src_configure() {
-	my_conf="--enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session)"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "memcache.allow_failover" "true"
-	php-ext-source-r2_addtoinifiles "memcache.max_failover_attempts" "20"
-	php-ext-source-r2_addtoinifiles "memcache.chunk_size" "32768"
-	php-ext-source-r2_addtoinifiles "memcache.default_port" "11211"
-	php-ext-source-r2_addtoinifiles "memcache.hash_strategy" "consistent"
-	php-ext-source-r2_addtoinifiles "memcache.hash_function" "crc32"
-	php-ext-source-r2_addtoinifiles "memcache.redundancy" "1"
-	php-ext-source-r2_addtoinifiles "memcache.session_redundancy" "2"
-	php-ext-source-r2_addtoinifiles "memcache.protocol" "ascii"
-}
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.6.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.6.ebuild
deleted file mode 100644
index c0ec8e4a0a39..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-3.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.6.ebuild,v 1.1 2011/08/17 18:25:28 olemarkus Exp $
-
-EAPI="2"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for using memcached."
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session"
-
-DEPEND="sys-libs/zlib
-		dev-lang/php[session?]"
-RDEPEND="${DEPEND}"
-
-# upstream does not ship any testsuite, so the PHPize test-runner fails.
-RESTRICT='test'
-
-src_configure() {
-	my_conf="--enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session)"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "memcache.allow_failover" "true"
-	php-ext-source-r2_addtoinifiles "memcache.max_failover_attempts" "20"
-	php-ext-source-r2_addtoinifiles "memcache.chunk_size" "32768"
-	php-ext-source-r2_addtoinifiles "memcache.default_port" "11211"
-	php-ext-source-r2_addtoinifiles "memcache.hash_strategy" "consistent"
-	php-ext-source-r2_addtoinifiles "memcache.hash_function" "crc32"
-	php-ext-source-r2_addtoinifiles "memcache.redundancy" "1"
-	php-ext-source-r2_addtoinifiles "memcache.session_redundancy" "2"
-	php-ext-source-r2_addtoinifiles "memcache.protocol" "ascii"
-}
diff --git a/dev-php/xdebug/ChangeLog b/dev-php/xdebug/ChangeLog
index 6a861967189c..7cf0b1285fba 100644
--- a/dev-php/xdebug/ChangeLog
+++ b/dev-php/xdebug/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/xdebug
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/ChangeLog,v 1.44 2012/08/22 11:26:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/ChangeLog,v 1.45 2012/08/23 16:32:10 olemarkus Exp $
+
+  23 Aug 2012; Ole Markus With <olemarkus@gentoo.org> -xdebug-2.1.0-r1.ebuild,
+  -xdebug-2.1.1.ebuild, -xdebug-2.1.3.ebuild, -xdebug-2.1.4.ebuild,
+  -xdebug-2.2.0_rc1.ebuild, -xdebug-2.2.0_rc2.ebuild:
+  Removing old ebuilds
 
   22 Aug 2012; Agostino Sarubbo <ago@gentoo.org> xdebug-2.2.0.ebuild:
   Stable for amd64, wrt bug #427024
@@ -249,4 +254,3 @@
   31 Dec 2005; Sebastian Bergmann <sebastian@gentoo.org> +metadata.xml,
   +xdebug-2.0.0_beta5.ebuild:
   Initial ebuild.
-
diff --git a/dev-php/xdebug/xdebug-2.1.0-r1.ebuild b/dev-php/xdebug/xdebug-2.1.0-r1.ebuild
deleted file mode 100644
index cfcef0130cf1..000000000000
--- a/dev-php/xdebug/xdebug-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.0-r1.ebuild,v 1.3 2012/04/13 19:10:13 ulm Exp $
-
-EAPI="2"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-inherit php-ext-source-r2
-
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README Changelog CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.1.1.ebuild b/dev-php/xdebug/xdebug-2.1.1.ebuild
deleted file mode 100644
index 51bcf3c39060..000000000000
--- a/dev-php/xdebug/xdebug-2.1.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.1.ebuild,v 1.3 2012/04/13 19:10:13 ulm Exp $
-
-EAPI="2"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README Changelog CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.1.3.ebuild b/dev-php/xdebug/xdebug-2.1.3.ebuild
deleted file mode 100644
index e2a49ffa59f7..000000000000
--- a/dev-php/xdebug/xdebug-2.1.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.3.ebuild,v 1.2 2012/04/13 19:10:13 ulm Exp $
-
-EAPI="2"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README Changelog CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.1.4.ebuild b/dev-php/xdebug/xdebug-2.1.4.ebuild
deleted file mode 100644
index cd897c744e1f..000000000000
--- a/dev-php/xdebug/xdebug-2.1.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.1.4.ebuild,v 1.2 2012/04/13 19:10:13 ulm Exp $
-
-EAPI="2"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README Changelog CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.2.0_rc1.ebuild b/dev-php/xdebug/xdebug-2.2.0_rc1.ebuild
deleted file mode 100644
index b47f6c50abb3..000000000000
--- a/dev-php/xdebug/xdebug-2.2.0_rc1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0_rc1.ebuild,v 1.2 2012/04/13 19:10:13 ulm Exp $
-
-EAPI="4"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-USE_PHP="php5-3 php5-4"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild b/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild
deleted file mode 100644
index 4076a1af04d3..000000000000
--- a/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild,v 1.1 2012/05/02 10:02:51 olemarkus Exp $
-
-EAPI="4"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-
-USE_PHP="php5-3 php5-4"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r2
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-DEPEND="!dev-php/ZendOptimizer"
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-
-src_install() {
-	dodoc NEWS README CREDITS
-	php-ext-source-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
-	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
-	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
-	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
-
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}