summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-05-28 14:10:15 +0000
committerFabian Groffen <grobian@gentoo.org>2012-05-28 14:10:15 +0000
commit0e7e6e650c0e3df94dcd5cf0104a801f54dd06da (patch)
tree13a05efc3741534ab72c86cdb63f82e57d7183d1 /app-misc/editor-wrapper
parentalpha/ia64/sparc stable wrt #404665 (diff)
downloadgentoo-2-0e7e6e650c0e3df94dcd5cf0104a801f54dd06da.tar.gz
gentoo-2-0e7e6e650c0e3df94dcd5cf0104a801f54dd06da.tar.bz2
gentoo-2-0e7e6e650c0e3df94dcd5cf0104a801f54dd06da.zip
Fix wrapper for Prefix usage, marked *-macos and *-solaris
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'app-misc/editor-wrapper')
-rw-r--r--app-misc/editor-wrapper/ChangeLog5
-rw-r--r--app-misc/editor-wrapper/editor-wrapper-4.ebuild10
2 files changed, 12 insertions, 3 deletions
diff --git a/app-misc/editor-wrapper/ChangeLog b/app-misc/editor-wrapper/ChangeLog
index cb59b9d681b1..42b0c624a417 100644
--- a/app-misc/editor-wrapper/ChangeLog
+++ b/app-misc/editor-wrapper/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/editor-wrapper
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/ChangeLog,v 1.14 2012/04/27 15:27:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/ChangeLog,v 1.15 2012/05/28 14:10:15 grobian Exp $
+
+ 28 May 2012; Fabian Groffen <grobian@gentoo.org> editor-wrapper-4.ebuild:
+ Fix wrapper for Prefix usage, marked *-macos and *-solaris
27 Apr 2012; Fabian Groffen <grobian@gentoo.org> editor-wrapper-4.ebuild:
Marked ~sparc-solaris
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index 70fca07b1819..939d97e56b48 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.9 2012/04/27 15:27:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.10 2012/05/28 14:10:15 grobian Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}"
@@ -18,6 +18,12 @@ S="${WORKDIR}"
src_prepare() {
sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
sed -e 's/@VAR@/PAGER/g' "${FILESDIR}/${P}.sh" >pager || die
+ if use prefix ; then
+ sed -i \
+ -e "s:#!/bin/sh:#!/usr/bin/env sh:" \
+ -e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
+ editor pager || die
+ fi
}
src_install() {