[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     3053d4fc730cd5a2ee33a885aea710355ef6c88e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 17:51:28 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 18:01:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3053d4fc

app-editors/emacs: Fix temacs wrapper.

Disable the sandbox already when "env" is executed, so that the execvp
executing temacs will be the regular one from libc.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-editors/emacs/emacs-18.59-r11.ebuild | 2 +-
 app-editors/emacs/emacs-23.4-r17.ebuild  | 2 +-
 app-editors/emacs/emacs-24.5-r5.ebuild   | 2 +-
 app-editors/emacs/emacs-25.3-r3.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild 
b/app-editors/emacs/emacs-18.59-r11.ebuild
index 9b260064e0b..91fad29d2a6 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -32,7 +32,7 @@ src_prepare() {
        default
 
        # Do not use the sandbox, or the dumped Emacs will be twice as large
-       sed -i -e 's:\./temacs.*dump:env SANDBOX_ON=0 LD_PRELOAD= &:' \
+       sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
                src/ymakefile || die
 }
 

diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild 
b/app-editors/emacs/emacs-23.4-r17.ebuild
index d984134389d..47bae6b5ddc 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -226,7 +226,7 @@ src_compile() {
        emake CC="$(tc-getCC)" \
                AR="$(tc-getAR) cq" \
                RANLIB="$(tc-getRANLIB)" \
-               RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
+               RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
 }
 
 src_install () {

diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild 
b/app-editors/emacs/emacs-24.5-r5.ebuild
index 23d6f54c458..856e206ec8f 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -224,7 +224,7 @@ src_configure() {
 
 src_compile() {
        # Disable sandbox when dumping. For the unbelievers, see bug #131505
-       emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
+       emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
 }
 
 src_install () {

diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild 
b/app-editors/emacs/emacs-25.3-r3.ebuild
index 72aacd2aed7..0f547078ec5 100644
--- a/app-editors/emacs/emacs-25.3-r3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -236,7 +236,7 @@ src_configure() {
 
 src_compile() {
        # Disable sandbox when dumping. For the unbelievers, see bug #131505
-       emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
+       emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
 }
 
 src_install () {