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

[Ulrich Müller]

commit:     1233c2bc3f53793b6b5354730c69923c6329cfef
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 16:30:46 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 16:35:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1233c2bc

app-editors/emacs: Revert "Disable the sandbox entirely."

Reverts: 0b0800435bbc35d2a175fff316535bf3225379f6

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

diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild 
b/app-editors/emacs/emacs-18.59-r11.ebuild
index 19abd28b5a2..8b9d3d2c04e 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -71,7 +71,8 @@ src_configure() {
 
 src_compile() {
        # Do not use the sandbox, or the dumped Emacs will be twice as large
-       SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
+       export SANDBOX_ON=0
+       emake --jobs=1 \
                CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
                LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }

diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild 
b/app-editors/emacs/emacs-23.4-r17.ebuild
index 73d6f0dcad3..09fda80f8ed 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -224,9 +224,8 @@ src_configure() {
 }
 
 src_compile() {
-       # Disable the sandbox. For the unbelievers, see bug #131505
-       SANDBOX_ON=0 LD_PRELOAD="" emake \
-               CC="$(tc-getCC)" \
+       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
+       emake CC="$(tc-getCC)" \
                AR="$(tc-getAR) cq" \
                RANLIB="$(tc-getRANLIB)"
 }

diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild 
b/app-editors/emacs/emacs-24.5-r5.ebuild
index 1b9958b58c0..a60d2935347 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -225,8 +225,8 @@ src_configure() {
 }
 
 src_compile() {
-       # Disable the sandbox. For the unbelievers, see bug #131505
-       SANDBOX_ON=0 LD_PRELOAD="" emake
+       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
+       emake
 }
 
 src_install () {

diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild 
b/app-editors/emacs/emacs-25.3-r1.ebuild
index c88e891f9ae..0377eb67861 100644
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -237,8 +237,8 @@ src_configure() {
 }
 
 src_compile() {
-       # Disable the sandbox. For the unbelievers, see bug #131505
-       SANDBOX_ON=0 LD_PRELOAD="" emake
+       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
+       emake
 }
 
 src_install () {