exheres-0: Use esandbox instead of sydboxcmd

10 files changed, 24 insertions, 24 deletions

diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
index 1c0078b8f..775b187a1 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
@@ -30,7 +30,7 @@ exheres_internal_loadenv()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${PALUDIS_LOADSAVEENV_DIR%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${PALUDIS_LOADSAVEENV_DIR}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${PALUDIS_LOADSAVEENV_DIR}"
     fi
 
     if hasq "loadenv" ${SKIP_FUNCTIONS} ; then
@@ -43,7 +43,7 @@ exheres_internal_loadenv()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${PALUDIS_LOADSAVEENV_DIR}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${PALUDIS_LOADSAVEENV_DIR}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
index fcda49ca3..79b7a6532 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
@@ -28,7 +28,7 @@ exheres_internal_saveenv()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${PALUDIS_LOADSAVEENV_DIR%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${PALUDIS_LOADSAVEENV_DIR}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${PALUDIS_LOADSAVEENV_DIR}"
     fi
 
 
@@ -42,7 +42,7 @@ exheres_internal_saveenv()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${PALUDIS_LOADSAVEENV_DIR}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${PALUDIS_LOADSAVEENV_DIR}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
index 36d4df1df..e72a998bc 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
@@ -36,7 +36,7 @@ exheres_internal_config()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "config" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_config()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
index 3ec2bb9e8..c400bf6c4 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
@@ -46,7 +46,7 @@ exheres_internal_nofetch()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${FETCHEDDIR}"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${FETCHEDDIR}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${FETCHEDDIR}"
     fi
 
     if hasq "nofetch" ${SKIP_FUNCTIONS} ; then
@@ -59,7 +59,7 @@ exheres_internal_nofetch()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${FETCHEDDIR}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${FETCHEDDIR}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
index dd8ddbb86..be3ea99ae 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
@@ -36,7 +36,7 @@ exheres_internal_postinst()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "postinst" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_postinst()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
index 50c61451a..c46126ed0 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
@@ -36,7 +36,7 @@ exheres_internal_postrm()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "postrm" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_postrm()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
index 1f374596c..7e4b4065b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
@@ -36,7 +36,7 @@ exheres_internal_preinst()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "preinst" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_preinst()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
index 9f1e646e9..d78c81c3a 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
@@ -36,7 +36,7 @@ exheres_internal_prerm()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "prerm" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_prerm()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
index cc91fe957..45a884aa0 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
@@ -36,7 +36,7 @@ exheres_internal_setup()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
-        sydboxcheck >/dev/null 2>&1 && addwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox allow "${ROOT}"
     fi
 
     if hasq "setup" ${SKIP_FUNCTIONS} ; then
@@ -49,7 +49,7 @@ exheres_internal_setup()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        sydboxcheck >/dev/null 2>&1 && rmwrite "${ROOT}"
+        esandbox check >/dev/null 2>&1 && esandbox disallow "${ROOT}"
     fi
     true
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash b/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
index 317042412..e4f337c21 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
@@ -32,9 +32,9 @@ exheres_internal_fetch_extra()
     local old_sandbox_write="${SANDBOX_WRITE}"
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${FETCHEDDIR}"
-        if sydboxcheck >/dev/null 2>&1; then
-            addwrite "${FETCHEDDIR}"
-            sydboxcmd sandunbox/net
+        if esandbox check >/dev/null 2>&1; then
+            esandbox allow "${FETCHEDDIR}"
+            esandbox disable_net
         fi
     fi
 
@@ -48,9 +48,9 @@ exheres_internal_fetch_extra()
 
     if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]]; then
         SANDBOX_WRITE="${old_sandbox_write}"
-        if sydboxcheck >/dev/null 2>&1; then
-            rmwrite "${FETCHEDDIR}"
-            sydboxcmd sandbox/net
+        if esandbox check >/dev/null 2>&1; then
+            esandbox disallow "${FETCHEDDIR}"
+            esandbox enable_net
         fi
     fi
     true