Make the invalid function/variable checks non-fatal for now.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a4378948b97e1cab4b2c975da49440ffa1d81ab2..6871af4afe57fd5a9c38e838025fc1ba4f297983 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1485 2014/12/28 11:24:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1486 2014/12/28 18:35:07 mgorny Exp $
+
+  28 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+  Make the invalid function/variable checks non-fatal for now.
 
   28 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Do not check for PYTHON_TEST_VERBOSITY, it is intended for make.conf.

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 51991a1c2cad7311de92884f5b558cb42a7b551f..02af357d1fae0f1e5a0fdf408df49b354496ef05 100644 (file)
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.72 2014/12/28 11:24:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.73 2014/12/28 18:35:07 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -1176,14 +1176,14 @@ _python_check_dead_variables() {
        for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS
        do
                if [[ ${!v} ]]; then
-                       die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
+                       eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
                fi
        done
 
        for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
        do
                if [[ ${!v} ]]; then
-                       die "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
+                       eqawarn "${v} is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
                fi
        done
 
@@ -1191,7 +1191,7 @@ _python_check_dead_variables() {
                PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES
        do
                if [[ ${!v} ]]; then
-                       die "${v} is invalid for python-r1 suite"
+                       eqawarn "${v} is invalid for python-r1 suite"
                fi
        done
 
@@ -1199,105 +1199,105 @@ _python_check_dead_variables() {
                DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
        do
                if [[ ${!v} ]]; then
-                       die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
+                       eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
                fi
        done
 
        if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
-               die "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
+               eqawarn "${v} is invalid for distutils-r1, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
        fi
 }
 
 python_pkg_setup() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
 }
 
 python_convert_shebangs() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
 }
 
 python_clean_py-compile_files() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_clean_installation_image() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_execute_function() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
 }
 
 python_generate_wrapper_scripts() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_merge_intermediate_installation_images() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_set_active_version() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
 }
 
 python_need_rebuild() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 PYTHON() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
 }
 
 python_get_implementation() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_get_implementational_package() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_get_libdir() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_get_library() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_get_version() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_get_implementation_and_version() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_execute_nosetests() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_execute_py.test() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_execute_trial() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_enable_pyc() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_disable_pyc() {
-       die "${FUNCNAME}() is invalid for python-r1 suite"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite"
 }
 
 python_mod_optimize() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
 }
 
 python_mod_cleanup() {
-       die "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
+       eqawarn "${FUNCNAME}() is invalid for python-r1 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
 }
 
 _PYTHON_UTILS_R1=1