Pull old versions.

(Portage version: 2.1_pre9-r4)
 (Signed Manifest commit)

5 files changed, 32 insertions, 318 deletions

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 8dc1334d5199..37aedbed6fe4 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,27 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fbf0b26f36ec5d35f2923f789494f54e ChangeLog 8405
-RMD160 73894d5afc092a89ca71b75946b1275f7f7eda06 ChangeLog 8405
-SHA256 dd283d014024ce760a290233f5eba11d90ef1131d8f5a451c860989b3bc01360 ChangeLog 8405
+AUX fix-packagingroot-1.4.6.patch 2549 RMD160 378c98abc5d23a9c3d258ad50212035378d83eb2 SHA1 ba513cc763d104c8243a04d1f91a849ba47e929f SHA256 3b7b1d00a811f743dc4632aa348e79418cca482727c3576607515fa248b7ba86 size 2549
+MD5 4d00eb55859fa6e9e77a226693e0030b files/fix-packagingroot-1.4.6.patch 2549
+RMD160 378c98abc5d23a9c3d258ad50212035378d83eb2 files/fix-packagingroot-1.4.6.patch 2549
+SHA256 3b7b1d00a811f743dc4632aa348e79418cca482727c3576607515fa248b7ba86 files/fix-packagingroot-1.4.6.patch 2549
+AUX pear.conf 255 RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 SHA1 98ee860807a6cc92b9f036da38163440b2994383 SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb size 255
+MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
+RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 files/pear.conf 255
+SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb files/pear.conf 255
+DIST Archive_Tar-1.3.1.tgz 15102 RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6 size 15102
+DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c size 3370
+DIST PEAR-1.3.5.tgz 108423 RMD160 1b2bf10d3ebce9fc2d77f207ba44fc57772762ed SHA256 21694a91051deccf085c7d10e52faa9a22e4fb0b2b4d100f90c517024c75c31f size 108423
+DIST PEAR-1.3.6.tgz 106880 RMD160 75b8f9043321e081770f65c517325c20a80f4780 SHA256 1ef8d982ff590b49ec79f956ed37bf0309600a7a6b56de2e5a69243720d56746 size 106880
+DIST PEAR-1.4.6.tgz 277103 RMD160 8f1f94805897fec0e8914b5edfca10bb47cb44a3 SHA256 f04efbfb1e9a82656c1178154fcdcf894cd763811fb89f7c6df0eda6accea53f size 277103
+DIST PEAR-1.4.9.tgz 283443 RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1 size 283443
+DIST XML_RPC-1.4.5.tgz 29172 RMD160 43a0f5802dc32f4e61b347429f796c17f6efe90c SHA256 2ae6e28b3f2f0cef9233f1b528c6910891597bcde2b55a01a942d0ba98039cd8 size 29172
+DIST XML_RPC-1.4.8.tgz 30376 RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02 size 30376
+EBUILD PEAR-PEAR-1.3.5.ebuild 474 RMD160 97d324055a4283551b0bbfb0aafb4824ee46f331 SHA1 f8a9bf9299bd5325aefe1dd6418fd8f884de86f2 SHA256 8ebfc40270098378e9db3138012b05caae8e61104df7ed1d2965951f60b675a8 size 474
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
 RMD160 97d324055a4283551b0bbfb0aafb4824ee46f331 PEAR-PEAR-1.3.5.ebuild 474
 SHA256 8ebfc40270098378e9db3138012b05caae8e61104df7ed1d2965951f60b675a8 PEAR-PEAR-1.3.5.ebuild 474
+EBUILD PEAR-PEAR-1.3.6-r5.ebuild 3345 RMD160 fa9996af32a67eef968b256c61a602d04f8809a0 SHA1 f2327725f337b7794a6865efef9aefc359bd7ff4 SHA256 f3ad0273a9eb8156a9cf4781f08a480cba390ddc87f65dfeead38cc8b92b699a size 3345
 MD5 4b7b18104c089f704049b94934a96938 PEAR-PEAR-1.3.6-r5.ebuild 3345
 RMD160 fa9996af32a67eef968b256c61a602d04f8809a0 PEAR-PEAR-1.3.6-r5.ebuild 3345
 SHA256 f3ad0273a9eb8156a9cf4781f08a480cba390ddc87f65dfeead38cc8b92b699a PEAR-PEAR-1.3.6-r5.ebuild 3345
