From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 3 Apr 2018 19:42:14 +0000 (+0200)
Subject: sys-apps/sydbox: Use sandbox-2.13+ unloading instead of unsandbox
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f2c9a006a38fbc558157fa35a27d532f2f9e89bb;p=gentoo.git

sys-apps/sydbox: Use sandbox-2.13+ unloading instead of unsandbox
---

diff --git a/sys-apps/sydbox/sydbox-1.0.7.ebuild b/sys-apps/sydbox/sydbox-1.0.7.ebuild
index 660422f3a516..951a50fa3a49 100644
--- a/sys-apps/sydbox/sydbox-1.0.7.ebuild
+++ b/sys-apps/sydbox/sydbox-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="debug seccomp test"
 RDEPEND="sys-libs/pinktrace:=
 	debug? ( sys-libs/libunwind:= )"
 DEPEND="${RDEPEND}
-	test? ( app-portage/unsandbox )"
+	test? ( !<sys-apps/sandbox-2.13 )"
 
 src_configure() {
 	local myconf=(
@@ -27,6 +27,9 @@ src_configure() {
 }
 
 src_test() {
-	# two sandboxes are never a good idea ;-)
-	unsandbox emake check
+	# unload the Gentoo sandbox
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+
+	emake check
 }