summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-05-08 19:48:53 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-05-08 19:48:53 +0000
commit7588986e7d151c7b6fa6639e9c1d96a8f12ee84f (patch)
tree9e3153506a4929422fe3dc5e49069a7f0394dbf7
parentVersion bump (diff)
downloadgentoo-2-7588986e7d151c7b6fa6639e9c1d96a8f12ee84f.tar.gz
gentoo-2-7588986e7d151c7b6fa6639e9c1d96a8f12ee84f.tar.bz2
gentoo-2-7588986e7d151c7b6fa6639e9c1d96a8f12ee84f.zip
Fix missing / that broke binpkg merges of amanda.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--app-backup/amanda/ChangeLog5
-rw-r--r--app-backup/amanda/amanda-2.6.1_p2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index b15f354fc3ae..561f69677b5d 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.63 2010/01/17 04:28:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.64 2010/05/08 19:48:53 robbat2 Exp $
+
+ 08 May 2010; Robin H. Johnson <robbat2@gentoo.org> amanda-2.6.1_p2.ebuild:
+ Fix missing / that broke binpkg merges of amanda.
17 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> amanda-2.6.1_p2.ebuild:
If installing from a binpkg, then ${T} does not exist, so look at the
diff --git a/app-backup/amanda/amanda-2.6.1_p2.ebuild b/app-backup/amanda/amanda-2.6.1_p2.ebuild
index cddb15977397..ef257fbbb70a 100644
--- a/app-backup/amanda/amanda-2.6.1_p2.ebuild
+++ b/app-backup/amanda/amanda-2.6.1_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.3 2010/01/17 04:28:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.4 2010/05/08 19:48:53 robbat2 Exp $
inherit autotools eutils
@@ -346,7 +346,7 @@ src_install() {
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$EMERGE_FROM" == "binary" ] && \
- TMPENVFILE="${ROOT}${ENVDIR}${ENVDFILE}"
+ TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"