Version bump, closes bug 111525.

(Portage version: 2.1_pre3-r1)

6 files changed, 219 insertions, 13 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 61f9eaf2261a..969811ca6a63 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2006/01/22 15:07:06 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.40 2006/01/23 14:37:33 sebastian Exp $
+
+*PEAR-PEAR-1.4.6 (23 Jan 2006)
+
+  23 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  +files/fix-packagingroot-1.4.6.patch, files/pear.conf,
+  +PEAR-PEAR-1.4.6.ebuild:
+  Version bump, closes bug 111525.
 
   22 Jan 2006; Simon Stelling <blubb@gentoo.org> PEAR-PEAR-1.3.6-r4.ebuild:
   stable on amd64
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 43c27e858ff6..9446870f2967 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f1d0d1183afc56825232859a14cf604c ChangeLog 5661
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
 MD5 1e68fd139f53a9074406b0cc6e8d8ea9 PEAR-PEAR-1.3.6-r4.ebuild 3294
+MD5 2d5540b7ab8caed1fa12f1a72d63f6d1 PEAR-PEAR-1.4.6.ebuild 4486
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
 MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r4 250
-MD5 bde87daa639410ef7cbd1523234bcf1a files/pear.conf 255
+MD5 7e3c22a5906af3932829887fb119a46c files/digest-PEAR-PEAR-1.4.6 250
+MD5 f823bd516793fb356b594cf2048bd7cd files/fix-packagingroot-1.4.6.patch 3413
+MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD05+oH6mNYUtVdIARAt3xAJ4x4YJC9v7fn7SbNLXs1gHAt7V3/QCffRnZ
-K+BhWqjyQj4p33/WXg7Ky74=
-=E9A+
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
new file mode 100644
index 000000000000..c2792eff3191
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
@@ -0,0 +1,138 @@
+# 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.4.6 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6
new file mode 100644
index 000000000000..3be5924329b3
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6
@@ -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 48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz 24447
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
new file mode 100644
index 000000000000..9abdb7c0705b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/fix-packagingroot-1.4.6.patch
@@ -0,0 +1,64 @@
+--- 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'];
+             $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
+@@ -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();
+                 }
+                 $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");
diff --git a/dev-php/PEAR-PEAR/files/pear.conf b/dev-php/PEAR-PEAR/files/pear.conf
index 97463ca47f2e..cc3f8124ee14 100644
--- a/dev-php/PEAR-PEAR/files/pear.conf
+++ b/dev-php/PEAR-PEAR/files/pear.conf
@@ -1,2 +1,2 @@
 #PEAR_Config 0.9
-a:6:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:SOBSTLEN:"SOBSTITUTEME";}
+a:6:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:SUBSTLEN:"SUBSTITUTEME";}