summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2006-09-28 16:28:28 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2006-09-28 16:28:28 +0000
commit87bc1ec6d19613b4dc98a77526be2925f6892f6d (patch)
tree6eeb759a2b7be1d0bd80c433e9d02b9068c2ba19 /dev-php/PEAR-PEAR
parentBump gtk 2.10 series to 2.10.4. Remove older in that series. (diff)
downloadgentoo-2-87bc1ec6d19613b4dc98a77526be2925f6892f6d.tar.gz
gentoo-2-87bc1ec6d19613b4dc98a77526be2925f6892f6d.tar.bz2
gentoo-2-87bc1ec6d19613b4dc98a77526be2925f6892f6d.zip
Change default cache directory to /var/cache/pear. Actually set cache_dir=PEAR_CACHEDIRECTORY in /etc/pear.conf.
(Portage version: 2.1.2_pre1-r4)
Diffstat (limited to 'dev-php/PEAR-PEAR')
-rw-r--r--dev-php/PEAR-PEAR/ChangeLog7
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild7
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf2
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 392bf2dc6a31..7c8c8ca5f5cf 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,11 @@
# 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.75 2006/09/28 05:28:05 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.76 2006/09/28 16:28:28 sebastian Exp $
+
+ 28 Sep 2006; Sebastian Bergmann <sebastian@gentoo.org> files/pear.conf,
+ PEAR-PEAR-1.4.11.ebuild:
+ Change default cache directory to /var/cache/pear. Actually set
+ cache_dir=PEAR_CACHEDIRECTORY in /etc/pear.conf.
28 Sep 2006; Joshua Jackson <tsunam@gentoo.org> PEAR-PEAR-1.4.11.ebuild:
Stable x86; bug #149306
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild
index 9dd5127de850..4e55caad46fa 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.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.4.11.ebuild,v 1.3 2006/09/28 05:28:05 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild,v 1.4 2006/09/28 16:28:28 sebastian Exp $
inherit depend.php
@@ -9,7 +9,7 @@ CONSOLE_GETOPT="1.2"
PEAR="1.4.11"
XML_RPC="1.5.0"
-[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/tmp/pear/cache"
+[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/var/cache/pear"
DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, XML_RPC)."
HOMEPAGE="http://pear.php.net/"
@@ -107,7 +107,8 @@ src_install() {
insinto /etc
doins "${FILESDIR}/pear.conf"
- sed -e "s|s:SUBSTLEN:\"SUBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
+ sed -e "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
+ sed -e "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf"
keepdir "${PEAR_CACHEDIR}"
fperms 755 "${PEAR_CACHEDIR}"
diff --git a/dev-php/PEAR-PEAR/files/pear.conf b/dev-php/PEAR-PEAR/files/pear.conf
index cc3f8124ee14..5a3c5298db6e 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:SUBSTLEN:"SUBSTITUTEME";}
+a:7:{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:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";}