Remove old version.

(Portage version: 2.1.1_pre4)
 (Unsigned Manifest commit)

4 files changed, 5 insertions, 227 deletions

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 4894693efb00..b94a1c434e06 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX fix-packagingroot-1.4.6.patch 2549 RMD160 378c98abc5d23a9c3d258ad50212035378d83eb2 SHA1 ba513cc763d104c8243a04d1f91a849ba47e929f SHA256 3b7b1d00a811f743dc4632aa348e79418cca482727c3576607515fa248b7ba86
-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
 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 SHA1 b1eb763a5fba1289686cf1355f90f0fe9149fa6d SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6
 DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA1 706a9fb1724ef97ee333dadcda95cc7cc50c0c43 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
-DIST PEAR-1.4.6.tgz 277103 RMD160 8f1f94805897fec0e8914b5edfca10bb47cb44a3 SHA256 f04efbfb1e9a82656c1178154fcdcf894cd763811fb89f7c6df0eda6accea53f
 DIST PEAR-1.4.9.tgz 283443 RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 SHA1 cb74e281d7d30b7105ce2b4f152036b775e68cf1 SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1
-DIST XML_RPC-1.4.8.tgz 30376 RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02
+DIST XML_RPC-1.4.8.tgz 30376 RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 SHA1 5fd5e0f4dfc49374a97b2a9c36254427462a604e SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02
 DIST XML_RPC-1.5.0.tgz 31619 RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 SHA1 0c8de819abaebc37a77546b21499430147bfaf6b SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf
-EBUILD PEAR-PEAR-1.4.6-r1.ebuild 4693 RMD160 ea6c8b6d66299eb6ca52a2644ef971e4ffeeef54 SHA1 53fa9bb92802a06c86341a4ef2691ca357802e46 SHA256 21baf33a33d15ca5d36e94fc21fb84dd514865d89f1dc44960d499036b72c6f1
-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 4564 RMD160 a9317919f5efb0b3d14879997a4b965e556c4ed3 SHA1 33b94f05a8d3acfb19fc778143579c5cefb35491 SHA256 3eb2d8d2abdc1f35ea88fc037073d3c835c68c738fb8a533f80e86b20daa4ca5
 MD5 7e21b4654b5adde0c4aac3d8f986f68f PEAR-PEAR-1.4.9-r1.ebuild 4564
 RMD160 a9317919f5efb0b3d14879997a4b965e556c4ed3 PEAR-PEAR-1.4.9-r1.ebuild 4564
@@ -27,27 +15,17 @@ EBUILD PEAR-PEAR-1.4.9-r2.ebuild 4576 RMD160 05b8299b07aab117948039bdea1104ac760
 MD5 acc81329dcf8afba4252263b04cec5a3 PEAR-PEAR-1.4.9-r2.ebuild 4576
 RMD160 05b8299b07aab117948039bdea1104ac7607f36c PEAR-PEAR-1.4.9-r2.ebuild 4576
 SHA256 555b1dc7a51e61358101728fbe6861459526cd293508c6a7714d07cc2ad65904 PEAR-PEAR-1.4.9-r2.ebuild 4576
