Delete 1.3.6 and fix metadata.

Package-Manager: portage-2.0.53_rc7

6 files changed, 12 insertions, 139 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index f41f8c5864f5..3164f856ed2a 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.26 2005/11/19 19:49:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.27 2005/11/24 12:22:06 chtekk Exp $
+
+  24 Nov 2005; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  -PEAR-PEAR-1.3.6.ebuild:
+  Delete PEAR-PEAR-1.3.6, 1.3.6-r1 fixes some bugs and is available on all
+  arches 1.3.6 was, and more, so we have no reason to keep that around
+  anymore. Fix metadata.
 
   19 Nov 2005; Markus Rothe <corsair@gentoo.org> PEAR-PEAR-1.3.6.ebuild,
   PEAR-PEAR-1.3.6-r1.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 3a3807803e5c..fa8085250cc6 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,10 +1,8 @@
-MD5 84e2da7f36adb76067d3ad3fba470ff8 ChangeLog 3750
+MD5 e6394c04431110c6191721354f52d9c8 ChangeLog 4013
 MD5 922451a86366ac5c9ebbb0c244f10e81 PEAR-PEAR-1.3.5-r1.ebuild 3755
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 c8e303fce518612618614901bf12e1cf PEAR-PEAR-1.3.6.ebuild 4014
 MD5 64d14eabda32c0d81f691a1a3d6d69fa PEAR-PEAR-1.3.6-r1.ebuild 4404
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
-MD5 46061bca70e685875cd072b811107a83 files/digest-PEAR-PEAR-1.3.5-r1 248
-MD5 02fb36158a6f513f8c40d304ff37ecbe files/digest-PEAR-PEAR-1.3.6 250
+MD5 9d0bbdad27867a635364670c6e31b1af files/digest-PEAR-PEAR-1.3.5-r1 248
 MD5 1f5a11587884ea780abd05f353d576e4 files/digest-PEAR-PEAR-1.3.6-r1 250
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild
deleted file mode 100644
index 825becac52f0..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.8 2005/11/19 19:49:26 corsair Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.3.6"
-XML_RPC="1.4.1"
-
-[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR=/tmp/pear/cache
-
-DESCRIPTION="PEAR Base System"
-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="~amd64 ~arm ~ppc ~ppc64 ~s390 ~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.5-r1"
-
-PDEPEND=">=dev-php/PEAR-Archive_Tar-1.3.1-r1
-		>=dev-php/PEAR-Console_Getopt-1.2-r1
-		>=dev-php/PEAR-XML_RPC-1.4.1"
-
-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
-	require_php_with_use pear
-}
-
-src_install() {
-	require_php_cli
-
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
-		install_pear_without_bootstrap
-	else
-		bootstrap_pear
-		install_pear_after_bootstrap
-	fi
-
-	keepdir "${PEAR_CACHEDIR}"
-	fperms 755 "${PEAR_CACHEDIR}"
-}
-
-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
-}
-
-bootstrap_pear() {
-	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
-	cp ${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh ${WORKDIR}/PEAR/pear
-	sed -i "s:@php_bin@:${PHPCLI}: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
-}
-
-install_pear_after_bootstrap() {
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set doc_dir /usr/share/php/doc || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set data_dir /usr/share/php/data || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set php_dir /usr/share/php || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set test_dir /usr/share/php/test || die
-
-	mkdir ${D}/etc
-	cp ${HOME}/.pearrc ${D}/etc/pear.conf
-
-	prepare_pear_install
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php install --nodeps --installroot=${D} package.xml || die
-}
-
-install_pear_without_bootstrap() {
-	prepare_pear_install
-	PHP_PEAR_PHP_BIN=${PHPCLI} pear install --nodeps --installroot=${D} package.xml || die
-}
-
-prepare_pear_install() {
-	cp ${WORKDIR}/package.xml ${WORKDIR}/PEAR-${PEAR}
-	cd ${WORKDIR}/PEAR-${PEAR}
-}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
index eb21045a6b14..373627aae3a3 100644
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
@@ -1,4 +1,4 @@
 MD5 e2f6fda1baa507f319b46f5a09b57351 Archive_Tar-1.2.tgz 14792
 MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-MD5 c27e8cc85ff7cb86b119e933bd2eafc1 XML_RPC-1.3.1.tgz 25310
 MD5 8fead7fddb93f9b3cecd740823daafd2 PEAR-1.3.5.tgz 108423
+MD5 c27e8cc85ff7cb86b119e933bd2eafc1 XML_RPC-1.3.1.tgz 25310
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6
deleted file mode 100644
index b1ed583fc657..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-MD5 a646a20e20634442eda43c21ed3f08fd XML_RPC-1.4.1.tgz 26941
-MD5 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
index 40dbb4c4bbaf..fd3dbe39fa64 100644
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+	<herd>php</herd>
 </pkgmetadata>