/[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.156
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.156 2012/08/16 07:46:15 patrick 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
12# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
13if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 14 inherit multilib
15fi
13 16
17# Export pkg_setup every time to avoid issues with eclass inheritance order.
18if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
19 EXPORT_FUNCTIONS pkg_setup
20fi
21
22# Avoid processing this eclass more than once.
23if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
24_PYTHON_ECLASS_INHERITED="1"
25
14if ! has "${EAPI:-0}" 0 1 2 3; then 26if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 27 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 28fi
17 29
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 30_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) 31_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 32_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
33_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[@]}) 34_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
22 35
23# ================================================================================================ 36# ================================================================================================
24# ===================================== HANDLING OF METADATA ===================================== 37# ===================================== HANDLING OF METADATA =====================================
25# ================================================================================================ 38# ================================================================================================
26 39
58 pattern="$2" 71 pattern="$2"
59 72
60 if [[ "${pattern}" == *"-cpython" ]]; then 73 if [[ "${pattern}" == *"-cpython" ]]; then
61 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]] 74 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]]
62 elif [[ "${pattern}" == *"-jython" ]]; then 75 elif [[ "${pattern}" == *"-jython" ]]; then
76 [[ "${PYTHON_ABI}" == ${pattern} ]]
77 elif [[ "${pattern}" == *"-pypy-"* ]]; then
63 [[ "${PYTHON_ABI}" == ${pattern} ]] 78 [[ "${PYTHON_ABI}" == ${pattern} ]]
64 else 79 else
65 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 80 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
66 [[ "${PYTHON_ABI}" == ${pattern} ]] 81 [[ "${PYTHON_ABI}" == ${pattern} ]]
67 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 82 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
68 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]] 83 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
84 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
85 [[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
69 else 86 else
70 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'" 87 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'"
71 fi 88 fi
72 fi 89 fi
73 else 90 else
77 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then 94 if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
78 return 0 95 return 0
79 fi 96 fi
80 done <<< "${patterns}" 97 done <<< "${patterns}"
81 98
99 return 1
100 fi
101}
102
103_python_implementation() {
104 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
105 return 0
106 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
107 return 0
108 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
109 return 0
110 else
82 return 1 111 return 1
83 fi 112 fi
84} 113}
85 114
86_python_package_supporting_installation_for_multiple_python_abis() { 115_python_package_supporting_installation_for_multiple_python_abis() {
226 else 255 else
227 die "Invalid syntax of PYTHON_DEPEND" 256 die "Invalid syntax of PYTHON_DEPEND"
228 fi 257 fi
229} 258}
230 259
260if _python_implementation; then
231DEPEND=">=app-admin/eselect-python-20091230" 261 DEPEND=">=app-admin/eselect-python-20091230"
232RDEPEND="${DEPEND}" 262 RDEPEND="${DEPEND}"
263 PDEPEND="app-admin/python-updater"
264fi
233 265
234if [[ -n "${PYTHON_DEPEND}" ]]; then 266if [[ -n "${PYTHON_DEPEND}" ]]; then
235 _python_parse_PYTHON_DEPEND 267 _python_parse_PYTHON_DEPEND
236else 268else
237 _PYTHON_ATOMS=("dev-lang/python") 269 _PYTHON_ATOMS=("dev-lang/python")
276 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}" 308 _PYTHON_USE_WITH_ATOMS="${_PYTHON_USE_WITH_ATOMS_ARRAY[@]}"
277 fi 309 fi
278 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then 310 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
279 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" 311 _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )"
280 fi 312 fi
281 DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 313 DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
282 RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" 314 RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}"
283 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY 315 unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY
284fi 316fi
285 317
286unset _PYTHON_ATOMS 318unset _PYTHON_ATOMS
287 319
288# ================================================================================================ 320# ================================================================================================
289# =================================== MISCELLANEOUS FUNCTIONS ==================================== 321# =================================== MISCELLANEOUS FUNCTIONS ====================================
290# ================================================================================================ 322# ================================================================================================
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 323
302_python_abi-specific_local_scope() { 324_python_abi-specific_local_scope() {
303 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] 325 [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]]
304} 326}
305 327
377 _CYAN= 399 _CYAN=
378 _NORMAL= 400 _NORMAL=
379 fi 401 fi
380} 402}
381 403
382unset PYTHON_PKG_SETUP_EXECUTED
383
384_python_check_python_pkg_setup_execution() { 404_python_check_python_pkg_setup_execution() {
385 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 405 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
386 406
387 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 407 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
388 die "python_pkg_setup() not called" 408 die "python_pkg_setup() not called"
456 fi 476 fi
457 477
458 PYTHON_PKG_SETUP_EXECUTED="1" 478 PYTHON_PKG_SETUP_EXECUTED="1"
459} 479}
460 480
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)' 481_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
466 482
467# @FUNCTION: python_convert_shebangs 483# @FUNCTION: python_convert_shebangs
468# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 484# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
469# @DESCRIPTION: 485# @DESCRIPTION:
470# Convert shebangs in specified files. Directories can be specified only with --recursive option. 486# Convert shebangs in specified files. Directories can be specified only with --recursive option.
471python_convert_shebangs() { 487python_convert_shebangs() {
472 _python_check_python_pkg_setup_execution 488 _python_check_python_pkg_setup_execution
473 489
474 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 490 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
475 491
476 while (($#)); do 492 while (($#)); do
477 case "$1" in 493 case "$1" in
478 -r|--recursive) 494 -r|--recursive)
479 recursive="1" 495 recursive="1"
534 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 550 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
535 551
536 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 552 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 553 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
538 554
555 shebangs_converted="1"
556
539 if [[ "${quiet}" == "0" ]]; then 557 if [[ "${quiet}" == "0" ]]; then
540 einfo "Converting shebang in '${file}'" 558 einfo "Converting shebang in '${file}'"
541 fi 559 fi
542 560
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" 561 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"
562 fi
563 done
564
565 if [[ "${shebangs_converted}" == "0" ]]; then
566 ewarn "${FUNCNAME}(): Python scripts not found"
544 fi 567 fi
568}
569
570# @FUNCTION: python_clean_py-compile_files
571# @USAGE: [-q|--quiet]
572# @DESCRIPTION:
573# Clean py-compile files to disable byte-compilation.
574python_clean_py-compile_files() {
575 _python_check_python_pkg_setup_execution
576
577 local file files=() quiet="0"
578
579 while (($#)); do
580 case "$1" in
581 -q|--quiet)
582 quiet="1"
583 ;;
584 -*)
585 die "${FUNCNAME}(): Unrecognized option '$1'"
586 ;;
587 *)
588 die "${FUNCNAME}(): Invalid usage"
589 ;;
590 esac
591 shift
592 done
593
594 while read -d $'\0' -r file; do
595 files+=("${file#./}")
596 done < <(find -name py-compile -type f -print0)
597
598 for file in "${files[@]}"; do
599 if [[ "${quiet}" == "0" ]]; then
600 einfo "Cleaning '${file}' file"
601 fi
602 echo "#!/bin/sh" > "${file}"
545 done 603 done
546} 604}
547 605
548# @FUNCTION: python_clean_installation_image 606# @FUNCTION: python_clean_installation_image
549# @USAGE: [-q|--quiet] 607# @USAGE: [-q|--quiet]
787 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 845 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
788 fi 846 fi
789 else 847 else
790 python3_version="" 848 python3_version=""
791 fi 849 fi
850 fi
851
852 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
853 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
854 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
855 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
856 eerror " dev-lang/python:${PYTHON_ABI}"
857 fi
858 done
859 die "No supported version of CPython installed"
792 fi 860 fi
793 861
794 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 862 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" 863 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
796 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 864 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
954 python_default_function() { 1022 python_default_function() {
955 emake "$@" 1023 emake "$@"
956 } 1024 }
957 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1025 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
958 python_default_function() { 1026 python_default_function() {
1027 # Stolen from portage's _eapi0_src_test()
1028 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
959 if emake -j1 -n check &> /dev/null; then 1029 if ${emake_cmd} -j1 -n check &> /dev/null; then
960 emake -j1 check "$@" 1030 ${emake_cmd} -j1 check "$@"
961 elif emake -j1 -n test &> /dev/null; then 1031 elif ${emake_cmd} -j1 -n test &> /dev/null; then
962 emake -j1 test "$@" 1032 ${emake_cmd} -j1 test "$@"
963 fi 1033 fi
964 } 1034 }
965 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1035 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
966 python_default_function() { 1036 python_default_function() {
967 emake DESTDIR="${D}" install "$@" 1037 emake DESTDIR="${D}" install "$@"
1224import os 1294import os
1225import re 1295import re
1226import subprocess 1296import subprocess
1227import sys 1297import sys
1228 1298
1229cpython_re = re.compile(r"^python(\d+\.\d+)$") 1299cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1300jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1301pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1302cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1230jython_re = re.compile(r"^jython(\d+\.\d+)$") 1303jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1304pypy_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)") 1305cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1306python_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$") 1307python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1233 1308
1234def get_PYTHON_ABI(EPYTHON): 1309pypy_versions_mapping = {
1235 cpython_matched = cpython_re.match(EPYTHON) 1310 "1.5": "2.7",
1236 jython_matched = jython_re.match(EPYTHON) 1311 "1.6": "2.7",
1312 "1.7": "2.7",
1313 "1.8": "2.7",
1314 "1.9": "2.7",
1315}
1316
1317def get_PYTHON_ABI(python_interpreter):
1318 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1319 jython_matched = jython_interpreter_re.match(python_interpreter)
1320 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1237 if cpython_matched is not None: 1321 if cpython_matched is not None:
1238 PYTHON_ABI = cpython_matched.group(1) 1322 PYTHON_ABI = cpython_matched.group(1)
1239 elif jython_matched is not None: 1323 elif jython_matched is not None:
1240 PYTHON_ABI = jython_matched.group(1) + "-jython" 1324 PYTHON_ABI = jython_matched.group(1) + "-jython"
1325 elif pypy_matched is not None:
1326 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1241 else: 1327 else:
1242 PYTHON_ABI = None 1328 PYTHON_ABI = None
1243 return PYTHON_ABI 1329 return PYTHON_ABI
1244 1330
1331def get_python_interpreter(PYTHON_ABI):
1332 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1333 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1334 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1335 if cpython_matched is not None:
1336 python_interpreter = "python" + cpython_matched.group(1)
1337 elif jython_matched is not None:
1338 python_interpreter = "jython" + jython_matched.group(1)
1339 elif pypy_matched is not None:
1340 python_interpreter = "pypy-c" + pypy_matched.group(1)
1341 else:
1342 python_interpreter = None
1343 return python_interpreter
1344
1245EOF 1345EOF
1246 if [[ "$?" != "0" ]]; then 1346 if [[ "$?" != "0" ]]; then
1247 die "${FUNCNAME}(): Generation of '$1' failed" 1347 die "${FUNCNAME}(): Generation of '$1' failed"
1248 fi 1348 fi
1249 if [[ "${respect_EPYTHON}" == "1" ]]; then 1349 if [[ "${respect_EPYTHON}" == "1" ]]; then
1250 cat << EOF >> "${file}" 1350 cat << EOF >> "${file}"
1251EPYTHON = os.environ.get("EPYTHON") 1351python_interpreter = os.environ.get("EPYTHON")
1252if EPYTHON: 1352if python_interpreter:
1253 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1353 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1254 if PYTHON_ABI is None: 1354 if PYTHON_ABI is None:
1255 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1355 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1256 sys.exit(1) 1356 sys.exit(1)
1257else: 1357else:
1258 try: 1358 try:
1259 environment = os.environ.copy() 1359 environment = os.environ.copy()
1260 environment["ROOT"] = "/" 1360 environment["ROOT"] = "/"
1263 raise ValueError 1363 raise ValueError
1264 except (OSError, ValueError): 1364 except (OSError, ValueError):
1265 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1365 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1266 sys.exit(1) 1366 sys.exit(1)
1267 1367
1268 EPYTHON = eselect_process.stdout.read() 1368 python_interpreter = eselect_process.stdout.read()
1269 if not isinstance(EPYTHON, str): 1369 if not isinstance(python_interpreter, str):
1270 # Python 3 1370 # Python 3
1271 EPYTHON = EPYTHON.decode() 1371 python_interpreter = python_interpreter.decode()
1272 EPYTHON = EPYTHON.rstrip("\n") 1372 python_interpreter = python_interpreter.rstrip("\n")
1273 1373
1274 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1374 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1275 if PYTHON_ABI is None: 1375 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)) 1376 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) 1377 sys.exit(1)
1278 1378
1279wrapper_script_path = os.path.realpath(sys.argv[0]) 1379wrapper_script_path = os.path.realpath(sys.argv[0])
1280target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1380target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1281if not os.path.exists(target_executable_path): 1381if not os.path.exists(target_executable_path):
1295 raise ValueError 1395 raise ValueError
1296except (OSError, ValueError): 1396except (OSError, ValueError):
1297 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1397 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1298 sys.exit(1) 1398 sys.exit(1)
1299 1399
1300EPYTHON = eselect_process.stdout.read() 1400python_interpreter = eselect_process.stdout.read()
1301if not isinstance(EPYTHON, str): 1401if not isinstance(python_interpreter, str):
1302 # Python 3 1402 # Python 3
1303 EPYTHON = EPYTHON.decode() 1403 python_interpreter = python_interpreter.decode()
1304EPYTHON = EPYTHON.rstrip("\n") 1404python_interpreter = python_interpreter.rstrip("\n")
1305 1405
1306PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1406PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1307if PYTHON_ABI is None: 1407if 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)) 1408 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) 1409 sys.exit(1)
1310 1410
1311wrapper_script_path = os.path.realpath(sys.argv[0]) 1411wrapper_script_path = os.path.realpath(sys.argv[0])
1312for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1412for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1313 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1413 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1314 if os.path.exists(target_executable_path): 1414 if os.path.exists(target_executable_path):
1315 break 1415 break
1316else: 1416else:
1317 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1417 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1318 sys.exit(1) 1418 sys.exit(1)
1419
1420python_interpreter = get_python_interpreter(PYTHON_ABI)
1421if python_interpreter is None:
1422 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1423 sys.exit(1)
1319EOF 1424EOF
1320 if [[ "$?" != "0" ]]; then 1425 if [[ "$?" != "0" ]]; then
1321 die "${FUNCNAME}(): Generation of '$1' failed" 1426 die "${FUNCNAME}(): Generation of '$1' failed"
1322 fi 1427 fi
1323 fi 1428 fi
1324 cat << EOF >> "${file}" 1429 cat << EOF >> "${file}"
1325 1430
1326target_executable = open(target_executable_path, "rb") 1431target_executable = open(target_executable_path, "rb")
1327target_executable_first_line = target_executable.readline() 1432target_executable_first_line = target_executable.readline()
1433target_executable.close()
1328if not isinstance(target_executable_first_line, str): 1434if not isinstance(target_executable_first_line, str):
1329 # Python 3 1435 # Python 3
1330 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1436 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1331 1437
1438options = []
1439python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1440if python_shebang_options_matched is not None:
1441 options = [python_shebang_options_matched.group(1)]
1442
1332python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1443cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1333target_executable.close()
1334 1444
1335if python_shebang_matched is not None: 1445if cpython_shebang_matched is not None:
1336 try: 1446 try:
1337 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1447 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1338 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1448 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1339 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1449 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1340 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1450 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1341 if python_verification_process.wait() != 0: 1451 if python_verification_process.wait() != 0:
1342 raise ValueError 1452 raise ValueError
1347 python_verification_output = python_verification_output.decode() 1457 python_verification_output = python_verification_output.decode()
1348 1458
1349 if not python_verification_output_re.match(python_verification_output): 1459 if not python_verification_output_re.match(python_verification_output):
1350 raise ValueError 1460 raise ValueError
1351 1461
1352 if cpython_re.match(EPYTHON) is not None: 1462 if cpython_interpreter_re.match(python_interpreter) is not None:
1353 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1463 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1354 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1464 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1355 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1465 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1356 1466
1357 if hasattr(os, "execv"): 1467 if hasattr(os, "execv"):
1358 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1468 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1359 else: 1469 else:
1360 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1470 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1361 except (KeyboardInterrupt, SystemExit): 1471 except (KeyboardInterrupt, SystemExit):
1362 raise 1472 raise
1363 except: 1473 except:
1364 pass 1474 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"): 1475 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 1517 fi
1408 1518
1409 _python_check_python_pkg_setup_execution 1519 _python_check_python_pkg_setup_execution
1410 _python_initialize_prefix_variables 1520 _python_initialize_prefix_variables
1411 1521
1412 local b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=() 1522 local absolute_file b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=()
1413 1523
1414 while (($#)); do 1524 while (($#)); do
1415 case "$1" in 1525 case "$1" in
1416 -q|--quiet) 1526 -q|--quiet)
1417 quiet="1" 1527 quiet="1"
1499 break 1609 break
1500 fi 1610 fi
1501 done 1611 done
1502 fi 1612 fi
1503 1613
1504 [[ "${version_executable}" == "0" || ! -x "${file}" ]] && continue 1614 [[ "${version_executable}" == "0" ]] && continue
1505 1615
1616 if [[ -L "${file}" ]]; then
1617 absolute_file="$(readlink "${file}")"
1618 if [[ "${absolute_file}" == /* ]]; then
1619 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file##/}"
1620 else
1621 if [[ "${file}" == */* ]]; then
1622 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file%/*}/${absolute_file}"
1623 else
1624 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file}"
1625 fi
1626 fi
1627 else
1628 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file}"
1629 fi
1630
1631 [[ ! -x "${absolute_file}" ]] && continue
1632
1506 shebang="$(head -n1 "${file}")" || die "Extraction of shebang from '${file}' failed" 1633 shebang="$(head -n1 "${absolute_file}")" || die "Extraction of shebang from '${absolute_file}' failed"
1507 1634
1508 if [[ "${version_executable}" == "2" ]]; then 1635 if [[ "${version_executable}" == "2" ]]; then
1509 wrapper_scripts+=("${ED}${file}") 1636 wrapper_scripts+=("${ED}${file}")
1510 elif [[ "${version_executable}" == "1" ]]; then 1637 elif [[ "${version_executable}" == "1" ]]; then
1511 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then 1638 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then
1522 fi 1649 fi
1523 1650
1524 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed" 1651 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
1525 1652
1526 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then 1653 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then
1654 if [[ -L "${file}-${PYTHON_ABI}" ]]; then
1655 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${absolute_file}"
1656 else
1527 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}" 1657 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}"
1658 fi
1528 fi 1659 fi
1529 done 1660 done
1530 1661
1531 popd > /dev/null || die "popd failed" 1662 popd > /dev/null || die "popd failed"
1532 1663
1664 # This is per bug #390691, without the duplication refactor, and with
1665 # the 3-way structure per comment #6. This enable users with old
1666 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1667 # before coreutils can be upgraded).
1668 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1669 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 1670 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" 1671 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 1672 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" 1673 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 1674 fi
1538 done 1675 done
1557 stdout = sys.stdout.buffer 1694 stdout = sys.stdout.buffer
1558else: 1695else:
1559 # Python 2 1696 # Python 2
1560 stdout = sys.stdout 1697 stdout = sys.stdout
1561 1698
1699python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1562files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1700files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1701python_wrapper_scripts_file.close()
1563 1702
1564for file in sorted(files): 1703for file in sorted(files):
1565 stdout.write(file) 1704 stdout.write(file)
1566 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1705 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1567 1706
1632 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1771 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1633 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1772 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1634} 1773}
1635 1774
1636# @FUNCTION: python_need_rebuild 1775# @FUNCTION: python_need_rebuild
1776# @DESCRIPTION:
1637# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1777# Mark current package for rebuilding by python-updater after
1638# switching of active version of Python. 1778# switching of active version of Python.
1639python_need_rebuild() { 1779python_need_rebuild() {
1640 if _python_package_supporting_installation_for_multiple_python_abis; then 1780 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" 1781 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1642 fi 1782 fi
1652 1792
1653# ================================================================================================ 1793# ================================================================================================
1654# ======================================= GETTER FUNCTIONS ======================================= 1794# ======================================= GETTER FUNCTIONS =======================================
1655# ================================================================================================ 1795# ================================================================================================
1656 1796
1657_PYTHON_ABI_EXTRACTION_COMMAND='import platform 1797_PYTHON_ABI_EXTRACTION_COMMAND=\
1798'import platform
1658import sys 1799import sys
1659sys.stdout.write(".".join(str(x) for x in sys.version_info[:2])) 1800sys.stdout.write(".".join(str(x) for x in sys.version_info[:2]))
1660if platform.system()[:4] == "Java": 1801if platform.system()[:4] == "Java":
1661 sys.stdout.write("-jython")' 1802 sys.stdout.write("-jython")
1803elif hasattr(platform, "python_implementation") and platform.python_implementation() == "PyPy":
1804 sys.stdout.write("-pypy-" + ".".join(str(x) for x in sys.pypy_version_info[:2]))'
1662 1805
1663_python_get_implementation() { 1806_python_get_implementation() {
1664 local ignore_invalid="0" 1807 local ignore_invalid="0"
1665 1808
1666 while (($#)); do 1809 while (($#)); do
1688 1831
1689 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 1832 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
1690 echo "CPython" 1833 echo "CPython"
1691 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 1834 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
1692 echo "Jython" 1835 echo "Jython"
1836 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
1837 echo "PyPy"
1693 else 1838 else
1694 if [[ "${ignore_invalid}" == "0" ]]; then 1839 if [[ "${ignore_invalid}" == "0" ]]; then
1695 die "${FUNCNAME}(): Unrecognized Python ABI '$1'" 1840 die "${FUNCNAME}(): Unrecognized Python ABI '$1'"
1696 fi 1841 fi
1697 fi 1842 fi
1806 else 1951 else
1807 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1952 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1808 python_interpreter="python${PYTHON_ABI}" 1953 python_interpreter="python${PYTHON_ABI}"
1809 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1954 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1810 python_interpreter="jython${PYTHON_ABI%-jython}" 1955 python_interpreter="jython${PYTHON_ABI%-jython}"
1956 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1957 python_interpreter="pypy-c${PYTHON_ABI#*-pypy-}"
1811 fi 1958 fi
1812 1959
1813 if [[ "${absolute_path_output}" == "1" ]]; then 1960 if [[ "${absolute_path_output}" == "1" ]]; then
1814 echo -n "${EPREFIX}/usr/bin/${python_interpreter}" 1961 echo -n "${EPREFIX}/usr/bin/${python_interpreter}"
1815 else 1962 else
1908 if [[ "${EAPI:-0}" == "0" ]]; then 2055 if [[ "${EAPI:-0}" == "0" ]]; then
1909 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2056 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1910 echo "=dev-lang/python-${PYTHON_ABI}*" 2057 echo "=dev-lang/python-${PYTHON_ABI}*"
1911 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2058 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1912 echo "=dev-java/jython-${PYTHON_ABI%-jython}*" 2059 echo "=dev-java/jython-${PYTHON_ABI%-jython}*"
2060 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2061 echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*"
1913 fi 2062 fi
1914 else 2063 else
1915 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2064 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1916 echo "dev-lang/python:${PYTHON_ABI}" 2065 echo "dev-lang/python:${PYTHON_ABI}"
1917 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2066 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1918 echo "dev-java/jython:${PYTHON_ABI%-jython}" 2067 echo "dev-java/jython:${PYTHON_ABI%-jython}"
2068 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2069 echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}"
1919 fi 2070 fi
1920 fi 2071 fi
1921} 2072}
1922 2073
1923# @FUNCTION: python_get_includedir 2074# @FUNCTION: python_get_includedir
1970 2121
1971 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2122 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1972 echo "${prefix}usr/include/python${PYTHON_ABI}" 2123 echo "${prefix}usr/include/python${PYTHON_ABI}"
1973 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2124 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1974 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include" 2125 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include"
2126 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2127 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/include"
1975 fi 2128 fi
1976} 2129}
1977 2130
1978# @FUNCTION: python_get_libdir 2131# @FUNCTION: python_get_libdir
1979# @USAGE: [-b|--base-path] [-f|--final-ABI] 2132# @USAGE: [-b|--base-path] [-f|--final-ABI]
1980# @DESCRIPTION: 2133# @DESCRIPTION:
1981# Print path to Python library directory. 2134# Print path to Python standard library directory.
1982# If --base-path option is specified, then path not prefixed with "/" is printed. 2135# 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. 2136# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
1984python_get_libdir() { 2137python_get_libdir() {
1985 _python_check_python_pkg_setup_execution 2138 _python_check_python_pkg_setup_execution
1986 2139
2025 2178
2026 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2179 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2027 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}" 2180 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}"
2028 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2181 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2029 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib" 2182 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib"
2183 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2184 die "${FUNCNAME}(): PyPy has multiple standard library directories"
2030 fi 2185 fi
2031} 2186}
2032 2187
2033# @FUNCTION: python_get_sitedir 2188# @FUNCTION: python_get_sitedir
2034# @USAGE: [-b|--base-path] [-f|--final-ABI] 2189# @USAGE: [-b|--base-path] [-f|--final-ABI]
2037# If --base-path option is specified, then path not prefixed with "/" is printed. 2192# 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. 2193# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2039python_get_sitedir() { 2194python_get_sitedir() {
2040 _python_check_python_pkg_setup_execution 2195 _python_check_python_pkg_setup_execution
2041 2196
2042 local final_ABI="0" options=() 2197 local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
2043 2198
2044 while (($#)); do 2199 while (($#)); do
2045 case "$1" in 2200 case "$1" in
2046 -b|--base-path) 2201 -b|--base-path)
2047 options+=("$1") 2202 base_path="1"
2048 ;; 2203 ;;
2049 -f|--final-ABI) 2204 -f|--final-ABI)
2050 final_ABI="1" 2205 final_ABI="1"
2051 options+=("$1")
2052 ;; 2206 ;;
2053 -*) 2207 -*)
2054 die "${FUNCNAME}(): Unrecognized option '$1'" 2208 die "${FUNCNAME}(): Unrecognized option '$1'"
2055 ;; 2209 ;;
2056 *) 2210 *)
2057 die "${FUNCNAME}(): Invalid usage" 2211 die "${FUNCNAME}(): Invalid usage"
2058 ;; 2212 ;;
2059 esac 2213 esac
2060 shift 2214 shift
2061 done 2215 done
2216
2217 if [[ "${base_path}" == "0" ]]; then
2218 prefix="/"
2219 fi
2062 2220
2063 if [[ "${final_ABI}" == "1" ]]; then 2221 if [[ "${final_ABI}" == "1" ]]; then
2064 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2222 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" 2223 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2066 fi 2224 fi
2225 PYTHON_ABI="$(PYTHON -f --ABI)"
2067 else 2226 else
2068 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2227 if _python_package_supporting_installation_for_multiple_python_abis; then
2228 if ! _python_abi-specific_local_scope; then
2069 die "${FUNCNAME}() should be used in ABI-specific local scope" 2229 die "${FUNCNAME}() should be used in ABI-specific local scope"
2070 fi 2230 fi
2231 else
2232 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2071 fi 2233 fi
2234 fi
2072 2235
2073 echo "$(python_get_libdir "${options[@]}")/site-packages" 2236 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2237 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}/site-packages"
2238 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2239 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib/site-packages"
2240 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2241 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/site-packages"
2242 fi
2074} 2243}
2075 2244
2076# @FUNCTION: python_get_library 2245# @FUNCTION: python_get_library
2077# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option] 2246# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option]
2078# @DESCRIPTION: 2247# @DESCRIPTION:
2135 else 2304 else
2136 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)" 2305 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)"
2137 fi 2306 fi
2138 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2307 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2139 die "${FUNCNAME}(): Jython does not have shared library" 2308 die "${FUNCNAME}(): Jython does not have shared library"
2309 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2310 die "${FUNCNAME}(): PyPy does not have shared library"
2140 fi 2311 fi
2141} 2312}
2142 2313
2143# @FUNCTION: python_get_version 2314# @FUNCTION: python_get_version
2144# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro] 2315# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
2217 else 2388 else
2218 echo "${language_version}" 2389 echo "${language_version}"
2219 fi 2390 fi
2220 else 2391 else
2221 if [[ "${full}" == "1" ]]; then 2392 if [[ "${full}" == "1" ]]; then
2222 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))" 2393 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 2394 elif [[ "${major}" == "1" ]]; then
2224 python_command="from sys import version_info; print(version_info[0])" 2395 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[0])"
2225 elif [[ "${minor}" == "1" ]]; then 2396 elif [[ "${minor}" == "1" ]]; then
2226 python_command="from sys import version_info; print(version_info[1])" 2397 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[1])"
2227 elif [[ "${micro}" == "1" ]]; then 2398 elif [[ "${micro}" == "1" ]]; then
2228 python_command="from sys import version_info; print(version_info[2])" 2399 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[2])"
2229 else 2400 else
2230 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then 2401 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2231 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2402 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2232 echo "${PYTHON_ABI}" 2403 echo "${PYTHON_ABI}"
2233 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2404 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2234 echo "${PYTHON_ABI%-jython}" 2405 echo "${PYTHON_ABI%-jython}"
2406 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2407 echo "${PYTHON_ABI#*-pypy-}"
2235 fi 2408 fi
2236 return 2409 return
2237 fi 2410 fi
2238 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))" 2411 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2239 fi 2412 fi
2308_python_test_hook() { 2481_python_test_hook() {
2309 if [[ "$#" -ne 1 ]]; then 2482 if [[ "$#" -ne 1 ]]; then
2310 die "${FUNCNAME}() requires 1 argument" 2483 die "${FUNCNAME}() requires 1 argument"
2311 fi 2484 fi
2312 2485
2313 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2486 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2314 "${FUNCNAME[3]}_$1_hook" 2487 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2315 fi 2488 fi
2316} 2489}
2317 2490
2318# @FUNCTION: python_execute_nosetests 2491# @FUNCTION: python_execute_nosetests
2319# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2492# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
2353 python_test_function() { 2526 python_test_function() {
2354 local evaluated_PYTHONPATH 2527 local evaluated_PYTHONPATH
2355 2528
2356 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2529 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2357 2530
2358 _python_test_hook pre 2531 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2359 2532
2360 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2533 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2361 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2534 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2362 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2535 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2363 else 2536 else
2364 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2537 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2365 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2538 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2366 fi 2539 fi
2367 2540
2368 _python_test_hook post 2541 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2369 } 2542 }
2370 if _python_package_supporting_installation_for_multiple_python_abis; then 2543 if _python_package_supporting_installation_for_multiple_python_abis; then
2371 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2544 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2372 else 2545 else
2373 if [[ -n "${separate_build_dirs}" ]]; then 2546 if [[ -n "${separate_build_dirs}" ]]; then
2417 python_test_function() { 2590 python_test_function() {
2418 local evaluated_PYTHONPATH 2591 local evaluated_PYTHONPATH
2419 2592
2420 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2593 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2421 2594
2422 _python_test_hook pre 2595 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2423 2596
2424 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2597 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2425 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2598 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 "$?" 2599 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2427 else 2600 else
2428 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2601 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2429 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2602 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2430 fi 2603 fi
2431 2604
2432 _python_test_hook post 2605 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2433 } 2606 }
2434 if _python_package_supporting_installation_for_multiple_python_abis; then 2607 if _python_package_supporting_installation_for_multiple_python_abis; then
2435 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2608 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2436 else 2609 else
2437 if [[ -n "${separate_build_dirs}" ]]; then 2610 if [[ -n "${separate_build_dirs}" ]]; then
2481 python_test_function() { 2654 python_test_function() {
2482 local evaluated_PYTHONPATH 2655 local evaluated_PYTHONPATH
2483 2656
2484 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2657 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2485 2658
2486 _python_test_hook pre 2659 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2487 2660
2488 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2661 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2489 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2662 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 "$?" 2663 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2491 else 2664 else
2492 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2665 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2493 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2666 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2494 fi 2667 fi
2495 2668
2496 _python_test_hook post 2669 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2497 } 2670 }
2498 if _python_package_supporting_installation_for_multiple_python_abis; then 2671 if _python_package_supporting_installation_for_multiple_python_abis; then
2499 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2672 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2500 else 2673 else
2501 if [[ -n "${separate_build_dirs}" ]]; then 2674 if [[ -n "${separate_build_dirs}" ]]; then
2593 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2766 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2594 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2767 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2595 else 2768 else
2596 [[ -f "${py_file}" ]] && continue 2769 [[ -f "${py_file}" ]] && continue
2597 fi 2770 fi
2598 echo "${_BLUE}<<< ${compiled_file%[co]}[co]${_NORMAL}"
2599 rm -f "${compiled_file%[co]}"[co] 2771 rm -f "${compiled_file%[co]}"[co]
2600 elif [[ "${compiled_file}" == *\$py.class ]]; then 2772 elif [[ "${compiled_file}" == *\$py.class ]]; then
2601 if [[ "${dir}" == "__pycache__" ]]; then 2773 if [[ "${dir}" == "__pycache__" ]]; then
2602 base_module_name="${compiled_file##*/}" 2774 base_module_name="${compiled_file##*/}"
2603 base_module_name="${base_module_name%\$py.class}" 2775 base_module_name="${base_module_name%\$py.class}"
2608 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then 2780 if [[ "${EBUILD_PHASE}" == "postinst" ]]; then
2609 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue 2781 [[ -f "${py_file}" && "${compiled_file}" -nt "${py_file}" ]] && continue
2610 else 2782 else
2611 [[ -f "${py_file}" ]] && continue 2783 [[ -f "${py_file}" ]] && continue
2612 fi 2784 fi
2613 echo "${_BLUE}<<< ${compiled_file}${_NORMAL}"
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}"
2624 else
2625 break 2794 break
2626 fi 2795 fi
2627 dir="${dir%/*}" 2796 dir="${dir%/*}"
2628 done 2797 done
2629 done 2798 done
2759 dirs+=("${root}$(python_get_sitedir)/${dir}") 2928 dirs+=("${root}$(python_get_sitedir)/${dir}")
2760 done 2929 done
2761 for dir in "${evaluated_dirs[@]}"; do 2930 for dir in "${evaluated_dirs[@]}"; do
2762 eval "dirs+=(\"\${root}${dir}\")" 2931 eval "dirs+=(\"\${root}${dir}\")"
2763 done 2932 done
2764 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2933 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2765 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2934 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" 2935 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2767 fi 2936 fi
2768 _python_clean_compiled_modules "${dirs[@]}" 2937 _python_clean_compiled_modules "${dirs[@]}"
2769 fi 2938 fi
2770 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2939 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2771 for file in "${site_packages_files[@]}"; do 2940 for file in "${site_packages_files[@]}"; do
2772 files+=("${root}$(python_get_sitedir)/${file}") 2941 files+=("${root}$(python_get_sitedir)/${file}")
2773 done 2942 done
2774 for file in "${evaluated_files[@]}"; do 2943 for file in "${evaluated_files[@]}"; do
2775 eval "files+=(\"\${root}${file}\")" 2944 eval "files+=(\"\${root}${file}\")"
2776 done 2945 done
2777 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" 2>&1)" || return_code="1" 2946 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2778 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2947 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" 2948 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2780 fi 2949 fi
2781 _python_clean_compiled_modules "${files[@]}" 2950 _python_clean_compiled_modules "${files[@]}"
2782 fi 2951 fi
2783 eend "${return_code}" 2952 eend "${return_code}"
2784 if [[ -n "${stderr}" ]]; then 2953 if [[ -n "${stderr}" ]]; then
2803 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 2972 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
2804 return_code="0" 2973 return_code="0"
2805 stderr="" 2974 stderr=""
2806 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2975 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2807 if ((${#other_dirs[@]})); then 2976 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" 2977 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 2978 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" 2979 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2811 fi 2980 fi
2812 _python_clean_compiled_modules "${other_dirs[@]}" 2981 _python_clean_compiled_modules "${other_dirs[@]}"
2813 fi 2982 fi
2814 if ((${#other_files[@]})); then 2983 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" 2984 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 2985 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" 2986 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2818 fi 2987 fi
2819 _python_clean_compiled_modules "${other_files[@]}" 2988 _python_clean_compiled_modules "${other_files[@]}"
2820 fi 2989 fi
2821 eend "${return_code}" 2990 eend "${return_code}"
2822 if [[ -n "${stderr}" ]]; then 2991 if [[ -n "${stderr}" ]]; then
3008} 3177}
3009 3178
3010# ================================================================================================ 3179# ================================================================================================
3011# ===================================== DEPRECATED FUNCTIONS ===================================== 3180# ===================================== DEPRECATED FUNCTIONS =====================================
3012# ================================================================================================ 3181# ================================================================================================
3182
3183fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.125  
changed lines
  Added in v.1.156

  ViewVC Help
Powered by ViewVC 1.1.20