Use a shell script for dohtml instead of a function, for xargs compatibility.

(trunk r14582)

svn path=/main/branches/2.1.7/; revision=14584

diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
new file mode 100755 (executable)
index 0000000..95626eb
--- /dev/null
+++ b/bin/ebuild-helpers/dohtml
@@ -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/dohtml.py" "$@"

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d026fddf5f362789d6cdcf9bb3f24a9c593aa0c1..0c7553933770d112926b48955b79f63cab4ef920 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -227,13 +227,6 @@ best_version() {
        esac
 }
 
-dohtml() {
-       # 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} \
-       "${PORTAGE_BIN_PATH}/ebuild-helpers/dohtml" "$@"
-}
-
 use_with() {
        if [ -z "$1" ]; then
                echo "!!! use_with() called without a parameter." >&2