use addwrite instead of setting any variables directly now that support

for it has been fixed in cvs

10 files changed, 34 insertions, 8 deletions

diff --git a/profiles/default-amd64-1.4/profile.bashrc b/profiles/default-amd64-1.4/profile.bashrc
new file mode 100644
index 000000000000..a23dacf85363
--- /dev/null
+++ b/profiles/default-amd64-1.4/profile.bashrc
@@ -0,0 +1,5 @@
+# fix for bug 60147, "configure causes sandbox violations when lib64
+# is a directory". currently only works with cvs portage.
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-amd64-2004.0/profile.bashrc b/profiles/default-amd64-2004.0/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/default-amd64-2004.0/profile.bashrc
+++ b/profiles/default-amd64-2004.0/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-amd64-2004.2/profile.bashrc b/profiles/default-amd64-2004.2/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/default-amd64-2004.2/profile.bashrc
+++ b/profiles/default-amd64-2004.2/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-linux/amd64/1.4/profile.bashrc b/profiles/default-linux/amd64/1.4/profile.bashrc
new file mode 100644
index 000000000000..a23dacf85363
--- /dev/null
+++ b/profiles/default-linux/amd64/1.4/profile.bashrc
@@ -0,0 +1,5 @@
+# fix for bug 60147, "configure causes sandbox violations when lib64
+# is a directory". currently only works with cvs portage.
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-linux/amd64/2004.0/profile.bashrc b/profiles/default-linux/amd64/2004.0/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/default-linux/amd64/2004.0/profile.bashrc
+++ b/profiles/default-linux/amd64/2004.0/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-linux/amd64/2004.1/profile.bashrc b/profiles/default-linux/amd64/2004.1/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/default-linux/amd64/2004.1/profile.bashrc
+++ b/profiles/default-linux/amd64/2004.1/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc b/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
+++ b/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/gcc34-amd64-2004.1/profile.bashrc b/profiles/gcc34-amd64-2004.1/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/gcc34-amd64-2004.1/profile.bashrc
+++ b/profiles/gcc34-amd64-2004.1/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/hardened-amd64-2004.0/profile.bashrc b/profiles/hardened-amd64-2004.0/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/hardened-amd64-2004.0/profile.bashrc
+++ b/profiles/hardened-amd64-2004.0/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
diff --git a/profiles/hardened/amd64/profile.bashrc b/profiles/hardened/amd64/profile.bashrc
index a43e250154b2..a23dacf85363 100644
--- a/profiles/hardened/amd64/profile.bashrc
+++ b/profiles/hardened/amd64/profile.bashrc
@@ -1,3 +1,5 @@
 # fix for bug 60147, "configure causes sandbox violations when lib64
 # is a directory". currently only works with cvs portage.
-SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf