/[gentoo-x86]/eclass/distutils.eclass
Gentoo

Diff of /eclass/distutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.72 Revision 1.74
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.72 2010/02/08 09:35:38 pva Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.74 2010/03/04 17:49:03 arfrever Exp $
4 4
5# @ECLASS: distutils.eclass 5# @ECLASS: distutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Gentoo Python Project <python@gentoo.org> 7# Gentoo Python Project <python@gentoo.org>
8# 8#
9# Original author: Jon Nelson <jnelson@gentoo.org> 9# Original author: Jon Nelson <jnelson@gentoo.org>
10# @BLURB: Eclass for packages with build systems using Distutils 10# @BLURB: Eclass for packages with build systems using Distutils
11# @DESCRIPTION: 11# @DESCRIPTION:
12# The distutils eclass defines phase functions for packages with build systems using Distutils 12# The distutils eclass defines phase functions for packages with build systems using Distutils.
13 13
14inherit multilib python 14inherit multilib python
15 15
16case "${EAPI:-0}" in 16case "${EAPI:-0}" in
17 0|1) 17 0|1)
18 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm 18 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
19 ;; 19 ;;
20 *) 20 *)
21 EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm 21 EXPORT_FUNCTIONS src_prepare src_compile src_install pkg_postinst pkg_postrm
22 ;; 22 ;;
23esac 23esac
24 24
25if [[ -z "${PYTHON_DEPEND}" ]]; then 25if [[ -z "$(declare -p PYTHON_DEPEND 2> /dev/null)" ]]; then
26 DEPEND="virtual/python" 26 DEPEND="dev-lang/python"
27 RDEPEND="${DEPEND}" 27 RDEPEND="${DEPEND}"
28fi 28fi
29 29
30if has "${EAPI:-0}" 0 1 2; then 30# 'python' variable is deprecated. Use PYTHON() instead.
31if has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
31 python="python" 32 python="python"
32else 33else
33 # Use "$(PYTHON)" or "$(PYTHON -A)" instead of "${python}".
34 python="die" 34 python="die"
35fi 35fi
36 36
37# @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES 37# @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES
38# @DESCRIPTION: 38# @DESCRIPTION:
81# @ECLASS-VARIABLE: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS 81# @ECLASS-VARIABLE: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS
82# @DESCRIPTION: 82# @DESCRIPTION:
83# Set this to disable renaming of Python scripts containing versioned shebangs 83# Set this to disable renaming of Python scripts containing versioned shebangs
84# and generation of wrapper scripts. 84# and generation of wrapper scripts.
85 85
86# @ECLASS-VARIABLE: DISTUTILS_NONVERSIONED_PYTHON_SCRIPTS
87# @DESCRIPTION:
88# List of paths to Python scripts, relative to ${ED}, which are excluded from
89# renaming and generation of wrapper scripts.
90
86# @ECLASS-VARIABLE: DOCS 91# @ECLASS-VARIABLE: DOCS
87# @DESCRIPTION: 92# @DESCRIPTION:
88# Additional documentation files installed by distutils_src_install(). 93# Additional documentation files installed by distutils_src_install().
89 94
90_distutils_get_build_dir() { 95_distutils_get_build_dir() {
114 119
115# @FUNCTION: distutils_src_unpack 120# @FUNCTION: distutils_src_unpack
116# @DESCRIPTION: 121# @DESCRIPTION:
117# The distutils src_unpack function. This function is exported. 122# The distutils src_unpack function. This function is exported.
118distutils_src_unpack() { 123distutils_src_unpack() {
124 if ! has "${EAPI:-0}" 0 1; then
125 die "${FUNCNAME}() cannot be used in this EAPI"
126 fi
127
119 if [[ "${EBUILD_PHASE}" != "unpack" ]]; then 128 if [[ "${EBUILD_PHASE}" != "unpack" ]]; then
120 die "${FUNCNAME}() can be used only in src_unpack() phase" 129 die "${FUNCNAME}() can be used only in src_unpack() phase"
121 fi 130 fi
122 131
123 unpack ${A} 132 unpack ${A}
124 cd "${S}" 133 cd "${S}"
125 134
126 has "${EAPI:-0}" 0 1 && distutils_src_prepare 135 distutils_src_prepare
127} 136}
128 137
129# @FUNCTION: distutils_src_prepare 138# @FUNCTION: distutils_src_prepare
130# @DESCRIPTION: 139# @DESCRIPTION:
131# The distutils src_prepare function. This function is exported. 140# The distutils src_prepare function. This function is exported.
163distutils_src_compile() { 172distutils_src_compile() {
164 if [[ "${EBUILD_PHASE}" != "compile" ]]; then 173 if [[ "${EBUILD_PHASE}" != "compile" ]]; then
165 die "${FUNCNAME}() can be used only in src_compile() phase" 174 die "${FUNCNAME}() can be used only in src_compile() phase"
166 fi 175 fi
167 176
177 _python_set_color_variables
178
168 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 179 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
169 distutils_building() { 180 distutils_building() {
170 _distutils_hook pre 181 _distutils_hook pre
171 182
172 echo "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" 183 echo ${_BOLD}"$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
173 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?" 184 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
174 185
175 _distutils_hook post 186 _distutils_hook post
176 } 187 }
177 python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_building "$@" 188 python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_building "$@"
178 else 189 else
179 echo "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" 190 echo ${_BOLD}"$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
180 "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed" 191 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
192 fi
193}
194
195_distutils_src_test_hook() {
196 if [[ "$#" -ne 1 ]]; then
197 die "${FUNCNAME}() requires 1 arguments"
198 fi
199
200 if [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
201 return
202 fi
203
204 if [[ "$(type -t "distutils_src_test_pre_hook")" == "function" ]]; then
205 eval "python_execute_$1_pre_hook() {
206 distutils_src_test_pre_hook
207 }"
208 fi
209
210 if [[ "$(type -t "distutils_src_test_post_hook")" == "function" ]]; then
211 eval "python_execute_$1_post_hook() {
212 distutils_src_test_post_hook
213 }"
181 fi 214 fi
182} 215}
183 216
184# @FUNCTION: distutils_src_test 217# @FUNCTION: distutils_src_test
185# @DESCRIPTION: 218# @DESCRIPTION:
186# The distutils src_test function. This function is exported, when DISTUTILS_SRC_TEST variable is set. 219# The distutils src_test function. This function is exported, when DISTUTILS_SRC_TEST variable is set.
220# In ebuilds of packages supporting installation for multiple versions of Python, this function
221# calls distutils_src_test_pre_hook() and distutils_src_test_post_hook(), if they are defined.
187distutils_src_test() { 222distutils_src_test() {
223 _python_set_color_variables
224
188 if [[ "${DISTUTILS_SRC_TEST}" == "setup.py" ]]; then 225 if [[ "${DISTUTILS_SRC_TEST}" == "setup.py" ]]; then
189 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 226 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
190 distutils_testing() { 227 distutils_testing() {
228 _distutils_hook pre
229
191 echo PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" 230 echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
192 PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" 231 PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
232
233 _distutils_hook post
193 } 234 }
194 python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_testing "$@" 235 python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_testing "$@"
195 else 236 else
196 echo PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed" 237 echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
197 PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed" 238 PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
198 fi 239 fi
199 elif [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then 240 elif [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
241 _distutils_src_test_hook nosetests
242
200 python_execute_nosetests -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@" 243 python_execute_nosetests -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@"
201 elif [[ "${DISTUTILS_SRC_TEST}" == "py.test" ]]; then 244 elif [[ "${DISTUTILS_SRC_TEST}" == "py.test" ]]; then
245 _distutils_src_test_hook py.test
246
202 python_execute_py.test -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@" 247 python_execute_py.test -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@"
203 # trial requires an argument, which is usually equal to "${PN}". 248 # trial requires an argument, which is usually equal to "${PN}".
204 elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then 249 elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then
205 local trial_arguments 250 local trial_arguments
206 if [[ "${DISTUTILS_SRC_TEST}" == "trial "* ]]; then 251 if [[ "${DISTUTILS_SRC_TEST}" == "trial "* ]]; then
207 trial_arguments="${DISTUTILS_SRC_TEST#trial }" 252 trial_arguments="${DISTUTILS_SRC_TEST#trial }"
208 else 253 else
209 trial_arguments="${PN}" 254 trial_arguments="${PN}"
210 fi 255 fi
211 256
257 _distutils_src_test_hook trial
258
212 python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${trial_arguments} "$@" 259 python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${trial_arguments} "$@"
213 else 260 else
214 die "'DISTUTILS_SRC_TEST' variable has unsupported value '${DISTUTILS_SRC_TEST}'" 261 die "'DISTUTILS_SRC_TEST' variable has unsupported value '${DISTUTILS_SRC_TEST}'"
215 fi 262 fi
216} 263}
225distutils_src_install() { 272distutils_src_install() {
226 if [[ "${EBUILD_PHASE}" != "install" ]]; then 273 if [[ "${EBUILD_PHASE}" != "install" ]]; then
227 die "${FUNCNAME}() can be used only in src_install() phase" 274 die "${FUNCNAME}() can be used only in src_install() phase"
228 fi 275 fi
229 276
277 _python_initialize_prefix_variables
278 _python_set_color_variables
279
230 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 280 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
231 if [[ -z "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" && "${BASH_VERSINFO[0]}" -ge 4 ]]; then 281 if [[ -z "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" && "${BASH_VERSINFO[0]}" -ge 4 ]]; then
232 declare -A wrapper_scripts=() 282 declare -A wrapper_scripts=()
233 283
234 rename_scripts_with_versioned_shebangs() { 284 rename_scripts_with_versioned_shebangs() {
235 if [[ -d "${D}usr/bin" ]]; then 285 if [[ -d "${ED}usr/bin" ]]; then
236 cd "${D}usr/bin" 286 cd "${ED}usr/bin"
237 287
238 local file 288 local nonversioned_file file
239 for file in *; do 289 for file in *; do
240 if [[ -f "${file}" && ! "${file}" =~ [[:digit:]]+\.[[:digit:]]+$ && "$(head -n1 "${file}")" =~ ^'#!'.*python[[:digit:]]+\.[[:digit:]]+ ]]; then 290 if [[ -f "${file}" && ! "${file}" =~ [[:digit:]]+\.[[:digit:]](-jython)?+$ && "$(head -n1 "${file}")" =~ ^'#!'.*(python|jython-)[[:digit:]]+\.[[:digit:]]+ ]]; then
291 for nonversioned_file in "${DISTUTILS_NONVERSIONED_PYTHON_SCRIPTS[@]}"; do
292 [[ "${nonversioned_file}" == "/usr/bin/${file}" ]] && continue 2
293 done
241 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed" 294 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
242 wrapper_scripts+=(["${D}usr/bin/${file}"]=) 295 wrapper_scripts+=(["${ED}usr/bin/${file}"]=)
243 fi 296 fi
244 done 297 done
245 fi 298 fi
246 } 299 }
247 fi 300 fi
248 301
249 distutils_installation() { 302 distutils_installation() {
250 _distutils_hook pre 303 _distutils_hook pre
251 304
252 echo "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --root="${D}" --no-compile "$@" 305 echo ${_BOLD}"$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --root="${D}" --no-compile "$@"${_NORMAL}
253 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --root="${D}" --no-compile "$@" || return "$?" 306 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --root="${D}" --no-compile "$@" || return "$?"
254 307
255 if [[ -z "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" && "${BASH_VERSINFO[0]}" -ge 4 ]]; then 308 if [[ -z "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" && "${BASH_VERSINFO[0]}" -ge 4 ]]; then
256 rename_scripts_with_versioned_shebangs 309 rename_scripts_with_versioned_shebangs
257 fi 310 fi
266 unset wrapper_scripts 319 unset wrapper_scripts
267 else 320 else
268 # Mark the package to be rebuilt after a Python upgrade. 321 # Mark the package to be rebuilt after a Python upgrade.
269 python_need_rebuild 322 python_need_rebuild
270 323
271 echo "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" 324 echo ${_BOLD}"$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
272 "$(PYTHON -A)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed" 325 "$(PYTHON)" setup.py "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
273 fi 326 fi
274 327
275 if [[ -e "${D}usr/local" ]]; then 328 if [[ -e "${ED}usr/local" ]]; then
276 die "Illegal installation into /usr/local" 329 die "Illegal installation into /usr/local"
277 fi 330 fi
278 331
279 local default_docs 332 local default_docs
280 default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO" 333 default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO"
298distutils_pkg_postinst() { 351distutils_pkg_postinst() {
299 if [[ "${EBUILD_PHASE}" != "postinst" ]]; then 352 if [[ "${EBUILD_PHASE}" != "postinst" ]]; then
300 die "${FUNCNAME}() can be used only in pkg_postinst() phase" 353 die "${FUNCNAME}() can be used only in pkg_postinst() phase"
301 fi 354 fi
302 355
356 _python_initialize_prefix_variables
357
303 local pylibdir pymod 358 local pylibdir pymod
304 if [[ -z "${PYTHON_MODNAME}" ]]; then 359 if [[ -z "${PYTHON_MODNAME}" ]]; then
305 for pylibdir in "${ROOT}"/usr/$(get_libdir)/python*; do 360 for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"/usr/share/jython-*/Lib; do
306 if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then 361 if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
307 PYTHON_MODNAME="${PN}" 362 PYTHON_MODNAME="${PN}"
308 fi 363 fi
309 done 364 done
310 fi 365 fi
327distutils_pkg_postrm() { 382distutils_pkg_postrm() {
328 if [[ "${EBUILD_PHASE}" != "postrm" ]]; then 383 if [[ "${EBUILD_PHASE}" != "postrm" ]]; then
329 die "${FUNCNAME}() can be used only in pkg_postrm() phase" 384 die "${FUNCNAME}() can be used only in pkg_postrm() phase"
330 fi 385 fi
331 386
387 _python_initialize_prefix_variables
388
332 local pylibdir pymod 389 local pylibdir pymod
333 if [[ -z "${PYTHON_MODNAME}" ]]; then 390 if [[ -z "${PYTHON_MODNAME}" ]]; then
334 for pylibdir in "${ROOT}"/usr/$(get_libdir)/python*; do 391 for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"/usr/share/jython-*/Lib; do
335 if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then 392 if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
336 PYTHON_MODNAME="${PN}" 393 PYTHON_MODNAME="${PN}"
337 fi 394 fi
338 done 395 done
339 fi 396 fi
341 if [[ -n "${PYTHON_MODNAME}" ]]; then 398 if [[ -n "${PYTHON_MODNAME}" ]]; then
342 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 399 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
343 python_mod_cleanup ${PYTHON_MODNAME} 400 python_mod_cleanup ${PYTHON_MODNAME}
344 else 401 else
345 for pymod in ${PYTHON_MODNAME}; do 402 for pymod in ${PYTHON_MODNAME}; do
346 for pylibdir in "${ROOT}"/usr/$(get_libdir)/python*; do 403 for pylibdir in "${EROOT}"usr/$(get_libdir)/python*; do
347 if [[ -d "${pylibdir}/site-packages/${pymod}" ]]; then 404 if [[ -d "${pylibdir}/site-packages/${pymod}" ]]; then
348 python_mod_cleanup "${pylibdir#${ROOT}}/site-packages/${pymod}" 405 python_mod_cleanup "${pylibdir#${EROOT%/}}/site-packages/${pymod}"
349 fi 406 fi
350 done 407 done
351 done 408 done
352 fi 409 fi
353 else 410 else
357 414
358# @FUNCTION: distutils_python_version 415# @FUNCTION: distutils_python_version
359# @DESCRIPTION: 416# @DESCRIPTION:
360# Deprecated wrapper function for deprecated python_version(). 417# Deprecated wrapper function for deprecated python_version().
361distutils_python_version() { 418distutils_python_version() {
362 if ! has "${EAPI:-0}" 0 1 2; then 419 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
363 eerror "Use PYTHON() and/or python_get_*() instead of ${FUNCNAME}()." 420 eerror "Use PYTHON() and/or python_get_*() instead of ${FUNCNAME}()."
364 die "${FUNCNAME}() cannot be used in this EAPI" 421 die "${FUNCNAME}() cannot be used in this EAPI"
365 fi 422 fi
366 423
424 _python_set_color_variables
425
426 eerror
427 eerror "${_RED}Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01.${_NORMAL}"
428 eerror "${_RED}Use PYTHON() instead of python variable. Use python_get_*() instead of PYVER* variables.${_NORMAL}"
429 eerror
430
367 python_version 431 python_version
368} 432}
369 433
370# @FUNCTION: distutils_python_tkinter 434# @FUNCTION: distutils_python_tkinter
371# @DESCRIPTION: 435# @DESCRIPTION:
372# Deprecated wrapper function for python_tkinter_exists(). 436# Deprecated wrapper function for deprecated python_tkinter_exists().
373distutils_python_tkinter() { 437distutils_python_tkinter() {
374 if ! has "${EAPI:-0}" 0 1 2; then 438 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
375 eerror "Use python_tkinter_exists() instead of ${FUNCNAME}()." 439 eerror "Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}()."
376 die "${FUNCNAME}() cannot be used in this EAPI" 440 die "${FUNCNAME}() cannot be used in this EAPI"
377 fi 441 fi
378 442
443 _python_set_color_variables
444
445 eerror
446 eerror "${_RED}Deprecation Warning: ${FUNCNAME}() is deprecated and will be banned on 2010-07-01.${_NORMAL}"
447 eerror "${_RED}Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}().${_NORMAL}"
448 eerror
449
379 python_tkinter_exists 450 python_tkinter_exists
380} 451}

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.74

  ViewVC Help
Powered by ViewVC 1.1.20