From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Sep 2012 23:08:16 +0000 (-0700)
Subject: ebuild-helpers/sed: move to bsd subdirectory
X-Git-Tag: v2.2.0_alpha124~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c89363dfe8afd98e67b8916ae8233904026493f;p=portage.git

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 9ca684edf..3dedfd4bf 100644
--- 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)