From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1002926-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 536731382C5
	for <garchives@archives.gentoo.org>; Sun, 11 Feb 2018 16:36:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6F1EAE0CBC;
	Sun, 11 Feb 2018 16:36:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 43C3BE0CBC
	for <gentoo-commits@lists.gentoo.org>; Sun, 11 Feb 2018 16:36:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 43186335C3C
	for <gentoo-commits@lists.gentoo.org>; Sun, 11 Feb 2018 16:36:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CDC841D7
	for <gentoo-commits@lists.gentoo.org>; Sun, 11 Feb 2018 16:35:59 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1518366910.1233c2bc3f53793b6b5354730c69923c6329cfef.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/emacs/emacs-18.59-r11.ebuild app-editors/emacs/emacs-23.4-r17.ebuild app-editors/emacs/emacs-24.5-r5.ebuild app-editors/emacs/emacs-25.3-r1.ebuild
X-VCS-Directories: app-editors/emacs/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 1233c2bc3f53793b6b5354730c69923c6329cfef
X-VCS-Branch: master
Date: Sun, 11 Feb 2018 16:35:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dce3741a-f9e2-4225-b2ab-a7741aa243da
X-Archives-Hash: c95b0db46b624caa89432ca95599bbe5

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 () {