Change default cache directory to /var/cache/pear. Actually set cache_dir=PEAR_CACHEDIRECTORY in /etc/pear.conf.

Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 26 insertions, 20 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/Manifest b/dev-php/PEAR-PEAR/Manifest
index 1f1224415dd1..ae1c7c754156 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pear.conf 255 RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 SHA1 98ee860807a6cc92b9f036da38163440b2994383 SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb
-MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
-RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 files/pear.conf 255
-SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb files/pear.conf 255
+AUX pear.conf 291 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 SHA1 47b350c2bf4b882b5981504ac6acfd7c708367e6 SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab
+MD5 d9fcfb5558f62993d1e38157bc7b2002 files/pear.conf 291
+RMD160 311e624d97640448754aa2f3e643aa53501f9c25 files/pear.conf 291
+SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab files/pear.conf 291
 DIST Archive_Tar-1.3.1.tgz 15102 RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac SHA1 b1eb763a5fba1289686cf1355f90f0fe9149fa6d SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6
 DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA1 706a9fb1724ef97ee333dadcda95cc7cc50c0c43 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
 DIST PEAR-1.4.11.tgz 283272 RMD160 bb047d4fb64691e2518ccdba0ced30eb6dd502cd SHA1 dbf2f31166efbe7cddc296f5a821806850772b27 SHA256 2ea2f7d0364db443fea39dc9bc96adebfce9fa45ffb035dbfc7b6a1cc5325600
 DIST PEAR-1.4.9.tgz 283443 RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 SHA1 cb74e281d7d30b7105ce2b4f152036b775e68cf1 SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1
 DIST XML_RPC-1.4.8.tgz 30376 RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 SHA1 5fd5e0f4dfc49374a97b2a9c36254427462a604e SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02
 DIST XML_RPC-1.5.0.tgz 31619 RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 SHA1 0c8de819abaebc37a77546b21499430147bfaf6b SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf
-EBUILD PEAR-PEAR-1.4.11.ebuild 4614 RMD160 a138f557878a7b873032772d9809c622f94e7449 SHA1 00254c08e841f07a2053f3216e16c28f10039ccf SHA256 bce7063ae5efc40db69d644ec88f455e074de614ade7f837ce4f1065d95d97c0
-MD5 92455783e407e206d94f3d2ee5108dcc PEAR-PEAR-1.4.11.ebuild 4614
-RMD160 a138f557878a7b873032772d9809c622f94e7449 PEAR-PEAR-1.4.11.ebuild 4614
-SHA256 bce7063ae5efc40db69d644ec88f455e074de614ade7f837ce4f1065d95d97c0 PEAR-PEAR-1.4.11.ebuild 4614
+EBUILD PEAR-PEAR-1.4.11.ebuild 4718 RMD160 c8368286ef41af45d29bbfc5c37151b1fa511e74 SHA1 1a638d2afc18638b5cadbc7a35be559cb374aa9b SHA256 76d8906f6c3b70900b44a5fe02ccc8d487914d3cb4ebc05870150a511c90d663
+MD5 b41c207608ae92232671f6dce6a27cd1 PEAR-PEAR-1.4.11.ebuild 4718
+RMD160 c8368286ef41af45d29bbfc5c37151b1fa511e74 PEAR-PEAR-1.4.11.ebuild 4718
+SHA256 76d8906f6c3b70900b44a5fe02ccc8d487914d3cb4ebc05870150a511c90d663 PEAR-PEAR-1.4.11.ebuild 4718
 EBUILD PEAR-PEAR-1.4.9-r1.ebuild 4609 RMD160 3af428df473bded74d078a6bd1e43566ca7c7beb SHA1 4ed3e53418126736cb9e58de4f7d242468bd29b7 SHA256 33c231a7b82697df8c48f52ece61e9a130895533e594c3c2d5179ec4aa4ce48b
 MD5 15480739b67be52025706999375b1555 PEAR-PEAR-1.4.9-r1.ebuild 4609
 RMD160 3af428df473bded74d078a6bd1e43566ca7c7beb PEAR-PEAR-1.4.9-r1.ebuild 4609
 SHA256 33c231a7b82697df8c48f52ece61e9a130895533e594c3c2d5179ec4aa4ce48b PEAR-PEAR-1.4.9-r1.ebuild 4609
-MISC ChangeLog 10654 RMD160 89d186dd100973a465a9d0de171b6d2e79d13eb1 SHA1 f017251851e20ce1d1b5740ddacb61fefca8fe76 SHA256 1cfe82506ca740be258ab1984fc5c8baae2adb52ae0016c4e97c50874d5f5b9c
-MD5 30342c1a9cf52ac722751a69b7b7f5d8 ChangeLog 10654
-RMD160 89d186dd100973a465a9d0de171b6d2e79d13eb1 ChangeLog 10654
-SHA256 1cfe82506ca740be258ab1984fc5c8baae2adb52ae0016c4e97c50874d5f5b9c ChangeLog 10654
+MISC ChangeLog 10876 RMD160 d677d9aa8f15eaaa401463e8b4ad68112b3ef127 SHA1 404f6b100157aa59d5e2487f597a9c5f208c1ada SHA256 b84298951757f9005e913feefc86ac6b905b396e19e60a459b9b19937a412212
+MD5 a12f0c0b1836894b01f51ab894f13843 ChangeLog 10876
+RMD160 d677d9aa8f15eaaa401463e8b4ad68112b3ef127 ChangeLog 10876
+SHA256 b84298951757f9005e913feefc86ac6b905b396e19e60a459b9b19937a412212 ChangeLog 10876
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -36,7 +36,7 @@ SHA256 a798498cc3fe1f27095f5f56a12e0987babb05f061fe698b1a8bb9f6336bef45 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFG1112ZWR0Jhg/EsRArJcAJ94KNOJzJIe1YY1GgvEZAva2ptJ7wCfSmI4
-CqHwbRQpDKfwnujZzBtsvIg=
-=qBWs
+iD8DBQFFG/gzaGfFFLhbXWkRAnWuAJwLrpSzC90y/ftoBt8nZnSYMBfGlgCfb93g
+Z1HKlLlNJLF/5i9Gi8ZE1vo=
+=EPE4
 -----END PGP SIGNATURE-----
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";}