From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-python+bounces-258-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 244CB1381F3
	for <garchives@archives.gentoo.org>; Thu, 29 Nov 2012 19:48:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EF69B21C024;
	Thu, 29 Nov 2012 19:48:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7C0D421C024
	for <gentoo-python@lists.gentoo.org>; Thu, 29 Nov 2012 19:48:01 +0000 (UTC)
Received: from pomiocik.lan (unknown [81.219.163.24])
	(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: mgorny)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 626CF33D7F4;
	Thu, 29 Nov 2012 19:47:59 +0000 (UTC)
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-python@lists.gentoo.org
Cc: python@gentoo.org,
	=?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Subject: [gentoo-python] [PATCH 10/10 updated] Replace static EPYTHON setting with python-any-r1.
Date: Thu, 29 Nov 2012 20:44:28 +0100
Message-Id: <1354218268-14064-1-git-send-email-mgorny@gentoo.org>
X-Mailer: git-send-email 1.8.0
In-Reply-To: <1353964837-24198-1-git-send-email-mgorny@gentoo.org>
References: <1353964837-24198-1-git-send-email-mgorny@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-python@lists.gentoo.org>
List-Help: <mailto:gentoo-python+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-python+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-python+subscribe@lists.gentoo.org>
List-Id: Discussions centering around the Python ecosystem in Gentoo Linux <gentoo-python.gentoo.org>
X-BeenThere: gentoo-python@gentoo.org
X-BeenThere: gentoo-python@lists.gentoo.org
X-Archives-Salt: 831902f8-fc89-4926-aeca-10c2ae32cf26
X-Archives-Hash: 9b4e88eb33a6eb43b9b407d432047a0b

This way, the ebuild will check for the best installed Python version
satisfying the dep and use it if necessary.
---
 gx86/dev-lang/python/python-2.7.3-r3.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gx86/dev-lang/python/python-2.7.3-r3.ebuild b/gx86/dev-lang/python/python-2.7.3-r3.ebuild
index 2182837..b6349a2 100644
--- a/gx86/dev-lang/python/python-2.7.3-r3.ebuild
+++ b/gx86/dev-lang/python/python-2.7.3-r3.ebuild
@@ -6,7 +6,10 @@ EAPI="2"
 WANT_AUTOMAKE="none"
 WANT_LIBTOOL="none"
 
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs
+# Bootstrapping Python requires Python 2.
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_8,1_9} )
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-any-r1 toolchain-funcs
 
 MY_P="Python-${PV}"
 PATCHSET_REVISION="1"
@@ -50,6 +53,7 @@ RDEPEND="app-arch/bzip2
 	)
 	!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
 	!sys-devel/gcc[libffi]"
@@ -73,6 +77,8 @@ pkg_setup() {
 			ewarn "You might need to migrate your databases."
 		fi
 	fi
+
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -197,7 +203,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
+	default
 
 	# Work around bug 329499. See also bug 413751.
 	pax-mark m python
-- 
1.8.0