Removed older versions affected by security bug #356893

Package-Manager: portage-2.1.9.25/cvs/Linux i686

7 files changed, 8 insertions, 556 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 560b02ef4e44..f34595454c21 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.134 2011/03/05 12:09:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.135 2011/03/06 10:59:47 olemarkus Exp $
+
+  06 Mar 2011; Ole Markus With <olemarkus@gentoo.org>
+  -PEAR-PEAR-1.6.2-r1.ebuild, -PEAR-PEAR-1.9.0.ebuild,
+  -PEAR-PEAR-1.9.1-r1.ebuild, -PEAR-PEAR-1.9.1-r2.ebuild,
+  -PEAR-PEAR-1.9.1-r3.ebuild:
+  Removed older versions affected by security bug #356893
 
   05 Mar 2011; Raúl Porcel <armin76@gentoo.org> PEAR-PEAR-1.9.2.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #356893
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 8edc8e5e0cfc..09ef01ddecda 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -2,19 +2,7 @@ AUX 1.6.2-accept-encoding-bug_12116.patch 603 RMD160 d19b8be3352e479c7316f259cfb
 AUX pear.conf 291 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 SHA1 47b350c2bf4b882b5981504ac6acfd7c708367e6 SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab
 AUX pear.conf-r1 379 RMD160 df2595353d3a0ee5474dff41a445ebd2e642a5ec SHA1 a9971714efca2a84ef54b5f7c71f3adbbe3d2930 SHA256 43e78396b7b91cf16a3d33d36c19096c9e7281b7f771c379f383a16c7756c490
 AUX pear.conf-r2 379 RMD160 adaf8e0edd442e7a612754af1f594d8e9e776023 SHA1 098fd2a554643380bf09cc36e03d556459e00eeb SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa
-DIST Archive_Tar-1.3.2.tgz 17150 RMD160 cec105d1cdefd502f209c24c217645cec723d7a2 SHA1 40a16c6fe6cee12d9fd87d487785db2949ffa9ff SHA256 952820c055a770a6d1ecdff487b3de0ff0617a1baca084dac443a6d5f7cde53c
-DIST Console_Getopt-1.2.3.tgz 4011 RMD160 d1624dbcb223395ded9e46285f896d6f5bb5ca74 SHA1 2f4ea028f478123164c3f6588f8a505dc35915df SHA256 1985b1434c13d5e619643c3712e4144d39f66f6fed61994765e6a0f1623680d8
-DIST PEAR-1.6.2.tgz 297794 RMD160 db3c37446c8e06149d7197ebdd3e9d720dd162ce SHA1 99900fdad3f7b0078746a021d17749f6bdeec03c SHA256 5f502e44314f4ba28467e21b28c51207265a3d282b33dbc664edbcddf41dcc8e
-DIST PEAR-1.9.0.tgz 291634 RMD160 cfac92b7569676783b44a38309f8a156f49a35e8 SHA1 a268b9af85a3daad047c77947838932f2737e6aa SHA256 3b9c3fab4ccf9657613f1c437872d8a33fafbd432f4a5cd6d6790553662bad50
-DIST PEAR-1.9.1.tgz 293587 RMD160 159cca1d7588896aa329c4c5aa7ce1b8b494485c SHA1 dec038a23f7062a1ba7846e116d5d3d3b737d229 SHA256 86a21c9b01ca1c7e7091d646b476aa8da63a43e97cc8fc390c6a51bbc0b2d3a0
 DIST PEAR-1.9.2.tgz 295120 RMD160 f12b6a0a4600b0b227a88687c124b515621ca803 SHA1 1dda2c7c1c87532f6a45a54b98521a2e9efa02b3 SHA256 7f1446f3d92b4e19d3d4ca38dff6f50b66882b9b11a901b069e89a60ff4aff82
