summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2005-03-09 07:38:11 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2005-03-09 07:38:11 +0000
commitce27aca41aefc6df729ec81f7ff6430a8c80ce49 (patch)
tree5f5f2c6a3a83027e0e16ef4c07554d37da2e030d /dev-php/PEAR-PEAR
parentFixed LDFLAGS (diff)
downloadhistorical-ce27aca41aefc6df729ec81f7ff6430a8c80ce49.tar.gz
historical-ce27aca41aefc6df729ec81f7ff6430a8c80ce49.tar.bz2
historical-ce27aca41aefc6df729ec81f7ff6430a8c80ce49.zip
Change PEAR installation directory from /usr/lib/php to /usr/share/php.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-php/PEAR-PEAR')
-rw-r--r--dev-php/PEAR-PEAR/ChangeLog6
-rw-r--r--dev-php/PEAR-PEAR/Manifest10
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild16
3 files changed, 22 insertions, 10 deletions
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index b02013d0fd21..d414a83969e2 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-php/PEAR-PEAR
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.11 2005/03/09 06:28:03 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.12 2005/03/09 07:38:11 sebastian Exp $
+
+ 09 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
+ PEAR-PEAR-1.3.5-r1.ebuild:
+ Change PEAR installation directory from /usr/lib/php to /usr/share/php.
09 Mar 2005; Sebastian Bergmann <sebastian@gentoo.org>
PEAR-PEAR-1.3.5-r1.ebuild, PEAR-PEAR-1.3.5.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 7186788b8b52..04ffcbbb219f 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 bfd7ac876a6493e8d20e391798895815 PEAR-PEAR-1.3.5-r1.ebuild 2329
+MD5 5e10acf1886590bc48f877bc236df70a PEAR-PEAR-1.3.5-r1.ebuild 2908
MD5 8862ff265e3c2c311c3dbe41ba51c1d7 PEAR-PEAR-1.3.5.ebuild 471
-MD5 9e5687cc546f7bc1ce63b697e7c1239c ChangeLog 1674
+MD5 79687a7cdc4a1d8a38c168b270e3ea3a ChangeLog 1835
MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
MD5 e0b48c5489afe90eeb4199994b6b9587 files/digest-PEAR-PEAR-1.3.5-r1 248
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCLpd7aGfFFLhbXWkRAohAAKCRuljH4Tx/MCimOgZt8WgKq28h2gCfb0SL
-2D6+dDf9Yolnatb34dtp9bs=
-=Cd2B
+iD8DBQFCLqfyaGfFFLhbXWkRAtdCAJ9itFV42zLlHyxMDLM0l74KUogHlACeKY6c
+p/F3X8t3QpZSh7RkLQOVRYs=
+=wrwK
-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild
index 7b670db379d8..214e614e4a6a 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.5-r1.ebuild,v 1.3 2005/03/09 06:28:03 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild,v 1.4 2005/03/09 07:38:11 sebastian Exp $
ARCHIVE_TAR="1.2"
CONSOLE_GETOPT="1.2"
@@ -42,7 +42,7 @@ bootstrap_pear() {
cp ${WORKDIR}/PEAR-${PEAR}/scripts/pearcmd.php ${WORKDIR}/PEAR/pearcmd.php
cp ${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh ${WORKDIR}/PEAR/pear
sed -i 's:@php_bin@:/usr/bin/php:g' ${WORKDIR}/PEAR/pear || die
- sed -i 's:@php_dir@:/usr/lib/php:g' ${WORKDIR}/PEAR/pear || die
+ sed -i 's:@php_dir@:/usr/share/php:g' ${WORKDIR}/PEAR/pear || die
cp -r ${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive ${WORKDIR}/PEAR/Archive
@@ -52,14 +52,22 @@ bootstrap_pear() {
cp ${WORKDIR}/XML_RPC-${XML_RPC}/Server.php ${WORKDIR}/PEAR/XML/RPC/Server.php
cd ${WORKDIR}/PEAR
- insinto /usr/lib/php
+ insinto /usr/share/php
doins -r Archive Console OS PEAR XML *.php
dobin pear
}
install_pear_after_bootstrap() {
+ /usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set doc_dir /usr/share/php/doc || die
+ /usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set data_dir /usr/share/php/data || die
+ /usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set php_dir /usr/share/php || die
+ /usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php config-set test_dir /usr/share/php/test || die
+
+ mkdir ${D}/etc
+ cp $HOME/.pearrc ${D}/etc/pear.conf
+
prepare_pear_install
- /usr/bin/php -d include_path=".:${D}/usr/lib/php" ${D}/usr/lib/php/pearcmd.php install --nodeps -R ${D} package.xml || die
+ /usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php install --nodeps -R ${D} package.xml || die
}
install_pear_without_bootstrap() {