From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D14C41388C1 for ; Thu, 19 Nov 2015 15:14:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DC4BE07BA; Thu, 19 Nov 2015 15:14:12 +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 ED581E07A0 for ; Thu, 19 Nov 2015 15:14:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8EFF3409ED for ; Thu, 19 Nov 2015 15:14:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACEC71004 for ; Thu, 19 Nov 2015 15:14:07 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1447946015.b3bbaca3a237972002c260e8e05795ea0ed9bf9e.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: b3bbaca3a237972002c260e8e05795ea0ed9bf9e X-VCS-Branch: python-eapi6 Date: Thu, 19 Nov 2015 15:14:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6927e73c-74a5-4126-8bea-e81e9ab563fb X-Archives-Hash: 77bd2bbff0db41a50b8867642864dccd commit: b3bbaca3a237972002c260e8e05795ea0ed9bf9e Author: Michał Górny gentoo org> AuthorDate: Wed Nov 18 19:41:29 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Nov 19 15:13:35 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bbaca3 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 e690e09..99ee58b 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} " + 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