-DIST Structures_Graph-1.0.2.tgz 30947 RMD160 8eb53f6da109b90bab5d8101e99183a1ae116404 SHA1 300aa0a2effb0b39c4fa8a63a834748ae99c2855 SHA256 d30e72fcb888d17d01d211dd0cdc8bdde8c87554fc4d7de438a4cf0b490a8697
-DIST XML_RPC-1.5.1.tgz 32215 RMD160 6e8b9f4698285609d9c9d4450c59c16083607ee8 SHA1 d28fd6d3139aa247d22428ec6b50e20a3cdaa4b4 SHA256 a5b517eef799df148d6c85ab19e188715a22c069f4507dcb792e5efb7d0f117e
-EBUILD PEAR-PEAR-1.6.2-r1.ebuild 4372 RMD160 7e49549a31cf238a85a4e0f11db5bc693a313829 SHA1 9412d7bbe4581b0072cca2f26c2e157dc8abf85d SHA256 1d2c70184a568377c1f6838235c87deb01962bb25f7dbf409d9b49540d0fa4e7
-EBUILD PEAR-PEAR-1.9.0.ebuild 3074 RMD160 f74ef67cb985e3cf99468e2d4f4b3cc701d58afd SHA1 8649c6ea2779a2afaa1ee3aea8167d83b4852ce6 SHA256 0e510db7612f646ad9fd824cf14b63b399f4c626e25fd1ef20e19b43ec8e1571
-EBUILD PEAR-PEAR-1.9.1-r1.ebuild 2965 RMD160 a776f62b284b9d9860d89198c977e2a515e6310c SHA1 0be2753e1d6dcdf7a31c4938c9b41354e1e12fb2 SHA256 3ace8c68b1ee0c9e8180808ccf2938bd73af524f960017dae8fd98f1b64ef5f1
-EBUILD PEAR-PEAR-1.9.1-r2.ebuild 3652 RMD160 0c5fe36b3e793997fcd8c19589fa9d444348da82 SHA1 09cd06b7079955b085fa858533cb8d1798ef4154 SHA256 3e222f2cb4b9b98897a68af629112375c83c4d7e1aabea458e269610de146cc5
-EBUILD PEAR-PEAR-1.9.1-r3.ebuild 3648 RMD160 21d8d192ec5d23e673dbbfca78357176dbb00886 SHA1 0c4c76a20cff31c69ef0603e45e08d23a0b66a19 SHA256 44e3f1f43fb45748ec7e80f7e59dfdab622c84822cddb9848b48c8b8e0855886
 EBUILD PEAR-PEAR-1.9.2.ebuild 3636 RMD160 f88015f6e95a7250bef04756f69be35a5c1d7197 SHA1 d40a6dc8ded82e540d5cc4482ae1156b7c52b9a9 SHA256 2d565affd0b52d3d85b9914156fe04d49951c618a602b594061ae9eba68b7398
