Fix various issues.

(Portage version: 2.0.54)

7 files changed, 30 insertions, 40 deletions

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-r5.ebuild
index f67f801df070..c11b53ac43c6 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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
 
@@ -90,12 +90,16 @@ src_install() {
 
 	insinto /etc
 	doins "${FILESDIR}/pear.conf"
-	sed -e "s|s:SOBSTLEN:\"SOBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/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"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
index c2792eff3191..861f73a9d935 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.6-r1.ebuild
@@ -1,13 +1,13 @@
 # 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 $
+# $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.4"
+XML_RPC="1.4.5"
 
 [ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/tmp/pear/cache"
 
@@ -122,6 +122,10 @@ src_install() {
 	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"
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-r5
index 39d3b8a2e851..39d3b8a2e851 100644
--- 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-r5
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-r1
index 3be5924329b3..d5af9f1dae0e 100644
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.6-r1
@@ -1,4 +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
+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();
                  }