Fix bug 119358.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 16 insertions, 9 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index a4f115e6d295..694a111859ed 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.33 2006/01/15 06:28:00 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.34 2006/01/18 06:37:04 sebastian Exp $
+
+*PEAR-PEAR-1.3.6-r4 (18 Jan 2006)
+
+  18 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-PEAR-1.3.6-r3.ebuild, +PEAR-PEAR-1.3.6-r4.ebuild:
+  Fix bug 119358.
 
 *PEAR-PEAR-1.3.6-r3 (15 Jan 2006)
 
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 89bf7cc3fcbe..ce0cba668b0d 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7cde7cd103c20c1c7992e5b0b0966806 ChangeLog 4989
+MD5 6fb64eca4057036cf1fa9b679f638ac6 ChangeLog 5158
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
-MD5 20196e2a2238a9557b74e42587d07f5e PEAR-PEAR-1.3.6-r3.ebuild 3236
+MD5 e34fe006566b8a0df50fd430c7edd857 PEAR-PEAR-1.3.6-r4.ebuild 3303
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
-MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r3 250
+MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r4 250
 MD5 bde87daa639410ef7cbd1523234bcf1a files/pear.conf 255
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyerjaGfFFLhbXWkRAimwAJ9eqHXKSaaURxml9YDB8rrbEDjqMwCdGN9l
-GafT3h0mQFd/cRSDrFz3K2w=
-=KcI0
+iD8DBQFDzeIeaGfFFLhbXWkRAt84AJ9Nn//vjF6bgi/kT9MhcLOydMjF8wCeIvie
+U7S3fyH3xifovYUjr0yz8CA=
+=A5hX
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r3.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild
index 71b8e3c4f355..d4ffc790cbed 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r3.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.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-r3.ebuild,v 1.1 2006/01/15 06:25:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r4.ebuild,v 1.1 2006/01/18 06:37:04 sebastian Exp $
 
 inherit depend.php
 
@@ -66,10 +66,11 @@ src_install() {
 
 	# 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:@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"
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r3 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4
index 39d3b8a2e851..39d3b8a2e851 100644
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r3
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r4