Use a shell script wrapper for EPYTHON handling.

svn path=/main/trunk/; revision=14585

diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
deleted file mode 120000 (symlink)
index 4d1273c4892cd5a4a6b36eaea1b764be0fbb6b94..0000000000000000000000000000000000000000
--- a/bin/ebuild-helpers/portageq
+++ /dev/null
@@ -1 +0,0 @@
-../portageq
\ No newline at end of file

diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..f5a60200d2e5957674c4885858fe955f99d772d5
--- /dev/null
+++ b/bin/ebuild-helpers/portageq
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
+PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
+# Set EPYTHON variable as empty so that dohtml doesn't try
+# to use potentially unsupported version of Python.
+EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
+       exec "$PORTAGE_BIN_PATH/portageq" "$@"