From 9cd621a5e7687a4bf8e7f3d8ffd0b7fefc216ea3 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 13 Dec 2010 22:36:26 +0100
Subject: [PATCH] GENTOO_PATH_PYTHON: be resistant against pre-exported
 PORTAGE_PYTHON

---
 acinclude.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 07714f3a1..47c537fc9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -16,7 +16,9 @@ dnl GENTOO_PATH_PYTHON([minimum-version], [path])
 dnl author: Fabian Groffen <grobian a gentoo.org>
 AC_DEFUN([GENTOO_PATH_PYTHON],
 [
-  AC_PATH_PROG([PORTAGE_PYTHON], [python], no, $2)
+  AC_PATH_PROG([HERE_PORTAGE_PYTHON], [python], no, $2)
+  dnl Portage's ebuild.sh defines PORTAGE_PYTHON itself now :(
+  PORTAGE_PYTHON="$HERE_PORTAGE_PYTHON"
 
   dnl is is there at all?
   if test "$PORTAGE_PYTHON" = "no" ; then
-- 
2.26.2