+EBUILD PEAR-PEAR-1.4.6-r1.ebuild 4693 RMD160 20ddaa66bc3f1aa35833d99d0ee89047315e0e49 SHA1 3dd2f7e499b496f2c8e7b2d1ff2ca200efb242a2 SHA256 c1adb49b966f68bc762c1afb9b385ab56a3bdaecbd814d65d955f9e98a99c52d size 4693
 MD5 c6a5db1265f7a0ac1635673f993cc99d PEAR-PEAR-1.4.6-r1.ebuild 4693
 RMD160 20ddaa66bc3f1aa35833d99d0ee89047315e0e49 PEAR-PEAR-1.4.6-r1.ebuild 4693
 SHA256 c1adb49b966f68bc762c1afb9b385ab56a3bdaecbd814d65d955f9e98a99c52d PEAR-PEAR-1.4.6-r1.ebuild 4693
-MD5 02c489d385fe3c0cb5832ebdbf00928b PEAR-PEAR-1.4.8.ebuild 4570
-RMD160 73d540620c84007f048b010413a6ca02e4f1de15 PEAR-PEAR-1.4.8.ebuild 4570
-SHA256 4d3f2408d1ab8caaae878d795769106d279a12de663f8644725a5571e0f16c9f PEAR-PEAR-1.4.8.ebuild 4570
+EBUILD PEAR-PEAR-1.4.9-r1.ebuild 4576 RMD160 0d849b08b543abf3cc48b0ecd3cbc5239f627640 SHA1 9f702b9ed5a8c7e14565ef82c1a0e550e8e20b8b SHA256 f39b815c8fecaf4fcd53a86f879225aa15d003e818c23e765d7eccd230b905a8 size 4576
 MD5 df39770daf8f7806c17540808cce0f36 PEAR-PEAR-1.4.9-r1.ebuild 4576
 RMD160 0d849b08b543abf3cc48b0ecd3cbc5239f627640 PEAR-PEAR-1.4.9-r1.ebuild 4576
 SHA256 f39b815c8fecaf4fcd53a86f879225aa15d003e818c23e765d7eccd230b905a8 PEAR-PEAR-1.4.9-r1.ebuild 4576
-MD5 7ee30cf31de291693edbf3d6dc09ae93 PEAR-PEAR-1.4.9.ebuild 4573
-RMD160 83115e6bdd0cb9b9845022e092dcb7a2281ddba7 PEAR-PEAR-1.4.9.ebuild 4573
-SHA256 0e84558060e8d84033a212843a79a1e36f0bd6af8ebd366d6e6786bbeecd78d4 PEAR-PEAR-1.4.9.ebuild 4573
+MISC ChangeLog 8536 RMD160 06712220506e87a3769f14df8a7f4bde43bda99b SHA1 25ce56945c797878f59c39fc94b2d167e231841d SHA256 17f8de04edfcc7d8623a71c0fabc4101369d803332dea6683c0ac3cab72f417b size 8536
+MD5 86593554a697d07fadac498d3263e9fa ChangeLog 8536
+RMD160 06712220506e87a3769f14df8a7f4bde43bda99b ChangeLog 8536
+SHA256 17f8de04edfcc7d8623a71c0fabc4101369d803332dea6683c0ac3cab72f417b ChangeLog 8536
+MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 size 157
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
+SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
 MD5 baf2fda9626d3d3d94f9ba0eaec84c3a files/digest-PEAR-PEAR-1.3.5 223
 RMD160 31a42d5ef02387d2174c47ca2098cb9b05b665aa files/digest-PEAR-PEAR-1.3.5 223
 SHA256 352553ee8a6cb06542769c386f73fe4e4b855bab05fe8bc45d41643d943d377a files/digest-PEAR-PEAR-1.3.5 223
@@ -31,28 +50,13 @@ SHA256 0b9e2ada5b018a08b78d9dc842a5ff2c34d2712150759bcc041bf771f2608f3e files/di
 MD5 ecc4e756a25d5d3285ad54186100142b files/digest-PEAR-PEAR-1.4.6-r1 934
 RMD160 748e63857775985c498fc8263e16fe12f95180e1 files/digest-PEAR-PEAR-1.4.6-r1 934
 SHA256 e00c78ce862889c70aeea2c065eae85a7c3adf566980c79eda6ff5b3c387d3d3 files/digest-PEAR-PEAR-1.4.6-r1 934
