From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-848847-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 3A1AF1388C1
for <garchives@archives.gentoo.org>; Thu, 26 Nov 2015 22:35:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 197A721C07B;
Thu, 26 Nov 2015 22:35:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6DB3421C078
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 22:35:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 461763403C1
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 22:35:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 66C29A43
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 22:35:27 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1448577166.21a87fb808d7deb1a9e75bae922ab07fc6beea39.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:python-eapi6 commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/python-utils-r1.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 21a87fb808d7deb1a9e75bae922ab07fc6beea39
X-VCS-Branch: python-eapi6
Date: Thu, 26 Nov 2015 22:35:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cbd5c303-5039-4127-a92d-012c2ddb8a51
X-Archives-Hash: f879b5bd6feed4fd2e7612c717812c6c
commit: 21a87fb808d7deb1a9e75bae922ab07fc6beea39
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a87fb8
python-utils-r1.eclass: Ban installation helpers in EAPIs < 5
Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.
eclass/python-utils-r1.eclass | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4e493ac..e467d27 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+ if [[ ${EAPI:-0} == [01234] ]]; then
+ die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+ fi
local wrapd=${python_scriptroot:-${DESTTREE}/bin}
@@ -789,6 +792,9 @@ python_domodule() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+ if [[ ${EAPI:-0} == [01234] ]]; then
+ die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+ fi
local d
if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+ if [[ ${EAPI:-0} == [01234] ]]; then
+ die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+ fi
local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR