Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2 06/20] python-utils-r2.eclass: Remove python.eclass checks
Date: Thu, 05 Mar 2020 15:13:22
Message-Id: 20200305151024.125834-7-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 00/20] python-r2 suite by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/python-utils-r2.eclass | 170 ----------------------------------
4 1 file changed, 170 deletions(-)
5
6 diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass
7 index c28c42493173..fe129f48c9c9 100644
8 --- a/eclass/python-utils-r2.eclass
9 +++ b/eclass/python-utils-r2.eclass
10 @@ -970,8 +970,6 @@ python_wrapper_setup() {
11 [[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON specified."
12
13 if [[ ! -x ${workdir}/bin/python ]]; then
14 - _python_check_dead_variables
15 -
16 mkdir -p "${workdir}"/{bin,pkgconfig} || die
17
18 # Clean up, in case we were supposed to do a cheap update.
19 @@ -1336,173 +1334,5 @@ build_sphinx() {
20 HTML_DOCS+=( "${dir}/_build/html/." )
21 }
22
23 -# -- python.eclass functions --
24 -
25 -_python_check_dead_variables() {
26 - local v
27 -
28 - for v in PYTHON_DEPEND PYTHON_USE_WITH{,_OR,_OPT} {RESTRICT,SUPPORT}_PYTHON_ABIS
29 - do
30 - if [[ ${!v} ]]; then
31 - die "${v} is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Ebuild_head"
32 - fi
33 - done
34 -
35 - for v in PYTHON_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
36 - do
37 - if [[ ${!v} ]]; then
38 - die "${v} is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#PYTHON_CFLAGS"
39 - fi
40 - done
41 -
42 - for v in PYTHON_TESTS_RESTRICTED_ABIS PYTHON_EXPORT_PHASE_FUNCTIONS \
43 - PYTHON_VERSIONED_{SCRIPTS,EXECUTABLES} PYTHON_NONVERSIONED_EXECUTABLES
44 - do
45 - if [[ ${!v} ]]; then
46 - die "${v} is invalid for python-r2 suite"
47 - fi
48 - done
49 -
50 - for v in DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES DISTUTILS_SETUP_FILES \
51 - DISTUTILS_GLOBAL_OPTIONS DISTUTILS_SRC_TEST PYTHON_MODNAME
52 - do
53 - if [[ ${!v} ]]; then
54 - die "${v} is invalid for distutils-r2, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#${v}"
55 - fi
56 - done
57 -
58 - if [[ ${DISTUTILS_DISABLE_TEST_DEPENDENCY} ]]; then
59 - die "${v} is invalid for distutils-r2, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#DISTUTILS_SRC_TEST"
60 - fi
61 -
62 - # python.eclass::progress
63 - for v in PYTHON_BDEPEND PYTHON_MULTIPLE_ABIS PYTHON_ABI_TYPE \
64 - PYTHON_RESTRICTED_ABIS PYTHON_TESTS_FAILURES_TOLERANT_ABIS \
65 - PYTHON_CFFI_MODULES_GENERATION_COMMANDS
66 - do
67 - if [[ ${!v} ]]; then
68 - die "${v} is invalid for python-r2 suite"
69 - fi
70 - done
71 -}
72 -
73 -python_pkg_setup() {
74 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
75 -}
76 -
77 -python_convert_shebangs() {
78 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_convert_shebangs"
79 -}
80 -
81 -python_clean_py-compile_files() {
82 - die "${FUNCNAME}() is invalid for python-r2 suite"
83 -}
84 -
85 -python_clean_installation_image() {
86 - die "${FUNCNAME}() is invalid for python-r2 suite"
87 -}
88 -
89 -python_execute_function() {
90 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#python_execute_function"
91 -}
92 -
93 -python_generate_wrapper_scripts() {
94 - die "${FUNCNAME}() is invalid for python-r2 suite"
95 -}
96 -
97 -python_merge_intermediate_installation_images() {
98 - die "${FUNCNAME}() is invalid for python-r2 suite"
99 -}
100 -
101 -python_set_active_version() {
102 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#pkg_setup"
103 -}
104 -
105 -python_need_rebuild() {
106 - die "${FUNCNAME}() is invalid for python-r2 suite"
107 -}
108 -
109 -PYTHON() {
110 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#.24.28PYTHON.29.2C_.24.7BEPYTHON.7D"
111 -}
112 -
113 -python_get_implementation() {
114 - die "${FUNCNAME}() is invalid for python-r2 suite"
115 -}
116 -
117 -python_get_implementational_package() {
118 - die "${FUNCNAME}() is invalid for python-r2 suite"
119 -}
120 -
121 -python_get_libdir() {
122 - die "${FUNCNAME}() is invalid for python-r2 suite"
123 -}
124 -
125 -python_get_library() {
126 - die "${FUNCNAME}() is invalid for python-r2 suite"
127 -}
128 -
129 -python_get_version() {
130 - die "${FUNCNAME}() is invalid for python-r2 suite"
131 -}
132 -
133 -python_get_implementation_and_version() {
134 - die "${FUNCNAME}() is invalid for python-r2 suite"
135 -}
136 -
137 -python_execute_nosetests() {
138 - die "${FUNCNAME}() is invalid for python-r2 suite"
139 -}
140 -
141 -python_execute_py.test() {
142 - die "${FUNCNAME}() is invalid for python-r2 suite"
143 -}
144 -
145 -python_execute_trial() {
146 - die "${FUNCNAME}() is invalid for python-r2 suite"
147 -}
148 -
149 -python_enable_pyc() {
150 - die "${FUNCNAME}() is invalid for python-r2 suite"
151 -}
152 -
153 -python_disable_pyc() {
154 - die "${FUNCNAME}() is invalid for python-r2 suite"
155 -}
156 -
157 -python_mod_optimize() {
158 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
159 -}
160 -
161 -python_mod_cleanup() {
162 - die "${FUNCNAME}() is invalid for python-r2 suite, please take a look @ https://wiki.gentoo.org/wiki/Project:Python/Python.eclass_conversion#Python_byte-code_compilation"
163 -}
164 -
165 -# python.eclass::progress
166 -
167 -python_abi_depend() {
168 - die "${FUNCNAME}() is invalid for python-r2 suite"
169 -}
170 -
171 -python_install_executables() {
172 - die "${FUNCNAME}() is invalid for python-r2 suite"
173 -}
174 -
175 -python_get_extension_module_suffix() {
176 - die "${FUNCNAME}() is invalid for python-r2 suite"
177 -}
178 -
179 -python_byte-compile_modules() {
180 - die "${FUNCNAME}() is invalid for python-r2 suite"
181 -}
182 -
183 -python_clean_byte-compiled_modules() {
184 - die "${FUNCNAME}() is invalid for python-r2 suite"
185 -}
186 -
187 -python_generate_cffi_modules() {
188 - die "${FUNCNAME}() is invalid for python-r2 suite"
189 -}
190 -
191 _PYTHON_UTILS_R2=1
192 fi
193 --
194 2.25.1