-MISC ChangeLog 18863 RMD160 97ceeff750f168802577b7801fcd0745c869fb58 SHA1 a9e19df03d8d882645020607d976aafc9f901ea7 SHA256 ba4fe94f3e335986dbb82aaad91370029e31033b56dbe674d253b0622135294a
+MISC ChangeLog 19121 RMD160 917f9c5e5f6258d760de56ed1d1796f60480617b SHA1 b102d6a664386d50908158ec753f56b5a3431325 SHA256 d5fe511b15ecc4502b534c16ade9a427fc96a132f7e6c71b8cfeb0bbf9806ea8
 MISC metadata.xml 248 RMD160 a52d2dcf8ab8231c5e8332d5022d921fb8b6754e SHA1 84c45cabf8e0959e44317f8db4449c0056c7959e SHA256 a98d66f97c0d4f6f57c10b1b2038cfb7c5a76a58ff187ddff241024dfa8dee51
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild
deleted file mode 100644
index 60d5260a069d..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild,v 1.10 2009/09/23 02:41:50 beandog Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.2"
-CONSOLE_GETOPT="1.2.3"
-STRUCTURES_GRAPH="1.0.2"
-XML_RPC="1.5.1"
-PEAR="${PV}"
-
-[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-
-DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, Structures_Graph, XML_RPC)."
-HOMEPAGE="http://pear.php.net/"
-SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
-		http://pear.php.net/get/Console_Getopt-${CONSOLE_GETOPT}.tgz
-		http://pear.php.net/get/Structures_Graph-${STRUCTURES_GRAPH}.tgz
-		http://pear.php.net/get/XML_RPC-${XML_RPC}.tgz
-		http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="LGPL-2.1 PHP-2.02 PHP-3 PHP-3.01 MIT"
-SLOT="0"
-IUSE=""
-
-# we depend on a recent sandbox version to mitigate problems users
-# have been experiencing
-DEPEND="dev-lang/php
-	>=sys-apps/sandbox-1.2.17
-	!dev-php/pear
-	!dev-php/PEAR-Archive_Tar
-	!dev-php/PEAR-Console_Getopt
-	!dev-php/PEAR-Structures_Graph
-	!dev-php/PEAR-XML_RPC"
-RDEPEND="dev-lang/php"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	has_php
-
-	# we check that PHP was compiled with the correct USE flags
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use cli pcre expat zlib
-	else
-		require_php_with_use cli pcre xml zlib
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"/PEAR-${PV}
-	epatch "${FILESDIR}"/${PV}-accept-encoding-bug_12116.patch # PEAR bug #12116
-}
-
-src_install() {
-	require_php_cli
-
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	mkdir -p PEAR/XML/RPC
-
-	# Install PEAR Package.
-	cp -r PEAR-${PEAR}/OS PEAR/
-	cp -r PEAR-${PEAR}/PEAR PEAR/
-	cp PEAR-${PEAR}/PEAR.php PEAR/PEAR.php
-	cp PEAR-${PEAR}/System.php PEAR/System.php
-
-	# Prepare /usr/bin/pear script.
-	cp PEAR-${PEAR}/scripts/pearcmd.php PEAR/pearcmd.php
-	sed -i "s:@pear_version@:${PEAR}:g" PEAR/pearcmd.php || die "sed failed"
-	cp PEAR-${PEAR}/scripts/pear.sh PEAR/pear
-	sed -i -e "s:@php_bin@:${PHPCLI}:g" \
-		-e "s:@bin_dir@:/usr/bin:g" \
-		-e "s:@php_dir@:/usr/share/php:g" \
-		-e "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" PEAR/pear || die "sed failed"
-
-	# Prepare /usr/bin/peardev script.
-	cp PEAR-${PEAR}/scripts/peardev.sh PEAR/peardev
-	sed -i -e "s:@php_bin@:${PHPCLI}:g" \
-		-e "s:@bin_dir@:/usr/bin:g" \
-		-e "s:@php_dir@:/usr/share/php:g" PEAR/peardev || die "sed failed"
-
-	# Prepare /usr/bin/pecl script.
-	cp PEAR-${PEAR}/scripts/peclcmd.php PEAR/peclcmd.php
-	sed -i "s:@pear_version@:${PEAR}:g" PEAR/peclcmd.php || die "sed failed"
-	cp PEAR-${PEAR}/scripts/pecl.sh PEAR/pecl
-	sed -i -e "s:@php_bin@:${PHPCLI}:g" \
-		-e "s:@bin_dir@:/usr/bin:g" \
-		-e "s:@php_dir@:/usr/share/php:g" PEAR/pecl || die "sed failed"
-
-	# Prepare PEAR/Dependency2.php.
-	sed -i "s:@PEAR-VER@:${PEAR}:g" PEAR/PEAR/Dependency2.php || die "sed failed"
-
-	# Install Archive_Tar Package.
-	cp -r Archive_Tar-${ARCHIVE_TAR}/Archive PEAR/
-
-	# Install Console_Getopt Package.
-	cp -r Console_Getopt-${CONSOLE_GETOPT}/Console PEAR/
-
-	# Install Structures_Graph Package.
-	cp -r Structures_Graph-${STRUCTURES_GRAPH}/Structures PEAR/
-
-	# Install XML_RPC Package.
-	cp XML_RPC-${XML_RPC}/RPC.php PEAR/XML/RPC.php
-	cp XML_RPC-${XML_RPC}/Server.php PEAR/XML/RPC/Server.php
-
-	# Finalize installation.
-	cd PEAR
-	insinto /usr/share/php
-	doins -r Archive Console OS PEAR Structures XML *.php
-	dobin pear peardev pecl
-
-	insinto /etc
-	doins "${FILESDIR}/pear.conf"
-	sed -i -e "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
-		-e "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" "${D}/etc/pear.conf" || die "sed failed"
-
-	keepdir "${PEAR_CACHEDIR}"
-	fperms 755 "${PEAR_CACHEDIR}"
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}/etc/pear.conf"
-}
-
-pkg_postinst() {
-	pear clear-cache
-
-	# Update PEAR/PECL channels as needed, add new ones to the list if needed
-	pearchans="pear.php.net pecl.php.net components.ez.no pear.phpdb.org pear.phing.info pear.symfony-project.com pear.phpunit.de pear.php-baustelle.de pear.zeronotice.org pear.phpontrax.com pear.agavi.org"
-
-	for chan in ${pearchans} ; do
-		pear channel-discover ${chan}
-		pear channel-update ${chan}
-	done
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.0.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.0.ebuild
deleted file mode 100644
index 8201863aff48..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.0.ebuild,v 1.7 2010/10/01 01:01:28 ranger Exp $
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	# we check that PHP was compiled with the correct USE flags
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		require_php_with_use cli pcre expat zlib
-	else
-		require_php_with_use cli pcre xml zlib
-	fi
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@php_bin@:${PHPCLI}:g" /usr/bin/${i}
-		dosed "s:@bin_dir@:/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r1 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR}"
-	keepdir "${PEAR_CACHEDIR}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR}"
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r1.ebuild
deleted file mode 100644
index 9438ac3fc98c..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r1.ebuild,v 1.4 2010/11/05 04:18:21 jer Exp $
-
-EAPI="2"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-		|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@php_bin@:${PHPCLI}:g" /usr/bin/${i}
-		dosed "s:@bin_dir@:/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r1 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR}"
-	keepdir "${PEAR_CACHEDIR}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR}"
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild
deleted file mode 100644
index 94df0fe30080..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild,v 1.1 2010/10/23 06:57:50 olemarkus Exp $
-
-EAPI="3"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:${EPREFIX}/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r1 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	# Change the paths for eprefix!
-	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
-	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
-	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
-	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
-	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild
deleted file mode 100644
index 07da6b610b14..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild
+++ /dev/null
@@ -1,103 +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/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild,v 1.6 2011/01/10 18:07:33 xarthisius Exp $
-
-EAPI="3"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:${EPREFIX}/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	# Change the paths for eprefix!
-	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
-	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
-	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
-	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
-	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}/etc/pear.conf"
-}