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

Diff of /eclass/python.eclass

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

Revision 1.125 Revision 1.161
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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/python.eclass,v 1.125 2011/07/08 07:47:30 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.161 2012/11/24 21:07:14 mgorny Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Gentoo Python Project <python@gentoo.org> 7# Gentoo Python Project <python@gentoo.org>
8# @BLURB: Eclass for Python packages 8# @BLURB: Eclass for Python packages
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The python eclass contains miscellaneous, useful functions for Python packages. 10# The python eclass contains miscellaneous, useful functions for Python packages.
11 11
12if [[ ${_PYTHON_UTILS_R1} ]]; then
13 die 'python.eclass can not be used with python-r1 suite eclasses.'
14fi
15
16# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
17if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 18 inherit multilib
19fi
13 20
21# Export pkg_setup every time to avoid issues with eclass inheritance order.
22if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
23 EXPORT_FUNCTIONS pkg_setup
24fi
25
26# Avoid processing this eclass more than once.
27if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
28_PYTHON_ECLASS_INHERITED="1"
29
14if ! has "${EAPI:-0}" 0 1 2 3; then 30if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 31 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 32fi
17 33
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 34_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) 35_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 36_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
37_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9)
21_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]}) 38_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
22 39
23# ================================================================================================ 40# ================================================================================================
24# ===================================== HANDLING OF METADATA ===================================== 41# ===================================== HANDLING OF METADATA =====================================
25# ================================================================================================ 42# ================================================================================================
26 43
… …
58 pattern="$2" 75 pattern="$2"
59 76
60 if [[ "${pattern}" == *"-cpython" ]]; then 77 if [[ "${pattern}" == *"-cpython" ]]; then
61 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]] 78 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]]
62 elif [[ "${pattern}" == *"-jython" ]]; then 79 elif [[ "${pattern}" == *"-jython" ]]; then
80 [[ "${PYTHON_ABI}" == ${pattern} ]]
81 elif [[ "${pattern}" == *"-pypy-"* ]]; then
63 [[ "${PYTHON_ABI}" == ${pattern} ]] 82 [[ "${PYTHON_ABI}" == ${pattern} ]]
64 else 83 else
65 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 84 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
66 [[ "${PYTHON_ABI}" == ${pattern} ]] 85 [[ "${PYTHON_ABI}" == ${pattern} ]]
67 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 86 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
68 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]] 87 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
88 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
89 [[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
69 else 90 else
70 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'" 91 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'"
71 fi 92 fi
72 fi 93 fi
73 else 94 else
… …
81 102
82 return 1 103 return 1
83 fi 104 fi
84} 105}
85 106
107_python_implementation() {
108 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
109 return 0
110 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
111 return 0
112 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
113 return 0
114 else
115 return 1
116 fi
117}
118
86_python_package_supporting_installation_for_multiple_python_abis() { 119_python_package_supporting_installation_for_multiple_python_abis() {
87 if has "${EAPI:-0}" 0 1 2 3 4; then
88 if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then 120 [[ -n "${SUPPORT_PYTHON_ABIS}" ]]
89 return 0
90 else
91 return 1
92 fi
93 else
94 die "${FUNCNAME}(): Support for EAPI=\"${EAPI}\" not implemented"
95 fi
96} 121}
97 122
98# @ECLASS-VARIABLE: PYTHON_DEPEND 123# @ECLASS-VARIABLE: PYTHON_DEPEND
99# @DESCRIPTION: 124# @DESCRIPTION:
100# Specification of dependency on dev-lang/python. 125# Specification of dependency on dev-lang/python.
… …
226 else 251 else
227 die "Invalid syntax of PYTHON_DEPEND" 252 die "Invalid syntax of PYTHON_DEPEND"
228 fi 253 fi
229} 254}
230 255
256if _python_implementation; then
231DEPEND=">=app-admin/eselect-python-20091230" 257 DEPEND=">=app-admin/eselect-python-20091230"
232RDEPEND="${DEPEND}" 258 RDEPEND="${DEPEND}"
259 PDEPEND="app-admin/python-updater"
260fi
233 261
234if [[ -n "${PYTHON_DEPEND}" ]]; then 262if [[ -n "${PYTHON_DEPEND}" ]]; then
235 _python_parse_PYTHON_DEPEND 263 _python_parse_PYTHON_DEPEND
236else 264else
237 _PYTHON_ATOMS=("dev-lang/python") 265 _PYTHON_ATOMS=("dev-lang/python")
… …
276 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" 304 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
277 fi 305 fi
278 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then 306 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
279 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" 307 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
280 fi 308 fi
281 DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 309 DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
282 RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 310 RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
283 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY 311 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
284fi 312fi
285 313
286unset _PYTHON_ATOMS 314unset _PYTHON_ATOMS
287 315
288# ================================================================================================ 316# ================================================================================================
289# =================================== MISCELLANEOUS FUNCTIONS ==================================== 317# =================================== MISCELLANEOUS FUNCTIONS ====================================
290# ================================================================================================ 318# ================================================================================================
291
292_python_implementation() {
293 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
294 return 0
295 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
296 return 0
297 else
298 return 1
299 fi
300}
301 319
302_python_abi-specific_local_scope() { 320_python_abi-specific_local_scope() {
303 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 321 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
304} 322}
305 323
… …
377 _CYAN= 395 _CYAN=
378 _NORMAL= 396 _NORMAL=
379 fi 397 fi
380} 398}
381 399
382unset PYTHON_PKG_SETUP_EXECUTED
383
384_python_check_python_pkg_setup_execution() { 400_python_check_python_pkg_setup_execution() {
385 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 401 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
386 402
387 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 403 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
388 die "python_pkg_setup() not called" 404 die "python_pkg_setup() not called"
… …
456 fi 472 fi
457 473
458 PYTHON_PKG_SETUP_EXECUTED="1" 474 PYTHON_PKG_SETUP_EXECUTED="1"
459} 475}
460 476
461if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
462 EXPORT_FUNCTIONS pkg_setup
463fi
464
465_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|python)' 477_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
466 478
467# @FUNCTION: python_convert_shebangs 479# @FUNCTION: python_convert_shebangs
468# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 480# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
469# @DESCRIPTION: 481# @DESCRIPTION:
470# Convert shebangs in specified files. Directories can be specified only with --recursive option. 482# Convert shebangs in specified files. Directories can be specified only with --recursive option.
471python_convert_shebangs() { 483python_convert_shebangs() {
472 _python_check_python_pkg_setup_execution 484 _python_check_python_pkg_setup_execution
473 485
474 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 486 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
475 487
476 while (($#)); do 488 while (($#)); do
477 case "$1" in 489 case "$1" in
478 -r|--recursive) 490 -r|--recursive)
479 recursive="1" 491 recursive="1"
… …
534 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 546 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
535 547
536 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 548 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
537 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue 549 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
538 550
551 shebangs_converted="1"
552
539 if [[ "${quiet}" == "0" ]]; then 553 if [[ "${quiet}" == "0" ]]; then
540 einfo "Converting shebang in '${file}'" 554 einfo "Converting shebang in '${file}'"
541 fi 555 fi
542 556
543 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 557 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
558 fi
559 done
560
561 if [[ "${shebangs_converted}" == "0" ]]; then
562 ewarn "${FUNCNAME}(): Python scripts not found"
544 fi 563 fi
564}
565
566# @FUNCTION: python_clean_py-compile_files
567# @USAGE: [-q|--quiet]
568# @DESCRIPTION:
569# Clean py-compile files to disable byte-compilation.
570python_clean_py-compile_files() {
571 _python_check_python_pkg_setup_execution
572
573 local file files=() quiet="0"
574
575 while (($#)); do
576 case "$1" in
577 -q|--quiet)
578 quiet="1"
579 ;;
580 -*)
581 die "${FUNCNAME}(): Unrecognized option '$1'"
582 ;;
583 *)
584 die "${FUNCNAME}(): Invalid usage"
585 ;;
586 esac
587 shift
588 done
589
590 while read -d $'\0' -r file; do
591 files+=("${file#./}")
592 done < <(find -name py-compile -type f -print0)
593
594 for file in "${files[@]}"; do
595 if [[ "${quiet}" == "0" ]]; then
596 einfo "Cleaning '${file}' file"
597 fi
598 echo "#!/bin/sh" > "${file}"
545 done 599 done
546} 600}
547 601
548# @FUNCTION: python_clean_installation_image 602# @FUNCTION: python_clean_installation_image
549# @USAGE: [-q|--quiet] 603# @USAGE: [-q|--quiet]
… …
692 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then 746 if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then
693 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install 747 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
694 fi 748 fi
695fi 749fi
696 750
697if has "${EAPI:-0}" 0 1 2 3 4; then
698 unset PYTHON_ABIS 751unset PYTHON_ABIS
699fi
700 752
701_python_calculate_PYTHON_ABIS() { 753_python_calculate_PYTHON_ABIS() {
702 if ! _python_package_supporting_installation_for_multiple_python_abis; then 754 if ! _python_package_supporting_installation_for_multiple_python_abis; then
703 die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 755 die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
704 fi 756 fi
705 757
706 _python_initial_sanity_checks 758 _python_initial_sanity_checks
707 759
708 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3 4; then 760 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]]; then
709 local PYTHON_ABI 761 local PYTHON_ABI
710 762
711 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then 763 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
712 local cpython_enabled="0" 764 local cpython_enabled="0"
713 765
… …
787 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 839 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
788 fi 840 fi
789 else 841 else
790 python3_version="" 842 python3_version=""
791 fi 843 fi
844 fi
845
846 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
847 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
848 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
849 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
850 eerror " dev-lang/python:${PYTHON_ABI}"
851 fi
852 done
853 die "No supported version of CPython installed"
792 fi 854 fi
793 855
794 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 856 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
795 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink" 857 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
796 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 858 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
… …
954 python_default_function() { 1016 python_default_function() {
955 emake "$@" 1017 emake "$@"
956 } 1018 }
957 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1019 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
958 python_default_function() { 1020 python_default_function() {
1021 # Stolen from portage's _eapi0_src_test()
1022 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
959 if emake -j1 -n check &> /dev/null; then 1023 if ${emake_cmd} -j1 -n check &> /dev/null; then
960 emake -j1 check "$@" 1024 ${emake_cmd} -j1 check "$@"
961 elif emake -j1 -n test &> /dev/null; then 1025 elif ${emake_cmd} -j1 -n test &> /dev/null; then
962 emake -j1 test "$@" 1026 ${emake_cmd} -j1 test "$@"
963 fi 1027 fi
964 } 1028 }
965 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1029 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
966 python_default_function() { 1030 python_default_function() {
967 emake DESTDIR="${D}" install "$@" 1031 emake DESTDIR="${D}" install "$@"
… …
1224import os 1288import os
1225import re 1289import re
1226import subprocess 1290import subprocess
1227import sys 1291import sys
1228 1292
1229cpython_re = re.compile(r"^python(\d+\.\d+)$") 1293cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1294jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1295pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1296cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1230jython_re = re.compile(r"^jython(\d+\.\d+)$") 1297jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1298pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1231python_shebang_re = re.compile(r"^#! *(${EPREFIX}/usr/bin/python|(${EPREFIX})?/usr/bin/env +(${EPREFIX}/usr/bin/)?python)") 1299cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1300python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1232python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1301python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1233 1302
1234def get_PYTHON_ABI(EPYTHON): 1303pypy_versions_mapping = {
1235 cpython_matched = cpython_re.match(EPYTHON) 1304 "1.5": "2.7",
1236 jython_matched = jython_re.match(EPYTHON) 1305 "1.6": "2.7",
1306 "1.7": "2.7",
1307 "1.8": "2.7",
1308 "1.9": "2.7",
1309}
1310
1311def get_PYTHON_ABI(python_interpreter):
1312 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1313 jython_matched = jython_interpreter_re.match(python_interpreter)
1314 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1237 if cpython_matched is not None: 1315 if cpython_matched is not None:
1238 PYTHON_ABI = cpython_matched.group(1) 1316 PYTHON_ABI = cpython_matched.group(1)
1239 elif jython_matched is not None: 1317 elif jython_matched is not None:
1240 PYTHON_ABI = jython_matched.group(1) + "-jython" 1318 PYTHON_ABI = jython_matched.group(1) + "-jython"
1319 elif pypy_matched is not None:
1320 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1241 else: 1321 else:
1242 PYTHON_ABI = None 1322 PYTHON_ABI = None
1243 return PYTHON_ABI 1323 return PYTHON_ABI
1244 1324
1325def get_python_interpreter(PYTHON_ABI):
1326 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1327 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1328 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1329 if cpython_matched is not None:
1330 python_interpreter = "python" + cpython_matched.group(1)
1331 elif jython_matched is not None:
1332 python_interpreter = "jython" + jython_matched.group(1)
1333 elif pypy_matched is not None:
1334 python_interpreter = "pypy-c" + pypy_matched.group(1)
1335 else:
1336 python_interpreter = None
1337 return python_interpreter
1338
1245EOF 1339EOF
1246 if [[ "$?" != "0" ]]; then 1340 if [[ "$?" != "0" ]]; then
1247 die "${FUNCNAME}(): Generation of '$1' failed" 1341 die "${FUNCNAME}(): Generation of '$1' failed"
1248 fi 1342 fi
1249 if [[ "${respect_EPYTHON}" == "1" ]]; then 1343 if [[ "${respect_EPYTHON}" == "1" ]]; then
1250 cat << EOF >> "${file}" 1344 cat << EOF >> "${file}"
1251EPYTHON = os.environ.get("EPYTHON") 1345python_interpreter = os.environ.get("EPYTHON")
1252if EPYTHON: 1346if python_interpreter:
1253 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1347 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1254 if PYTHON_ABI is None: 1348 if PYTHON_ABI is None:
1255 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1349 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1256 sys.exit(1) 1350 sys.exit(1)
1257else: 1351else:
1258 try: 1352 try:
1259 environment = os.environ.copy() 1353 environment = os.environ.copy()
1260 environment["ROOT"] = "/" 1354 environment["ROOT"] = "/"
… …
1263 raise ValueError 1357 raise ValueError
1264 except (OSError, ValueError): 1358 except (OSError, ValueError):
1265 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1359 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1266 sys.exit(1) 1360 sys.exit(1)
1267 1361
1268 EPYTHON = eselect_process.stdout.read() 1362 python_interpreter = eselect_process.stdout.read()
1269 if not isinstance(EPYTHON, str): 1363 if not isinstance(python_interpreter, str):
1270 # Python 3 1364 # Python 3
1271 EPYTHON = EPYTHON.decode() 1365 python_interpreter = python_interpreter.decode()
1272 EPYTHON = EPYTHON.rstrip("\n") 1366 python_interpreter = python_interpreter.rstrip("\n")
1273 1367
1274 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1368 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1275 if PYTHON_ABI is None: 1369 if PYTHON_ABI is None:
1276 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1370 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1277 sys.exit(1) 1371 sys.exit(1)
1278 1372
1279wrapper_script_path = os.path.realpath(sys.argv[0]) 1373wrapper_script_path = os.path.realpath(sys.argv[0])
1280target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1374target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1281if not os.path.exists(target_executable_path): 1375if not os.path.exists(target_executable_path):
… …
1295 raise ValueError 1389 raise ValueError
1296except (OSError, ValueError): 1390except (OSError, ValueError):
1297 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1391 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1298 sys.exit(1) 1392 sys.exit(1)
1299 1393
1300EPYTHON = eselect_process.stdout.read() 1394python_interpreter = eselect_process.stdout.read()
1301if not isinstance(EPYTHON, str): 1395if not isinstance(python_interpreter, str):
1302 # Python 3 1396 # Python 3
1303 EPYTHON = EPYTHON.decode() 1397 python_interpreter = python_interpreter.decode()
1304EPYTHON = EPYTHON.rstrip("\n") 1398python_interpreter = python_interpreter.rstrip("\n")
1305 1399
1306PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1400PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1307if PYTHON_ABI is None: 1401if PYTHON_ABI is None:
1308 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1402 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1309 sys.exit(1) 1403 sys.exit(1)
1310 1404
1311wrapper_script_path = os.path.realpath(sys.argv[0]) 1405wrapper_script_path = os.path.realpath(sys.argv[0])
1312for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1406for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1313 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1407 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1314 if os.path.exists(target_executable_path): 1408 if os.path.exists(target_executable_path):
1315 break 1409 break
1316else: 1410else:
1317 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1411 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1318 sys.exit(1) 1412 sys.exit(1)
1413
1414python_interpreter = get_python_interpreter(PYTHON_ABI)
1415if python_interpreter is None:
1416 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1417 sys.exit(1)
1319EOF 1418EOF
1320 if [[ "$?" != "0" ]]; then 1419 if [[ "$?" != "0" ]]; then
1321 die "${FUNCNAME}(): Generation of '$1' failed" 1420 die "${FUNCNAME}(): Generation of '$1' failed"
1322 fi 1421 fi
1323 fi 1422 fi
1324 cat << EOF >> "${file}" 1423 cat << EOF >> "${file}"
1325 1424
1326target_executable = open(target_executable_path, "rb") 1425target_executable = open(target_executable_path, "rb")
1327target_executable_first_line = target_executable.readline() 1426target_executable_first_line = target_executable.readline()
1427target_executable.close()
1328if not isinstance(target_executable_first_line, str): 1428if not isinstance(target_executable_first_line, str):
1329 # Python 3 1429 # Python 3
1330 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1430 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1331 1431
1432options = []
1433python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1434if python_shebang_options_matched is not None:
1435 options = [python_shebang_options_matched.group(1)]
1436
1332python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1437cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1333target_executable.close()
1334 1438
1335if python_shebang_matched is not None: 1439if cpython_shebang_matched is not None:
1336 try: 1440 try:
1337 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1441 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1338 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1442 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1339 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1443 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1340 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1444 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1341 if python_verification_process.wait() != 0: 1445 if python_verification_process.wait() != 0:
1342 raise ValueError 1446 raise ValueError
… …
1347 python_verification_output = python_verification_output.decode() 1451 python_verification_output = python_verification_output.decode()
1348 1452
1349 if not python_verification_output_re.match(python_verification_output): 1453 if not python_verification_output_re.match(python_verification_output):
1350 raise ValueError 1454 raise ValueError
1351 1455
1352 if cpython_re.match(EPYTHON) is not None: 1456 if cpython_interpreter_re.match(python_interpreter) is not None:
1353 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1457 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1354 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1458 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1355 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1459 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1356 1460
1357 if hasattr(os, "execv"): 1461 if hasattr(os, "execv"):
1358 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1462 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1359 else: 1463 else:
1360 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1464 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1361 except (KeyboardInterrupt, SystemExit): 1465 except (KeyboardInterrupt, SystemExit):
1362 raise 1466 raise
1363 except: 1467 except:
1364 pass 1468 pass
1365 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1469 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
… …
1407 fi 1511 fi
1408 1512
1409 _python_check_python_pkg_setup_execution 1513 _python_check_python_pkg_setup_execution
1410 _python_initialize_prefix_variables 1514 _python_initialize_prefix_variables
1411 1515
1412 local b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=() 1516 local absolute_file b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=()
1413 1517
1414 while (($#)); do 1518 while (($#)); do
1415 case "$1" in 1519 case "$1" in
1416 -q|--quiet) 1520 -q|--quiet)
1417 quiet="1" 1521 quiet="1"
… …
1499 break 1603 break
1500 fi 1604 fi
1501 done 1605 done
1502 fi 1606 fi
1503 1607
1504 [[ "${version_executable}" == "0" || ! -x "${file}" ]] && continue 1608 [[ "${version_executable}" == "0" ]] && continue
1505 1609
1610 if [[ -L "${file}" ]]; then
1611 absolute_file="$(readlink "${file}")"
1612 if [[ "${absolute_file}" == /* ]]; then
1613 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file##/}"
1614 else
1615 if [[ "${file}" == */* ]]; then
1616 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file%/*}/${absolute_file}"
1617 else
1618 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file}"
1619 fi
1620 fi
1621 else
1622 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file}"
1623 fi
1624
1625 [[ ! -x "${absolute_file}" ]] && continue
1626
1506 shebang="$(head -n1 "${file}")" || die "Extraction of shebang from '${file}' failed" 1627 shebang="$(head -n1 "${absolute_file}")" || die "Extraction of shebang from '${absolute_file}' failed"
1507 1628
1508 if [[ "${version_executable}" == "2" ]]; then 1629 if [[ "${version_executable}" == "2" ]]; then
1509 wrapper_scripts+=("${ED}${file}") 1630 wrapper_scripts+=("${ED}${file}")
1510 elif [[ "${version_executable}" == "1" ]]; then 1631 elif [[ "${version_executable}" == "1" ]]; then
1511 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then 1632 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then
… …
1522 fi 1643 fi
1523 1644
1524 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed" 1645 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
1525 1646
1526 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then 1647 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then
1648 if [[ -L "${file}-${PYTHON_ABI}" ]]; then
1649 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${absolute_file}"
1650 else
1527 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}" 1651 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}"
1652 fi
1528 fi 1653 fi
1529 done 1654 done
1530 1655
1531 popd > /dev/null || die "popd failed" 1656 popd > /dev/null || die "popd failed"
1532 1657
1658 # This is per bug #390691, without the duplication refactor, and with
1659 # the 3-way structure per comment #6. This enable users with old
1660 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1661 # before coreutils can be upgraded).
1662 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1663 cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1533 if ROOT="/" has_version sys-apps/coreutils; then 1664 elif ROOT="/" has_version sys-apps/coreutils; then
1534 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1665 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1535 else 1666 else
1536 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1667 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1537 fi 1668 fi
1538 done 1669 done
… …
1557 stdout = sys.stdout.buffer 1688 stdout = sys.stdout.buffer
1558else: 1689else:
1559 # Python 2 1690 # Python 2
1560 stdout = sys.stdout 1691 stdout = sys.stdout
1561 1692
1693python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1562files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1694files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1695python_wrapper_scripts_file.close()
1563 1696
1564for file in sorted(files): 1697for file in sorted(files):
1565 stdout.write(file) 1698 stdout.write(file)
1566 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1699 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1567 1700
… …
1632 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1765 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1633 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1766 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1634} 1767}
1635 1768
1636# @FUNCTION: python_need_rebuild 1769# @FUNCTION: python_need_rebuild
1770# @DESCRIPTION:
1637# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1771# Mark current package for rebuilding by python-updater after
1638# switching of active version of Python. 1772# switching of active version of Python.
1639python_need_rebuild() { 1773python_need_rebuild() {
1640 if _python_package_supporting_installation_for_multiple_python_abis; then 1774 if _python_package_supporting_installation_for_multiple_python_abis; then
1641 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1775 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1642 fi 1776 fi
… …
1652 1786
1653# ================================================================================================ 1787# ================================================================================================
1654# ======================================= GETTER FUNCTIONS ======================================= 1788# ======================================= GETTER FUNCTIONS =======================================
1655# ================================================================================================ 1789# ================================================================================================
1656 1790
1657_PYTHON_ABI_EXTRACTION_COMMAND='import platform 1791_PYTHON_ABI_EXTRACTION_COMMAND=\
1792'import platform
1658import sys 1793import sys
1659sys.stdout.write(".".join(str(x) for x in sys.version_info[:2])) 1794sys.stdout.write(".".join(str(x) for x in sys.version_info[:2]))
1660if platform.system()[:4] == "Java": 1795if platform.system()[:4] == "Java":
1661 sys.stdout.write("-jython")' 1796 sys.stdout.write("-jython")
1797elif hasattr(platform, "python_implementation") and platform.python_implementation() == "PyPy":
1798 sys.stdout.write("-pypy-" + ".".join(str(x) for x in sys.pypy_version_info[:2]))'
1662 1799
1663_python_get_implementation() { 1800_python_get_implementation() {
1664 local ignore_invalid="0" 1801 local ignore_invalid="0"
1665 1802
1666 while (($#)); do 1803 while (($#)); do
… …
1688 1825
1689 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 1826 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
1690 echo "CPython" 1827 echo "CPython"
1691 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 1828 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
1692 echo "Jython" 1829 echo "Jython"
1830 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
1831 echo "PyPy"
1693 else 1832 else
1694 if [[ "${ignore_invalid}" == "0" ]]; then 1833 if [[ "${ignore_invalid}" == "0" ]]; then
1695 die "${FUNCNAME}(): Unrecognized Python ABI '$1'" 1834 die "${FUNCNAME}(): Unrecognized Python ABI '$1'"
1696 fi 1835 fi
1697 fi 1836 fi
… …
1806 else 1945 else
1807 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1946 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1808 python_interpreter="python${PYTHON_ABI}" 1947 python_interpreter="python${PYTHON_ABI}"
1809 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1948 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1810 python_interpreter="jython${PYTHON_ABI%-jython}" 1949 python_interpreter="jython${PYTHON_ABI%-jython}"
1950 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1951 python_interpreter="pypy-c${PYTHON_ABI#*-pypy-}"
1811 fi 1952 fi
1812 1953
1813 if [[ "${absolute_path_output}" == "1" ]]; then 1954 if [[ "${absolute_path_output}" == "1" ]]; then
1814 echo -n "${EPREFIX}/usr/bin/${python_interpreter}" 1955 echo -n "${EPREFIX}/usr/bin/${python_interpreter}"
1815 else 1956 else
… …
1908 if [[ "${EAPI:-0}" == "0" ]]; then 2049 if [[ "${EAPI:-0}" == "0" ]]; then
1909 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2050 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1910 echo "=dev-lang/python-${PYTHON_ABI}*" 2051 echo "=dev-lang/python-${PYTHON_ABI}*"
1911 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2052 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1912 echo "=dev-java/jython-${PYTHON_ABI%-jython}*" 2053 echo "=dev-java/jython-${PYTHON_ABI%-jython}*"
2054 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2055 echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*"
1913 fi 2056 fi
1914 else 2057 else
1915 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2058 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1916 echo "dev-lang/python:${PYTHON_ABI}" 2059 echo "dev-lang/python:${PYTHON_ABI}"
1917 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2060 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1918 echo "dev-java/jython:${PYTHON_ABI%-jython}" 2061 echo "dev-java/jython:${PYTHON_ABI%-jython}"
2062 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2063 echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}"
1919 fi 2064 fi
1920 fi 2065 fi
1921} 2066}
1922 2067
1923# @FUNCTION: python_get_includedir 2068# @FUNCTION: python_get_includedir
… …
1970 2115
1971 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2116 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1972 echo "${prefix}usr/include/python${PYTHON_ABI}" 2117 echo "${prefix}usr/include/python${PYTHON_ABI}"
1973 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2118 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1974 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include" 2119 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include"
2120 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2121 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/include"
1975 fi 2122 fi
1976} 2123}
1977 2124
1978# @FUNCTION: python_get_libdir 2125# @FUNCTION: python_get_libdir
1979# @USAGE: [-b|--base-path] [-f|--final-ABI] 2126# @USAGE: [-b|--base-path] [-f|--final-ABI]
1980# @DESCRIPTION: 2127# @DESCRIPTION:
1981# Print path to Python library directory. 2128# Print path to Python standard library directory.
1982# If --base-path option is specified, then path not prefixed with "/" is printed. 2129# If --base-path option is specified, then path not prefixed with "/" is printed.
1983# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2130# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
1984python_get_libdir() { 2131python_get_libdir() {
1985 _python_check_python_pkg_setup_execution 2132 _python_check_python_pkg_setup_execution
1986 2133
… …
2025 2172
2026 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2173 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2027 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}" 2174 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}"
2028 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2175 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2029 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib" 2176 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib"
2177 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2178 die "${FUNCNAME}(): PyPy has multiple standard library directories"
2030 fi 2179 fi
2031} 2180}
2032 2181
2033# @FUNCTION: python_get_sitedir 2182# @FUNCTION: python_get_sitedir
2034# @USAGE: [-b|--base-path] [-f|--final-ABI] 2183# @USAGE: [-b|--base-path] [-f|--final-ABI]
… …
2037# If --base-path option is specified, then path not prefixed with "/" is printed. 2186# If --base-path option is specified, then path not prefixed with "/" is printed.
2038# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2187# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2039python_get_sitedir() { 2188python_get_sitedir() {
2040 _python_check_python_pkg_setup_execution 2189 _python_check_python_pkg_setup_execution
2041 2190
2042 local final_ABI="0" options=() 2191 local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
2043 2192
2044 while (($#)); do 2193 while (($#)); do
2045 case "$1" in 2194 case "$1" in
2046 -b|--base-path) 2195 -b|--base-path)
2047 options+=("$1") 2196 base_path="1"
2048 ;; 2197 ;;
2049 -f|--final-ABI) 2198 -f|--final-ABI)
2050 final_ABI="1" 2199 final_ABI="1"
2051 options+=("$1")
2052 ;; 2200 ;;
2053 -*) 2201 -*)
2054 die "${FUNCNAME}(): Unrecognized option '$1'" 2202 die "${FUNCNAME}(): Unrecognized option '$1'"
2055 ;; 2203 ;;
2056 *) 2204 *)
2057 die "${FUNCNAME}(): Invalid usage" 2205 die "${FUNCNAME}(): Invalid usage"
2058 ;; 2206 ;;
2059 esac 2207 esac
2060 shift 2208 shift
2061 done 2209 done
2210
2211 if [[ "${base_path}" == "0" ]]; then
2212 prefix="/"
2213 fi
2062 2214
2063 if [[ "${final_ABI}" == "1" ]]; then 2215 if [[ "${final_ABI}" == "1" ]]; then
2064 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2216 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2065 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 2217 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2066 fi 2218 fi
2219 PYTHON_ABI="$(PYTHON -f --ABI)"
2067 else 2220 else
2068 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2221 if _python_package_supporting_installation_for_multiple_python_abis; then
2222 if ! _python_abi-specific_local_scope; then
2069 die "${FUNCNAME}() should be used in ABI-specific local scope" 2223 die "${FUNCNAME}() should be used in ABI-specific local scope"
2070 fi 2224 fi
2225 else
2226 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2071 fi 2227 fi
2228 fi
2072 2229
2073 echo "$(python_get_libdir "${options[@]}")/site-packages" 2230 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2231 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}/site-packages"
2232 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2233 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib/site-packages"
2234 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2235 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/site-packages"
2236 fi
2074} 2237}
2075 2238
2076# @FUNCTION: python_get_library 2239# @FUNCTION: python_get_library
2077# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option] 2240# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option]
2078# @DESCRIPTION: 2241# @DESCRIPTION:
… …
2135 else 2298 else
2136 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)" 2299 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)"
2137 fi 2300 fi
2138 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2301 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2139 die "${FUNCNAME}(): Jython does not have shared library" 2302 die "${FUNCNAME}(): Jython does not have shared library"
2303 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2304 die "${FUNCNAME}(): PyPy does not have shared library"
2140 fi 2305 fi
2141} 2306}
2142 2307
2143# @FUNCTION: python_get_version 2308# @FUNCTION: python_get_version
2144# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro] 2309# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
… …
2217 else 2382 else
2218 echo "${language_version}" 2383 echo "${language_version}"
2219 fi 2384 fi
2220 else 2385 else
2221 if [[ "${full}" == "1" ]]; then 2386 if [[ "${full}" == "1" ]]; then
2222 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))" 2387 python_command="import sys; print('.'.join(str(x) for x in getattr(sys, 'pypy_version_info', sys.version_info)[:3]))"
2223 elif [[ "${major}" == "1" ]]; then 2388 elif [[ "${major}" == "1" ]]; then
2224 python_command="from sys import version_info; print(version_info[0])" 2389 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[0])"
2225 elif [[ "${minor}" == "1" ]]; then 2390 elif [[ "${minor}" == "1" ]]; then
2226 python_command="from sys import version_info; print(version_info[1])" 2391 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[1])"
2227 elif [[ "${micro}" == "1" ]]; then 2392 elif [[ "${micro}" == "1" ]]; then
2228 python_command="from sys import version_info; print(version_info[2])" 2393 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[2])"
2229 else 2394 else
2230 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then 2395 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2231 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2396 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2232 echo "${PYTHON_ABI}" 2397 echo "${PYTHON_ABI}"
2233 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2398 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2234 echo "${PYTHON_ABI%-jython}" 2399 echo "${PYTHON_ABI%-jython}"
2400 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2401 echo "${PYTHON_ABI#*-pypy-}"
2235 fi 2402 fi
2236 return 2403 return
2237 fi 2404 fi
2238 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))" 2405 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2239 fi 2406 fi
… …
2308_python_test_hook() { 2475_python_test_hook() {
2309 if [[ "$#" -ne 1 ]]; then 2476 if [[ "$#" -ne 1 ]]; then
2310 die "${FUNCNAME}() requires 1 argument" 2477 die "${FUNCNAME}() requires 1 argument"
2311 fi 2478 fi
2312 2479
2313 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2480 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2314 "${FUNCNAME[3]}_$1_hook" 2481 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2315 fi 2482 fi
2316} 2483}
2317 2484
2318# @FUNCTION: python_execute_nosetests 2485# @FUNCTION: python_execute_nosetests
2319# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2486# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
… …
2353 python_test_function() { 2520 python_test_function() {
2354 local evaluated_PYTHONPATH 2521 local evaluated_PYTHONPATH
2355 2522
2356 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2523 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2357 2524
2358 _python_test_hook pre 2525 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2359 2526
2360 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2527 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2361 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2528 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2362 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2529 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2363 else 2530 else
2364 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2531 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2365 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2532 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2366 fi 2533 fi
2367 2534
2368 _python_test_hook post 2535 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2369 } 2536 }
2370 if _python_package_supporting_installation_for_multiple_python_abis; then 2537 if _python_package_supporting_installation_for_multiple_python_abis; then
2371 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2538 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2372 else 2539 else
2373 if [[ -n "${separate_build_dirs}" ]]; then 2540 if [[ -n "${separate_build_dirs}" ]]; then
… …
2417 python_test_function() { 2584 python_test_function() {
2418 local evaluated_PYTHONPATH 2585 local evaluated_PYTHONPATH
2419 2586
2420 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2587 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2421 2588
2422 _python_test_hook pre 2589 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2423 2590
2424 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2591 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2425 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2592 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2426 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2593 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2427 else 2594 else
2428 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2595 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2429 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2596 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2430 fi 2597 fi
2431 2598
2432 _python_test_hook post 2599 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2433 } 2600 }
2434 if _python_package_supporting_installation_for_multiple_python_abis; then 2601 if _python_package_supporting_installation_for_multiple_python_abis; then
2435 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2602 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2436 else 2603 else
2437 if [[ -n "${separate_build_dirs}" ]]; then 2604 if [[ -n "${separate_build_dirs}" ]]; then
… …
2481 python_test_function() { 2648 python_test_function() {
2482 local evaluated_PYTHONPATH 2649 local evaluated_PYTHONPATH
2483 2650
2484 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2651 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2485 2652
2486 _python_test_hook pre 2653 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2487 2654
2488 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2655 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2489 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2656 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2490 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2657 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2491 else 2658 else
2492 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2659 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2493 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2660 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2494 fi 2661 fi
2495 2662
2496 _python_test_hook post 2663 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2497 } 2664 }
2498 if _python_package_supporting_installation_for_multiple_python_abis; then 2665 if _python_package_supporting_installation_for_multiple_python_abis; then
2499 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2666 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2500 else 2667 else
2501 if [[ -n "${separate_build_dirs}" ]]; then 2668 if [[ -n "${separate_build_dirs}" ]]; then
… …
2538 fi 2705 fi
2539 2706
2540 export PYTHONDONTWRITEBYTECODE="1" 2707 export PYTHONDONTWRITEBYTECODE="1"
2541} 2708}
2542 2709
2710_python_vecho() {
2711 [[ -z ${PORTAGE_VERBOSE} ]] || echo "$@"
2712}
2713
2543_python_clean_compiled_modules() { 2714_python_clean_compiled_modules() {
2544 _python_initialize_prefix_variables 2715 _python_initialize_prefix_variables
2545 _python_set_color_variables 2716 _python_set_color_variables
2546 2717
2547 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage" 2718 [[ "${FUNCNAME[1]}" =~ ^(python_mod_optimize|python_mod_cleanup)$ ]] || die "${FUNCNAME}(): Invalid usage"
… …
2560 2731
2561 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then 2732 if [[ "${EBUILD_PHASE}" == "postrm" ]]; then
2562 # Delete empty child directories. 2733 # Delete empty child directories.
2563 find "${path}" -type d | sort -r | while read -r dir; do 2734 find "${path}" -type d | sort -r | while read -r dir; do
2564 if rmdir "${dir}" 2> /dev/null; then 2735 if rmdir "${dir}" 2> /dev/null; then
2565 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2736 _python_vecho "<<< ${dir}"
2566 fi 2737 fi
2567 done 2738 done
2568 fi 2739 fi
2569 elif [[ "${path}" == *.py ]]; then 2740 elif [[ "${path}" == *.py ]]; then
2570 base_module_name="${path##*/}" 2741 base_module_name="${path##*/}"
… …
2593 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2764 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2594 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2765 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2595 else 2766 else
2596 [[ -f "${py_file}" ]] && continue 2767 [[ -f "${py_file}" ]] && continue
2597 fi 2768 fi
2598 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}" 2769 _python_vecho "<<< ${compiled_file%[co]}[co]"
2599 rm -f "${compiled_file%[co]}"[co] 2770 rm -f "${compiled_file%[co]}"[co]
2600 elif [[ "${compiled_file}" == *\$py.class ]]; then 2771 elif [[ "${compiled_file}" == *\$py.class ]]; then
2601 if [[ "${dir}" == "__pycache__" ]]; then 2772 if [[ "${dir}" == "__pycache__" ]]; then
2602 base_module_name="${compiled_file##*/}" 2773 base_module_name="${compiled_file##*/}"
2603 base_module_name="${base_module_name%\$py.class}" 2774 base_module_name="${base_module_name%\$py.class}"
… …
2608 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2779 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2609 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2780 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2610 else 2781 else
2611 [[ -f "${py_file}" ]] && continue 2782 [[ -f "${py_file}" ]] && continue
2612 fi 2783 fi
2613 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}" 2784 _python_vecho "<<< ${compiled_file}"
2614 rm -f "${compiled_file}" 2785 rm -f "${compiled_file}"
2615 else 2786 else
2616 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'" 2787 die "${FUNCNAME}(): Unrecognized file type: '${compiled_file}'"
2617 fi 2788 fi
2618 2789
2619 # Delete empty parent directories. 2790 # Delete empty parent directories.
2620 dir="${compiled_file%/*}" 2791 dir="${compiled_file%/*}"
2621 while [[ "${dir}" != "${root}" ]]; do 2792 while [[ "${dir}" != "${root}" ]]; do
2622 if rmdir "${dir}" 2> /dev/null; then 2793 if rmdir "${dir}" 2> /dev/null; then
2623 echo "${_CYAN}<<< ${dir}${_NORMAL}" 2794 _python_vecho "<<< ${dir}"
2624 else 2795 else
2625 break 2796 break
2626 fi 2797 fi
2627 dir="${dir%/*}" 2798 dir="${dir%/*}"
2628 done 2799 done
… …
2759 dirs+=("${root}$(python_get_sitedir)/${dir}") 2930 dirs+=("${root}$(python_get_sitedir)/${dir}")
2760 done 2931 done
2761 for dir in "${evaluated_dirs[@]}"; do 2932 for dir in "${evaluated_dirs[@]}"; do
2762 eval "dirs+=(\"\${root}${dir}\")" 2933 eval "dirs+=(\"\${root}${dir}\")"
2763 done 2934 done
2764 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2935 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2765 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2936 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2766 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2937 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2767 fi 2938 fi
2768 _python_clean_compiled_modules "${dirs[@]}" 2939 _python_clean_compiled_modules "${dirs[@]}"
2769 fi 2940 fi
2770 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2941 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2771 for file in "${site_packages_files[@]}"; do 2942 for file in "${site_packages_files[@]}"; do
2772 files+=("${root}$(python_get_sitedir)/${file}") 2943 files+=("${root}$(python_get_sitedir)/${file}")
2773 done 2944 done
2774 for file in "${evaluated_files[@]}"; do 2945 for file in "${evaluated_files[@]}"; do
2775 eval "files+=(\"\${root}${file}\")" 2946 eval "files+=(\"\${root}${file}\")"
2776 done 2947 done
2777 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" 2>&1)" || return_code="1" 2948 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2778 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2949 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2779 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" &> /dev/null || return_code="1" 2950 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2780 fi 2951 fi
2781 _python_clean_compiled_modules "${files[@]}" 2952 _python_clean_compiled_modules "${files[@]}"
2782 fi 2953 fi
2783 eend "${return_code}" 2954 eend "${return_code}"
2784 if [[ -n "${stderr}" ]]; then 2955 if [[ -n "${stderr}" ]]; then
… …
2803 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 2974 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
2804 return_code="0" 2975 return_code="0"
2805 stderr="" 2976 stderr=""
2806 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2977 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2807 if ((${#other_dirs[@]})); then 2978 if ((${#other_dirs[@]})); then
2808 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2979 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2809 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2980 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2810 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2981 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2811 fi 2982 fi
2812 _python_clean_compiled_modules "${other_dirs[@]}" 2983 _python_clean_compiled_modules "${other_dirs[@]}"
2813 fi 2984 fi
2814 if ((${#other_files[@]})); then 2985 if ((${#other_files[@]})); then
2815 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" 2>&1)" || return_code="1" 2986 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2816 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2987 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2817 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1" 2988 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2818 fi 2989 fi
2819 _python_clean_compiled_modules "${other_files[@]}" 2990 _python_clean_compiled_modules "${other_files[@]}"
2820 fi 2991 fi
2821 eend "${return_code}" 2992 eend "${return_code}"
2822 if [[ -n "${stderr}" ]]; then 2993 if [[ -n "${stderr}" ]]; then
… …
3008} 3179}
3009 3180
3010# ================================================================================================ 3181# ================================================================================================
3011# ===================================== DEPRECATED FUNCTIONS ===================================== 3182# ===================================== DEPRECATED FUNCTIONS =====================================
3012# ================================================================================================ 3183# ================================================================================================
3184
3185fi # _PYTHON_ECLASS_INHERITED
Legend:
Removed from v.1.125  
changed lines
  Added in v.1.161
  ViewVC Help
Powered by ViewVC 1.1.13