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 D5D441384B4 for ; Sun, 22 Nov 2015 19:54:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF54721C05E; Sun, 22 Nov 2015 19:51:28 +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 7F3E321C056 for ; Sun, 22 Nov 2015 19:51:27 +0000 (UTC) Received: from localhost.localdomain (d202-251.icpnet.pl [109.173.202.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 0E087340812; Sun, 22 Nov 2015 19:51:24 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 06/29] python-utils-r1.eclass: Ban installation helpers in EAPIs < 5 Date: Sun, 22 Nov 2015 20:50:47 +0100 Message-Id: <1448221870-17269-7-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448221870-17269-1-git-send-email-mgorny@gentoo.org> References: <1448221870-17269-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 8df67c79-55f1-4c45-abd1-a8def23b7b97 X-Archives-Hash: b2e68fc0d76f1e27a0abbcf25d3cad50 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 -- 2.6.3