From: Luca Longinotti <chtekk@gentoo.org>
Date: Fri, 24 Nov 2006 15:50:38 +0000 (+0000)
Subject: Fix bug #156127, remove old version.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10888944a7d2be6a1279a4990ef8671e6db14f19;p=gentoo.git

Fix bug #156127, remove old version.
Package-Manager: portage-2.1.2_rc1-r7
---

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index c7f115a4f9ac..1ecb43a1ef45 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -5,21 +5,15 @@ SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab files/pe
 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.11.tgz 283272 RMD160 bb047d4fb64691e2518ccdba0ced30eb6dd502cd SHA1 dbf2f31166efbe7cddc296f5a821806850772b27 SHA256 2ea2f7d0364db443fea39dc9bc96adebfce9fa45ffb035dbfc7b6a1cc5325600
-DIST PEAR-1.4.9.tgz 283443 RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 SHA1 cb74e281d7d30b7105ce2b4f152036b775e68cf1 SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1
-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.11.ebuild 4725 RMD160 c32df8cd2c16fc71579300f5420673e05617ba4a SHA1 a9b7968b836ead1f32f9598a897c3bb6b5d83137 SHA256 ee9ad6e30a0f84e755a98a5694818366cb104fb252dce10af94bba884e720a16
-MD5 f651d0ed497852639bbf2d54e860cf96 PEAR-PEAR-1.4.11.ebuild 4725
-RMD160 c32df8cd2c16fc71579300f5420673e05617ba4a PEAR-PEAR-1.4.11.ebuild 4725
-SHA256 ee9ad6e30a0f84e755a98a5694818366cb104fb252dce10af94bba884e720a16 PEAR-PEAR-1.4.11.ebuild 4725
-EBUILD PEAR-PEAR-1.4.9-r1.ebuild 4609 RMD160 3af428df473bded74d078a6bd1e43566ca7c7beb SHA1 4ed3e53418126736cb9e58de4f7d242468bd29b7 SHA256 33c231a7b82697df8c48f52ece61e9a130895533e594c3c2d5179ec4aa4ce48b
-MD5 15480739b67be52025706999375b1555 PEAR-PEAR-1.4.9-r1.ebuild 4609
-RMD160 3af428df473bded74d078a6bd1e43566ca7c7beb PEAR-PEAR-1.4.9-r1.ebuild 4609
-SHA256 33c231a7b82697df8c48f52ece61e9a130895533e594c3c2d5179ec4aa4ce48b PEAR-PEAR-1.4.9-r1.ebuild 4609
-MISC ChangeLog 11610 RMD160 99fc5425e7d860222a358155c47a0ff5ccadf5ac SHA1 b01de1efa24db2d20d64bc891d141511635def36 SHA256 01ec9a0d70f33a507bfd6d17249b027f70fc59f53f89fa569c3f65f98c3198c2
-MD5 5ed0b21346d188a0fdf4c0d7c4188ab0 ChangeLog 11610
-RMD160 99fc5425e7d860222a358155c47a0ff5ccadf5ac ChangeLog 11610
-SHA256 01ec9a0d70f33a507bfd6d17249b027f70fc59f53f89fa569c3f65f98c3198c2 ChangeLog 11610
+EBUILD PEAR-PEAR-1.4.11.ebuild 4748 RMD160 ded6e47d9ee69f6d8219a0c31183fb35d5be1463 SHA1 4fcf0b468bfe95450ac2df1f906d0e0a32a0f421 SHA256 85304bfe7d2df56d1ce1b636ef08c17aa781ccea6e25f1496749312ad67d68a0
+MD5 d6221e9e20c662b6485356696d513a70 PEAR-PEAR-1.4.11.ebuild 4748
+RMD160 ded6e47d9ee69f6d8219a0c31183fb35d5be1463 PEAR-PEAR-1.4.11.ebuild 4748
+SHA256 85304bfe7d2df56d1ce1b636ef08c17aa781ccea6e25f1496749312ad67d68a0 PEAR-PEAR-1.4.11.ebuild 4748
+MISC ChangeLog 11756 RMD160 151f6e2d46ebe0dfbc7a268e941cc4454f35fec6 SHA1 9c9282ae24a5f7e87536e7d2acee70983e8d40aa SHA256 59f5aaaff1cbb1bc61c5decd992e3dd64bae323acf1f35e4f34fe586730d6294
+MD5 357e721f86bbf7775834b674287cc995 ChangeLog 11756
+RMD160 151f6e2d46ebe0dfbc7a268e941cc4454f35fec6 ChangeLog 11756
+SHA256 59f5aaaff1cbb1bc61c5decd992e3dd64bae323acf1f35e4f34fe586730d6294 ChangeLog 11756
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -27,6 +21,3 @@ SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata
 MD5 4ced704349b38271103540dd322ee073 files/digest-PEAR-PEAR-1.4.11 937
 RMD160 ba186287a1fbb622b5401be37853d001b9f58db5 files/digest-PEAR-PEAR-1.4.11 937
 SHA256 e2f7990987f8332ae69a8d052b79298c04f5cb0c8a154023956724f272278c48 files/digest-PEAR-PEAR-1.4.11 937
-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.4.9-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.9-r1.ebuild
deleted file mode 100644
index 3508e0451b42..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.9-r1.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-r1.ebuild,v 1.13 2006/09/27 12:47:49 sebastian Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.4.9"
-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_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/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"
-
-	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.9-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.9-r1
deleted file mode 100644
index 6a6a25a19a21..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.9-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 52257e23987717c474a3da87f161a272 PEAR-1.4.9.tgz 283443
-RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 PEAR-1.4.9.tgz 283443
-SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1 PEAR-1.4.9.tgz 283443
-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