summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2005-07-15 05:59:05 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2005-07-15 05:59:05 +0000
commit16ec2eba3ae79d8bd81c82383b786ec7993e1b1f (patch)
treebd05e0c83819cd51112a4666d177024196c96b6f /dev-php
parentInstall PEAR to /usr/share/php and not to /usr/share/php/php. Closes bug 99025. (diff)
downloadhistorical-16ec2eba3ae79d8bd81c82383b786ec7993e1b1f.tar.gz
historical-16ec2eba3ae79d8bd81c82383b786ec7993e1b1f.tar.bz2
historical-16ec2eba3ae79d8bd81c82383b786ec7993e1b1f.zip
Fix bug 98956.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-php')
-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.ebuild14
3 files changed, 18 insertions, 12 deletions
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index b9773ed77b03..3e09377aad5b 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.18 2005/07/14 05:08:32 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.19 2005/07/15 05:59:05 sebastian Exp $
+
+ 15 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+ PEAR-PEAR-1.3.5-r1.ebuild:
+ Fix bug 98956. Only emit upgrade warning when we are upgrading.
14 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
PEAR-PEAR-1.3.5-r1.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index b7945c1c7c73..bc90d0a98385 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 d22e6d7c70f682ce6f737e0c7c8457cf PEAR-PEAR-1.3.5-r1.ebuild 3713
+MD5 7e92e897d5dd12b435216d3ec6f31cbb PEAR-PEAR-1.3.5-r1.ebuild 3753
MD5 e68f890941cc02efec6b8f2235bf8919 PEAR-PEAR-1.3.5.ebuild 470
-MD5 e7f6b9d3e7eea4cf1156a3e0f86d0582 ChangeLog 2687
+MD5 52ef2abdab301a8e68ed0afe0c9d5aa4 ChangeLog 2840
MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
MD5 46061bca70e685875cd072b811107a83 files/digest-PEAR-PEAR-1.3.5-r1 248
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFC1fN0aGfFFLhbXWkRAuZaAJ9y506PXMB+DcjrX2bWzEVQnRpYRACdEB0d
-OQXzV045Ka/FWJtXDvgwnkc=
-=PBkf
+iD8DBQFC11DRaGfFFLhbXWkRAgsEAJ4nmsNLBT+VvCRg9nfbsXflbgqGHgCeLCIF
+Y8QvMW65ELVFgjnqyM6edXw=
+=q5+B
-----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 480fcf5e55a1..659c8533fc8d 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.10 2005/07/14 05:08:32 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild,v 1.11 2005/07/15 05:59:05 sebastian Exp $
ARCHIVE_TAR="1.2"
CONSOLE_GETOPT="1.2"
@@ -47,7 +47,7 @@ src_install() {
addpredict /usr/share/snmp/mibs/.index
addpredict /var/lib/net-snmp/
- if has_version "dev-php/PEAR-PEAR"; then
+ if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
install_pear_without_bootstrap
else
bootstrap_pear
@@ -56,10 +56,12 @@ src_install() {
}
pkg_postinst() {
- ewarn "The location of the local PEAR repository has been changed"
- ewarn "from /usr/lib/php to /usr/share/php."
- ewarn "If you had a standard setup previously installed PEAR packages"
- ewarn "have been moved to the new location."
+ if has_version "<${PV}"; then
+ ewarn "The location of the local PEAR repository has been changed"
+ ewarn "from /usr/lib/php to /usr/share/php."
+ ewarn "If you had a standard setup previously installed PEAR packages"
+ ewarn "have been moved to the new location."
+ fi
}
bootstrap_pear() {