1 |
commit: f2c9a006a38fbc558157fa35a27d532f2f9e89bb |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 3 19:42:14 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 3 20:05:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c9a006 |
7 |
|
8 |
sys-apps/sydbox: Use sandbox-2.13+ unloading instead of unsandbox |
9 |
|
10 |
sys-apps/sydbox/sydbox-1.0.7.ebuild | 11 +++++++---- |
11 |
1 file changed, 7 insertions(+), 4 deletions(-) |
12 |
|
13 |
diff --git a/sys-apps/sydbox/sydbox-1.0.7.ebuild b/sys-apps/sydbox/sydbox-1.0.7.ebuild |
14 |
index 660422f3a51..951a50fa3a4 100644 |
15 |
--- a/sys-apps/sydbox/sydbox-1.0.7.ebuild |
16 |
+++ b/sys-apps/sydbox/sydbox-1.0.7.ebuild |
17 |
@@ -1,4 +1,4 @@ |
18 |
-# Copyright 1999-2017 Gentoo Foundation |
19 |
+# Copyright 1999-2018 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
EAPI=6 |
23 |
@@ -15,7 +15,7 @@ IUSE="debug seccomp test" |
24 |
RDEPEND="sys-libs/pinktrace:= |
25 |
debug? ( sys-libs/libunwind:= )" |
26 |
DEPEND="${RDEPEND} |
27 |
- test? ( app-portage/unsandbox )" |
28 |
+ test? ( !<sys-apps/sandbox-2.13 )" |
29 |
|
30 |
src_configure() { |
31 |
local myconf=( |
32 |
@@ -27,6 +27,9 @@ src_configure() { |
33 |
} |
34 |
|
35 |
src_test() { |
36 |
- # two sandboxes are never a good idea ;-) |
37 |
- unsandbox emake check |
38 |
+ # unload the Gentoo sandbox |
39 |
+ local -x SANDBOX_ON=0 |
40 |
+ local -x LD_PRELOAD= |
41 |
+ |
42 |
+ emake check |
43 |
} |