-MD5 4d112f2de000f4d05ec223e654d48d15 files/digest-PEAR-PEAR-1.4.8 934
-RMD160 fb1d177a5da9db8fdcb77a8b4698d29189d4dc33 files/digest-PEAR-PEAR-1.4.8 934
-SHA256 3706fc569ef09ae6b6e0167ad6778fe0439970802c632cf22bc1f8f95a3f0726 files/digest-PEAR-PEAR-1.4.8 934
-MD5 64219fe957e66dafbf9c55a0f7a070ee files/digest-PEAR-PEAR-1.4.9 934
-RMD160 d57ad95940ac8796fab1c406a7ac586af8bdfffd files/digest-PEAR-PEAR-1.4.9 934
-SHA256 87c076b13698c8eaa8954bc2bcda464adc3b5b0ee75e922d0046226d7055f696 files/digest-PEAR-PEAR-1.4.9 934
 MD5 60da169ef31f6e9258d1056b6e52ee7e files/digest-PEAR-PEAR-1.4.9-r1 934
 RMD160 72d0bd149d0e1b09ef7effebe839f56b4096e6d6 files/digest-PEAR-PEAR-1.4.9-r1 934
 SHA256 a798498cc3fe1f27095f5f56a12e0987babb05f061fe698b1a8bb9f6336bef45 files/digest-PEAR-PEAR-1.4.9-r1 934
