ebuild-helpers/sed: move to bsd subdirectory

This helps to prevent inappropriate use of the sed wrapper on GNU
systems, which commonly occurs when users install portage manually
during recovery situations.

diff --git a/bin/ebuild-helpers/sed b/bin/ebuild-helpers/bsd/sed
similarity index 100%
rename from bin/ebuild-helpers/sed
rename to bin/ebuild-helpers/bsd/sed

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 9ca684edfe6790d96cac3c504b8fc8978768b9df..3dedfd4bfcd9b2d3e709a1c2c6f9e322df42b9aa 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -155,6 +155,9 @@ def _doebuild_path(settings, eapi=None):
 
        path = []
 
+       if settings.get("USERLAND", "GNU") != "GNU":
+               path.append(os.path.join(portage_bin_path, "ebuild-helpers", "bsd"))
+
        path.append(os.path.join(portage_bin_path, "ebuild-helpers"))
        path.extend(prerootpath)