summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2005-07-04 05:29:52 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2005-07-04 05:29:52 +0000
commitc2b91308f03ea9ca154f83192d336054e91f2237 (patch)
tree5d1c9a16c8c1402b4ac58d3ed3b94f08fc98cbb2 /dev-php/PEAR-PEAR
parentMoved net-misc/duplicity to app-backup/duplicity (diff)
downloadgentoo-2-c2b91308f03ea9ca154f83192d336054e91f2237.tar.gz
gentoo-2-c2b91308f03ea9ca154f83192d336054e91f2237.tar.bz2
gentoo-2-c2b91308f03ea9ca154f83192d336054e91f2237.zip
Update PEAR-XML_RPC dependency. Fix pkg_preinst().
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-php/PEAR-PEAR')
-rw-r--r--dev-php/PEAR-PEAR/ChangeLog6
-rw-r--r--dev-php/PEAR-PEAR/Manifest6
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild15
-rw-r--r--dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r12
4 files changed, 18 insertions, 11 deletions
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index d5bcb1c0e97c..a91e89fa71f7 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.16 2005/03/27 14:56:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.17 2005/07/04 05:29:52 sebastian Exp $
+
+ 04 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+ PEAR-PEAR-1.3.5-r1.ebuild:
+ Update PEAR-XML_RPC dependency. Fix pkg_preinst().
27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> PEAR-PEAR-1.3.5.ebuild:
Stable on alpha.
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index af73d4383912..015cd53b82a4 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,6 +1,6 @@
-MD5 33657e63d5f8104763ecb88c10f5cec2 ChangeLog 2396
+MD5 78e25fe26822308aae92975abaa4bba8 PEAR-PEAR-1.3.5-r1.ebuild 3593
MD5 e68f890941cc02efec6b8f2235bf8919 PEAR-PEAR-1.3.5.ebuild 470
+MD5 33657e63d5f8104763ecb88c10f5cec2 ChangeLog 2396
MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 e009336680e26179d99fa70e1db02386 PEAR-PEAR-1.3.5-r1.ebuild 3524
MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
-MD5 e0b48c5489afe90eeb4199994b6b9587 files/digest-PEAR-PEAR-1.3.5-r1 248
+MD5 46061bca70e685875cd072b811107a83 files/digest-PEAR-PEAR-1.3.5-r1 248
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 a87e910359b2..5a77fa1b654f 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,11 +1,11 @@
# 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.8 2005/05/13 01:19:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild,v 1.9 2005/07/04 05:29:52 sebastian Exp $
ARCHIVE_TAR="1.2"
CONSOLE_GETOPT="1.2"
PEAR="1.3.5"
-XML_RPC="1.2.0"
+XML_RPC="1.3.1"
DESCRIPTION="PEAR Base System"
HOMEPAGE="http://pear.php.net/"
@@ -22,19 +22,22 @@ IUSE=""
DEPEND="virtual/php dev-php/php"
PDEPEND=">=dev-php/PEAR-Archive_Tar-1.1
>=dev-php/PEAR-Console_Getopt-1.2
- >=dev-php/PEAR-XML_RPC-1.0.4"
+ >=dev-php/PEAR-XML_RPC-1.3.1"
pkg_preinst() {
if [[ -d "${ROOT}"/usr/lib/php ]] && [[ ! -e "${ROOT}"/usr/share/php ]] ; then
- for f in /usr/lib/php/*
+ for f in "${ROOT}"/usr/lib/php/*
do
if [ "$f" != "/usr/lib/php/build" ] &&
[ "$f" != "/usr/lib/php/extensions" ]
- then mv $f /usr/share/php;
+ then mv $f "${ROOT}"/usr/share/php;
fi
done
- sed -i 's:/usr/lib/php:/usr/share/php:g' ${ROOT}/usr/bin/pear || die
+ if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
+ sed -i 's:/usr/lib/php:/usr/share/php:g' ${ROOT}/usr/bin/pear || die
+ fi
+
rm ${ROOT}/etc/pear.conf
fi
}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
index 9fb16bad84ff..eb21045a6b14 100644
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
@@ -1,4 +1,4 @@
MD5 e2f6fda1baa507f319b46f5a09b57351 Archive_Tar-1.2.tgz 14792
MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-MD5 c10a00097ce739e737035894d83b4e7e XML_RPC-1.2.0.tgz 21731
+MD5 c27e8cc85ff7cb86b119e933bd2eafc1 XML_RPC-1.3.1.tgz 25310
MD5 8fead7fddb93f9b3cecd740823daafd2 PEAR-1.3.5.tgz 108423