From cdd832cbc71401938c0c32fc2c5ae33190c3c653 Mon Sep 17 00:00:00 2001
From: Luca Longinotti <chtekk@gentoo.org>
Date: Mon, 23 Jan 2006 16:03:17 +0000
Subject: Fix various issues. (Portage version: 2.0.54)

---
 dev-php/PEAR-PEAR/ChangeLog                        |  12 +-
 dev-php/PEAR-PEAR/Manifest                         |  22 +---
 dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild        | 104 ---------------
 dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild        | 108 ++++++++++++++++
 dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild        | 142 +++++++++++++++++++++
 dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild           | 138 --------------------
 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4  |   4 -
 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5  |   4 +
 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6     |   4 -
 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1  |   4 +
 .../PEAR-PEAR/files/fix-packagingroot-1.4.6.patch  |  18 ---
 11 files changed, 275 insertions(+), 285 deletions(-)
 delete mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild
 create mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild
 create mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
 delete mode 100644 dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
 delete mode 100644 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4
 create mode 100644 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5
 delete mode 100644 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6
 create mode 100644 dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1

(limited to 'dev-php/PEAR-PEAR')

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 969811ca6a63..fdb85f365d32 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.40 2006/01/23 14:37:33 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.41 2006/01/23 16:03:17 chtekk Exp $
+
+*PEAR-PEAR-1.4.6-r1 (23 Jan 2006)
+*PEAR-PEAR-1.3.6-r5 (23 Jan 2006)
+
+  23 Jan 2006; Luca Longinotti <chtekk@gentoo.org>
+  -PEAR-PEAR-1.3.6-r4.ebuild, +PEAR-PEAR-1.3.6-r5.ebuild,
+  -PEAR-PEAR-1.4.6.ebuild, +PEAR-PEAR-1.4.6-r1.ebuild:
+  PEAR-1.3: fix sed line, add removal of stale pear.conf as it could cause
+  problems. PEAR-1.4: update XML_RPC to 1.4.5, add removal of stale pear.conf
+  as it could cause problems. Fix patch.
 
 *PEAR-PEAR-1.4.6 (23 Jan 2006)
 
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 3fb941496c71..d77ddbc7aed0 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b9373be76e0a60dfeb4b565b1bf74783 ChangeLog 5874
+MD5 c5b277bd9b51cc67c48b65f622e5530d ChangeLog 6302
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
-MD5 1e68fd139f53a9074406b0cc6e8d8ea9 PEAR-PEAR-1.3.6-r4.ebuild 3294
-MD5 04f0695ff79325e2f359d4ab746c4605 PEAR-PEAR-1.4.6.ebuild 4591
+MD5 76dbea8d424fc10ba00acee22818ba87 PEAR-PEAR-1.3.6-r5.ebuild 3344
+MD5 6e56c87438e37824d6b856fb191f4d8e PEAR-PEAR-1.4.6-r1.ebuild 4641
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
-MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r4 250
-MD5 7e3c22a5906af3932829887fb119a46c files/digest-PEAR-PEAR-1.4.6 250
-MD5 ddb679db3e186650a3dfc31b117ef1a0 files/fix-packagingroot-1.4.6.patch 3489
+MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r5 250
+MD5 8dce99141680abac08c7b328def8c375 files/digest-PEAR-PEAR-1.4.6-r1 250
+MD5 4d00eb55859fa6e9e77a226693e0030b files/fix-packagingroot-1.4.6.patch 2549
 MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1Oo6aGfFFLhbXWkRAsUxAJ47Mzt3X99dfCOH4bmpOH63zCNt5QCdECis
-y3DolEA6Vbu+Vhl/YnJVrP8=
-=mY3M
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild
deleted file mode 100644
index f67f801df070..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild
+++ /dev/null
@@ -1,104 +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-r4.ebuild,v 1.7 2006/01/22 15:07:06 blubb 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:SOBSTLEN:\"SOBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
-
-	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
-}
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
new file mode 100644
index 000000000000..c11b53ac43c6
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild
@@ -0,0 +1,108 @@
+# 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/PEAR-PEAR-1.4.6-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..861f73a9d935
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
@@ -0,0 +1,142 @@
+# 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.1 2006/01/23 16:03:17 chtekk Exp $
+
+inherit depend.php
+
+ARCHIVE_TAR="1.3.1"
+CONSOLE_GETOPT="1.2"
+PEAR="1.4.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_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"
+
+	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.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
deleted file mode 100644
index c2792eff3191..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
+++ /dev/null
@@ -1,138 +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.ebuild,v 1.1 2006/01/23 14:37:33 sebastian Exp $
-
-inherit depend.php
-
-ARCHIVE_TAR="1.3.1"
-CONSOLE_GETOPT="1.2"
-PEAR="1.4.6"
-XML_RPC="1.4.4"
-
-[ -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_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_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"
-
-	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.3.6-r4 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4
deleted file mode 100644
index 39d3b8a2e851..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-MD5 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
-MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
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
new file mode 100644
index 000000000000..39d3b8a2e851
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r5
@@ -0,0 +1,4 @@
+MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
+MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
+MD5 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
+MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6
deleted file mode 100644
index 3be5924329b3..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.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 0ef3f7a2b095c290e1915d99048b7644 PEAR-1.4.6.tgz 277103
-MD5 48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz 24447
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
new file mode 100644
index 000000000000..d5af9f1dae0e
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1
@@ -0,0 +1,4 @@
+MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
+MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
+MD5 0ef3f7a2b095c290e1915d99048b7644 PEAR-1.4.6.tgz 277103
+MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
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
index 9abdb7c0705b..5ed7f1cfbc5c 100644
--- a/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch
+++ b/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch
@@ -1,14 +1,5 @@
 --- 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
-@@ -18,7 +18,7 @@
-  * @author     Greg Beaver <cellog@php.net>
-  * @copyright  1997-2006 The PHP Group
-  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
-- * @version    CVS: $Id: fix-packagingroot-1.4.6.patch,v 1.1 2006/01/23 14:37:33 sebastian Exp $
-+ * @version    CVS: $Id: fix-packagingroot-1.4.6.patch,v 1.1 2006/01/23 14:37:33 sebastian Exp $
-  * @link       http://pear.php.net/package/PEAR
-  * @since      File available since Release 0.1
-  */
 @@ -1329,7 +1329,11 @@
              }
              $dest = $ext['dest'];
@@ -24,15 +15,6 @@
                  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
-@@ -16,7 +16,7 @@
-  * @author     Greg Beaver <cellog@php.net>
-  * @copyright  1997-2006 The PHP Group
-  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
-- * @version    CVS: $Id: fix-packagingroot-1.4.6.patch,v 1.1 2006/01/23 14:37:33 sebastian Exp $
-+ * @version    CVS: $Id: fix-packagingroot-1.4.6.patch,v 1.1 2006/01/23 14:37:33 sebastian Exp $
-  * @link       http://pear.php.net/package/PEAR
-  * @since      File available since Release 0.1
-  */
 @@ -543,16 +543,19 @@
                      $reg = &$this->config->getRegistry();
                  }
-- 
cgit v1.2.3-65-gdbad