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

Reverts: 0b0800435bbc35d2a175fff316535bf3225379f6

diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index 19abd28b5a2062afa6bb3e46ef319ec5f8ec8f36..8b9d3d2c04e9d3d69247baee35a1c9d8e8c5fded 100644 (file)
--- 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 73d6f0dcad3206c55cac8dc89f1ed188fe5bf6d7..09fda80f8ed370ce633ad211240d91615e88cb32 100644 (file)
--- 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 1b9958b58c02544ad474f90f4b2cfa677fa96e53..a60d29353474473079f29421432f6dca156dcd3e 100644 (file)
--- 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 c88e891f9ae8d96bcdbe39071392301873e05e9e..0377eb6786154582c1b40cb0fad2aabe7ca06db0 100644 (file)
--- 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 () {