-MISC ChangeLog 9631 RMD160 38f7d8047397a0c9b13db6807260c6c4c2527533 SHA1 8e4e0949dda502b70fb3d258bab529845771343f SHA256 459e009e596795fb407c767117933bb1803b447a9b326771eddf827f1b2e7823
-MD5 d38b9b1bd2e1f210545e08240655190c ChangeLog 9631
-RMD160 38f7d8047397a0c9b13db6807260c6c4c2527533 ChangeLog 9631
-SHA256 459e009e596795fb407c767117933bb1803b447a9b326771eddf827f1b2e7823 ChangeLog 9631
+MISC ChangeLog 9770 RMD160 6603b57e03d8e65ff911dba81dcc7ecd64ff1299 SHA1 a77aaee7abe7d9f5b290dc3c712fc2f7119b604b SHA256 e23b62c72de8e6e451c3d67959ba81e43f1ffbdda6a20c24ed70519c89bb6026
+MD5 c35ae4af55d6b871f189ed9ba520d09f ChangeLog 9770
+RMD160 6603b57e03d8e65ff911dba81dcc7ecd64ff1299 ChangeLog 9770
+SHA256 e23b62c72de8e6e451c3d67959ba81e43f1ffbdda6a20c24ed70519c89bb6026 ChangeLog 9770
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-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
 MD5 0bbc6c3ba147abad0536342d55bd8d54 files/digest-PEAR-PEAR-1.4.9-r2 934
 RMD160 917e093879bfd3548aeb48dfb926e19034c7ff34 files/digest-PEAR-PEAR-1.4.9-r2 934
 SHA256 9071af871f9fdfa2233f067c97d999041453e0c2ce0ba97ab7b9f25d60388687 files/digest-PEAR-PEAR-1.4.9-r2 934
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEtI8caGfFFLhbXWkRAgHfAJ9YnvZHfIb7M14n3wKzk8B2ylz+AwCeMl09
-zrRlIvaf4K+sX61g5P6DQ1I=
-=y6bf
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
deleted file mode 100644
index 801f960f6db9..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,142 +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.6-r1.ebuild,v 1.16 2006/05/23 21:27:13 chtekk Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.4.6"
-XML_RPC="1.4.8"
-
-[ -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_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"
-
-	# fix packagingroot option
-	epatch "${FILESDIR}/fix-packagingroot-${PV}.patch"
-}
-
-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.6-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1
deleted file mode 100644
index 3d519c7c03d8..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1
+++ /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 0ef3f7a2b095c290e1915d99048b7644 PEAR-1.4.6.tgz 277103
-RMD160 8f1f94805897fec0e8914b5edfca10bb47cb44a3 PEAR-1.4.6.tgz 277103
-SHA256 f04efbfb1e9a82656c1178154fcdcf894cd763811fb89f7c6df0eda6accea53f PEAR-1.4.6.tgz 277103
-MD5 c2e94575bd14a4425de9e20976c65d43 XML_RPC-1.4.8.tgz 30376
-RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 XML_RPC-1.4.8.tgz 30376
-SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02 XML_RPC-1.4.8.tgz 30376
diff --git a/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch b/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch
deleted file mode 100644
index 5ed7f1cfbc5c..000000000000
--- a/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- PEAR-1.4.6/PEAR/Installer.php	2006/01/06 04:47:36	1.224
-+++ PEAR-1.4.6/PEAR/Installer.php	2006/01/16 12:24:23	1.225
-@@ -1329,7 +1329,11 @@
-             }
-             $dest = $ext['dest'];
-             $this->log(1, "Installing '$ext[file]'");
--            $copyto = $this->_prependPath($dest, $this->installroot);
-+            $packagingroot = '';
-+            if (isset($this->_options['packagingroot'])) {
-+                $packagingroot = $this->_options['packagingroot'];
-+            }
-+            $copyto = $this->_prependPath($dest, $packagingroot);
-             $copydir = dirname($copyto);
-             if (!@is_dir($copydir)) {
-                 if (!$this->mkDirHier($copydir)) {
---- PEAR-1.4.6/PEAR/Command/Install.php	2006/01/06 04:47:36	1.112
-+++ PEAR-1.4.6/PEAR/Command/Install.php	2006/01/16 12:24:23	1.113
-@@ -543,16 +543,19 @@
-                     $reg = &$this->config->getRegistry();
-                 }
-                 $pkg = &$reg->getPackage($param->getPackage(), $param->getChannel());
--                $pkg->setConfig($this->config);
--                if ($list = $pkg->listPostinstallScripts()) {
--                    $pn = $reg->parsedPackageNameToString(array('channel' =>
--                        $param->getChannel(), 'package' => $param->getPackage()), true);
--                    $extrainfo[] = $pn . ' has post-install scripts:';
--                    foreach ($list as $file) {
--                        $extrainfo[] = $file;
-+                // $pkg may be NULL if install is a 'fake' install via --packagingroot
-+                if (is_object($pkg)) {
-+                    $pkg->setConfig($this->config);
-+                    if ($list = $pkg->listPostinstallScripts()) {
-+                        $pn = $reg->parsedPackageNameToString(array('channel' =>
-+                           $param->getChannel(), 'package' => $param->getPackage()), true);
-+                        $extrainfo[] = $pn . ' has post-install scripts:';
-+                        foreach ($list as $file) {
-+                            $extrainfo[] = $file;
-+                        }
-+                        $extrainfo[] = 'Use "pear run-scripts ' . $pn . '" to run';
-+                        $extrainfo[] = 'DO NOT RUN SCRIPTS FROM UNTRUSTED SOURCES';
-                     }
--                    $extrainfo[] = 'Use "pear run-scripts ' . $pn . '" to run';
--                    $extrainfo[] = 'DO NOT RUN SCRIPTS FROM UNTRUSTED SOURCES';
-                 }
-             } else {
-                 return $this->raiseError("$command failed");