-MD5 4d00eb55859fa6e9e77a226693e0030b files/fix-packagingroot-1.4.6.patch 2549
-RMD160 378c98abc5d23a9c3d258ad50212035378d83eb2 files/fix-packagingroot-1.4.6.patch 2549
-SHA256 3b7b1d00a811f743dc4632aa348e79418cca482727c3576607515fa248b7ba86 files/fix-packagingroot-1.4.6.patch 2549
-MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
-RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 files/pear.conf 255
-SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb files/pear.conf 255
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
-SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEQnF2aGfFFLhbXWkRArVHAJ4uR/NjAFnsBdYuMKpDMb/7uBzvkQCfRqwM
-x5eYvPHgImEugnryawmB9/I=
-=cWai
+iD8DBQFET8uqaGfFFLhbXWkRAvYdAJwJ3V3Wl7KcoUQN/MUK5LkJFAl8xwCeLHQI
+RAHtQ2yvifPcgRyTuCiV0AI=
+=C6Z2
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild
deleted file mode 100644
index cb9c4e4bb5dc..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2006 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.4.8.ebuild,v 1.4 2006/03/18 20:23:48 chtekk Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.4.8"
-XML_RPC="1.4.5"
-
-[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/tmp/pear/cache"
-
-DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, 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/XML_RPC-${XML_RPC}.tgz
-		http://pear.php.net/get/PEAR-${PEAR}.tgz"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-# we deliberately force people to remove their old PEAR installations,
-# and any package which may have put an old-style PEAR installation onto
-# the box
-
-DEPEND="dev-lang/php
-		!dev-php/php
-		!dev-php/php-cgi
-		!dev-php/mod_php
-		!<dev-php/PEAR-PEAR-1.3.6-r2
-		!dev-php/PEAR-Archive_Tar
-		!dev-php/PEAR-Console_Getopt
-		!dev-php/PEAR-XML_RPC"
-
-pkg_setup() {
-	# we call this here, to ensure that the eclass picks the right
-	# version of php for the job
-	require_php_cli
-
-	# 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_install() {
-	require_php_cli
-
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	mkdir -p "${WORKDIR}/PEAR/XML/RPC"
-
-	# Install PEAR Package.
-	cp -r "${WORKDIR}/PEAR-${PEAR}/OS" "${WORKDIR}/PEAR/"
-	cp -r "${WORKDIR}/PEAR-${PEAR}/PEAR" "${WORKDIR}/PEAR/"
-	cp "${WORKDIR}/PEAR-${PEAR}/PEAR.php" "${WORKDIR}/PEAR/PEAR.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/System.php" "${WORKDIR}/PEAR/System.php"
-
-	# Prepare /usr/bin/pear script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pearcmd.php" "${WORKDIR}/PEAR/pearcmd.php"
-	sed -i "s:@pear_version@:${PEAR}:g" "${WORKDIR}/PEAR/pearcmd.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh" "${WORKDIR}/PEAR/pear"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=16M:g" "${WORKDIR}/PEAR/pear" || die
-
-	# Prepare /usr/bin/peardev script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peardev.sh" "${WORKDIR}/PEAR/peardev"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/peardev" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/peardev" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/peardev" || die
-
-	# Prepare /usr/bin/pecl script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peclcmd.php" "${WORKDIR}/PEAR/peclcmd.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pecl.sh" "${WORKDIR}/PEAR/pecl"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pecl" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pecl" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pecl" || die
-
-	# Prepare PEAR/Dependency2.php.
-	sed -i "s:@PEAR-VER@:${PEAR}:g" "${WORKDIR}/PEAR/PEAR/Dependency2.php" || die
-
-	# Install Archive_Tar Package.
-	cp -r "${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive" "${WORKDIR}/PEAR/Archive"
-
-	# Install Console_Getopt Package.
-	cp -r "${WORKDIR}/Console_Getopt-${CONSOLE_GETOPT}/Console" "${WORKDIR}/PEAR/"
-
-	# Install XML_RPC Package.
-	cp "${WORKDIR}/XML_RPC-${XML_RPC}/RPC.php" "${WORKDIR}/PEAR/XML/RPC.php"
-	cp "${WORKDIR}/XML_RPC-${XML_RPC}/Server.php" "${WORKDIR}/PEAR/XML/RPC/Server.php"
-
-	# Finalize installation.
-	cd "${WORKDIR}/PEAR"
-	insinto /usr/share/php
-	doins -r Archive Console OS PEAR XML *.php
-	dobin pear peardev pecl
-
-	insinto /etc
-	doins "${FILESDIR}/pear.conf"
-	sed -e "s|s:SUBSTLEN:\"SUBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
-
-	keepdir "${PEAR_CACHEDIR}"
-	fperms 755 "${PEAR_CACHEDIR}"
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}/etc/pear.conf"
-}
-
-pkg_postinst() {
-	if has_version "<${PV}" ; then
-		ewarn "The location of the local PEAR repository has been changed"
-		ewarn "from /usr/lib/php to /usr/share/php."
-	fi
-
-	# Update PEAR 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"
-
-	for chan in ${pearchans} ; do
-		pear channel-discover ${chan}
-		pear channel-update ${chan}
-	done
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.9.ebuild
deleted file mode 100644
index 01335383bfa2..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.9.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2006 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.4.9.ebuild,v 1.1 2006/03/30 06:57:20 sebastian Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.4.9"
-XML_RPC="1.4.5"
-
-[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/tmp/pear/cache"
-
-DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, 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/XML_RPC-${XML_RPC}.tgz
-		http://pear.php.net/get/PEAR-${PEAR}.tgz"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-# we deliberately force people to remove their old PEAR installations,
-# and any package which may have put an old-style PEAR installation onto
-# the box
-
-DEPEND="dev-lang/php
-		!dev-php/php
-		!dev-php/php-cgi
-		!dev-php/mod_php
-		!<dev-php/PEAR-PEAR-1.3.6-r2
-		!dev-php/PEAR-Archive_Tar
-		!dev-php/PEAR-Console_Getopt
-		!dev-php/PEAR-XML_RPC"
-
-pkg_setup() {
-	# we call this here, to ensure that the eclass picks the right
-	# version of php for the job
-	require_php_cli
-
-	# 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_install() {
-	require_php_cli
-
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	mkdir -p "${WORKDIR}/PEAR/XML/RPC"
-
-	# Install PEAR Package.
-	cp -r "${WORKDIR}/PEAR-${PEAR}/OS" "${WORKDIR}/PEAR/"
-	cp -r "${WORKDIR}/PEAR-${PEAR}/PEAR" "${WORKDIR}/PEAR/"
-	cp "${WORKDIR}/PEAR-${PEAR}/PEAR.php" "${WORKDIR}/PEAR/PEAR.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/System.php" "${WORKDIR}/PEAR/System.php"
-
-	# Prepare /usr/bin/pear script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pearcmd.php" "${WORKDIR}/PEAR/pearcmd.php"
-	sed -i "s:@pear_version@:${PEAR}:g" "${WORKDIR}/PEAR/pearcmd.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh" "${WORKDIR}/PEAR/pear"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pear" || die
-	sed -i "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=16M:g" "${WORKDIR}/PEAR/pear" || die
-
-	# Prepare /usr/bin/peardev script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peardev.sh" "${WORKDIR}/PEAR/peardev"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/peardev" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/peardev" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/peardev" || die
-
-	# Prepare /usr/bin/pecl script.
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peclcmd.php" "${WORKDIR}/PEAR/peclcmd.php"
-	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pecl.sh" "${WORKDIR}/PEAR/pecl"
-	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pecl" || die
-	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pecl" || die
-	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pecl" || die
-
-	# Prepare PEAR/Dependency2.php.
-	sed -i "s:@PEAR-VER@:${PEAR}:g" "${WORKDIR}/PEAR/PEAR/Dependency2.php" || die
-
-	# Install Archive_Tar Package.
-	cp -r "${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive" "${WORKDIR}/PEAR/Archive"
-
-	# Install Console_Getopt Package.
-	cp -r "${WORKDIR}/Console_Getopt-${CONSOLE_GETOPT}/Console" "${WORKDIR}/PEAR/"
-
-	# Install XML_RPC Package.
-	cp "${WORKDIR}/XML_RPC-${XML_RPC}/RPC.php" "${WORKDIR}/PEAR/XML/RPC.php"
-	cp "${WORKDIR}/XML_RPC-${XML_RPC}/Server.php" "${WORKDIR}/PEAR/XML/RPC/Server.php"
-
-	# Finalize installation.
-	cd "${WORKDIR}/PEAR"
-	insinto /usr/share/php
-	doins -r Archive Console OS PEAR XML *.php
-	dobin pear peardev pecl
-
-	insinto /etc
-	doins "${FILESDIR}/pear.conf"
-	sed -e "s|s:SUBSTLEN:\"SUBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
-
-	keepdir "${PEAR_CACHEDIR}"
-	fperms 755 "${PEAR_CACHEDIR}"
-}
-
-pkg_preinst() {
-	rm -f "${ROOT}/etc/pear.conf"
-}
-
-pkg_postinst() {
-	if has_version "<${PV}" ; then
-		ewarn "The location of the local PEAR repository has been changed"
-		ewarn "from /usr/lib/php to /usr/share/php."
-	fi
-
-	# Update PEAR 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"
-
-	for chan in ${pearchans} ; do
-		pear channel-discover ${chan}
-		pear channel-update ${chan}
-	done
-}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8
deleted file mode 100644
index 47053314895c..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
-RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac Archive_Tar-1.3.1.tgz 15102
-SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6 Archive_Tar-1.3.1.tgz 15102
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 Console_Getopt-1.2.tgz 3370
-SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c Console_Getopt-1.2.tgz 3370
-MD5 4d29453e1926f11e05b7cfbf4ab085e7 PEAR-1.4.8.tgz 283109
-RMD160 f5a0c52fb27e735ee55e533aea96ab4765e6ee34 PEAR-1.4.8.tgz 283109
-SHA256 893c5239945555160322f1716bf86910c1a822a668c6b07a6397589416ab134e PEAR-1.4.8.tgz 283109
-MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
-RMD160 43a0f5802dc32f4e61b347429f796c17f6efe90c XML_RPC-1.4.5.tgz 29172
-SHA256 2ae6e28b3f2f0cef9233f1b528c6910891597bcde2b55a01a942d0ba98039cd8 XML_RPC-1.4.5.tgz 29172
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.9 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.9
deleted file mode 100644
index 21adbf369b23..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
-RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac Archive_Tar-1.3.1.tgz 15102
-SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6 Archive_Tar-1.3.1.tgz 15102
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 Console_Getopt-1.2.tgz 3370
-SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c Console_Getopt-1.2.tgz 3370
-MD5 52257e23987717c474a3da87f161a272 PEAR-1.4.9.tgz 283443
-RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 PEAR-1.4.9.tgz 283443
-SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1 PEAR-1.4.9.tgz 283443
-MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
-RMD160 43a0f5802dc32f4e61b347429f796c17f6efe90c XML_RPC-1.4.5.tgz 29172
-SHA256 2ae6e28b3f2f0cef9233f1b528c6910891597bcde2b55a01a942d0ba98039cd8 XML_RPC-1.4.5.tgz 29172