Spring cleanup.

Package-Manager: portage-2.1_rc1-r3

3 files changed, 11 insertions, 140 deletions

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index bb58f88dfb94..22caa5e61972 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -8,37 +8,28 @@ 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.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.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
+EBUILD PEAR-PEAR-1.4.6-r1.ebuild 4693 RMD160 ea6c8b6d66299eb6ca52a2644ef971e4ffeeef54 SHA1 53fa9bb92802a06c86341a4ef2691ca357802e46 SHA256 21baf33a33d15ca5d36e94fc21fb84dd514865d89f1dc44960d499036b72c6f1 size 4693
+MD5 ba966cf1cd14722c890528f82848f8e5 PEAR-PEAR-1.4.6-r1.ebuild 4693
+RMD160 ea6c8b6d66299eb6ca52a2644ef971e4ffeeef54 PEAR-PEAR-1.4.6-r1.ebuild 4693
+SHA256 21baf33a33d15ca5d36e94fc21fb84dd514865d89f1dc44960d499036b72c6f1 PEAR-PEAR-1.4.6-r1.ebuild 4693
 EBUILD PEAR-PEAR-1.4.9-r1.ebuild 4566 RMD160 da1f04a3eec4a5fb6ca6d9dba359da4ccb548535 SHA1 6cfe0eb26570270798d51ff6bf7b5f90aa70a121 SHA256 25ddc20776e9557664d1c11e7dcc3e656c1cd1899b5b85b522d4a4ff8168d59f size 4566
 MD5 9a1bd52137b3588141d13d8f223c32ec PEAR-PEAR-1.4.9-r1.ebuild 4566
 RMD160 da1f04a3eec4a5fb6ca6d9dba359da4ccb548535 PEAR-PEAR-1.4.9-r1.ebuild 4566
 SHA256 25ddc20776e9557664d1c11e7dcc3e656c1cd1899b5b85b522d4a4ff8168d59f PEAR-PEAR-1.4.9-r1.ebuild 4566
-MISC ChangeLog 9185 RMD160 2e248d8a801aa31a323b0002aae96c244ea50286 SHA1 e1d890177b76f2016d681361c848b74cf540643c SHA256 ef9255966553c35322f1d9b598dbcc1c935cb490a7ef267b5f60cd013d09b74d size 9185
-MD5 89661fbf51d6250e94bab0f16e016149 ChangeLog 9185
-RMD160 2e248d8a801aa31a323b0002aae96c244ea50286 ChangeLog 9185
-SHA256 ef9255966553c35322f1d9b598dbcc1c935cb490a7ef267b5f60cd013d09b74d ChangeLog 9185
+MISC ChangeLog 9375 RMD160 579a51f25535dcd9d2457fcea1bf1d43a72d204f SHA1 157c97cc3eae9722f71994a5a3c3454d723fe3c1 SHA256 f443a0bf3afa09273a590147b8d5671a2c0b1ab54ee0d35a289075b90f0955b7 size 9375
+MD5 0a3d3f4dcfa58e292b833d993349f6b4 ChangeLog 9375
+RMD160 579a51f25535dcd9d2457fcea1bf1d43a72d204f ChangeLog 9375
+SHA256 f443a0bf3afa09273a590147b8d5671a2c0b1ab54ee0d35a289075b90f0955b7 ChangeLog 9375
 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 49dd3dbf7c6be6ae4df24d7fa91d2ea5 files/digest-PEAR-PEAR-1.3.6-r5 934
-RMD160 60f24a19996e64ac9b3e5a06da4f86a974cc48fe files/digest-PEAR-PEAR-1.3.6-r5 934
-SHA256 0b9e2ada5b018a08b78d9dc842a5ff2c34d2712150759bcc041bf771f2608f3e files/digest-PEAR-PEAR-1.3.6-r5 934
-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 c0c054e31a459ee6317b8098f04d9a9c files/digest-PEAR-PEAR-1.4.6-r1 934
+RMD160 a02d36ce00dffac5b5df9cdd26b83321051b6f63 files/digest-PEAR-PEAR-1.4.6-r1 934
+SHA256 17a06494ae7b30bfba3701d3ec4dafc3ccc1795687c1d29696e364cd7fc9df13 files/digest-PEAR-PEAR-1.4.6-r1 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
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild
deleted file mode 100644
index c11b53ac43c6..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild
+++ /dev/null
@@ -1,108 +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.3.6-r5.ebuild,v 1.1 2006/01/23 16:03:17 chtekk Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.3.6"
-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 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
-
-	# 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
-
-	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
-}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5
deleted file mode 100644
index e93bcd9a8b5a..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5
+++ /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 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
-RMD160 75b8f9043321e081770f65c517325c20a80f4780 PEAR-1.3.6.tgz 106880
-SHA256 1ef8d982ff590b49ec79f956ed37bf0309600a7a6b56de2e5a69243720d56746 PEAR-1.3.6.tgz 106880
-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