From 7ebd9fec81aac3ea0814c9c45e1cfc806ba00a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 13 Nov 2015 19:44:21 +0100 Subject: [PATCH] python.eclass, distutils.eclass: Ban for EAPI=6 Ban deprecated python and distutils eclasses to avoid being accidentally enabled in EAPI 6. --- eclass/distutils.eclass | 3 +++ eclass/python.eclass | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass index 5f5a06950d84f..d24ae551f7c28 100644 --- a/eclass/distutils.eclass +++ b/eclass/distutils.eclass @@ -18,6 +18,9 @@ fi inherit multilib case "${EAPI:-0}" in + 6) + die "${ECLASS}.eclass is banned in EAPI ${EAPI}" + ;; 0|1) EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm ;; diff --git a/eclass/python.eclass b/eclass/python.eclass index c3634a0048612..592119fa79931 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -12,6 +12,10 @@ # This eclass is DEPRECATED. Please use python-r1, python-single-r1 # or python-any-r1 instead. +if [[ ${EAPI} == 6 ]]; then + die "${ECLASS}.eclass is banned in EAPI ${EAPI}" +fi + if [[ ${_PYTHON_UTILS_R1} ]]; then die 'python.eclass can not be used with python-r1 suite eclasses.' fi