* [gentoo-dev] Patch for distutils.eclass [2011-04-03]
@ 2011-04-03 18:04 Arfrever Frehtes Taifersar Arahesis
0 siblings, 0 replies; only message in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2011-04-03 18:04 UTC (permalink / raw
To: Gentoo Development; +Cc: qa
[-- Attachment #1.1: Type: Text/Plain, Size: 1524 bytes --]
This patch for distutils.eclass is divided into 13 subpatches.
Subpatch #1 bans DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS variable (too late).
Subpatch #2 removes 2 functions banned long time ago.
Subpatch #3 adds handling of *-nspkg.pth files in distutils_src_install().
Subpatch #4 adds missing sanity checks for execution of python_pkg_setup() in EAPI >=4.
Subpatch #5 adds support for EAPI="4" in handling of DOCS variable.
Subpatch #6 disables installation of useless files.
Subpatch #7 adds sanity checks for appropriateness of execution of distutils_pkg_postinst()
and distutils_pkg_postrm().
Subpatch #8 adds support for EAPI="4" in handling of DISTUTILS_GLOBAL_OPTIONS array.
Subpatch #9 adds distutils_get_intermediate_installation_image() function, which will be
used in a small number of ebuilds, which currently rely on knowledge of implementation
details of distutils.eclass.
Subpatch #10 adds support for automatic changing of current working directory in handling
of DISTUTILS_SETUP_FILES (in all EAPIs).
Example:
# Change current working directory to bindings/python and execute setup.py
DISTUTILS_SETUP_FILES=("bindings/python|setup.py")
Subpatch #11 adds sanity checks for arguments in some functions.
Subpatch #12 adds unsetting of some internal functions after using of them.
Subpatch #13 moves declaration of local variables to other places for consistency with
python.eclass.
I'm planning to commit this patch in 1 week.
--
Arfrever Frehtes Taifersar Arahesis
[-- Attachment #1.2: distutils.eclass.patch --]
[-- Type: text/x-patch, Size: 17478 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.79 2010/12/24 15:05:24 arfrever Exp $
@@ -58,11 +58,17 @@
# @ECLASS-VARIABLE: DISTUTILS_SETUP_FILES
# @DESCRIPTION:
-# Paths to setup files.
+# Array of paths to setup files.
+# Syntax:
+# [current_working_directory|]path_to_setup_file
# @ECLASS-VARIABLE: DISTUTILS_GLOBAL_OPTIONS
# @DESCRIPTION:
-# Global options passed to setup files.
+# Array of global options passed to setup files.
+# Syntax in EAPI <4:
+# global_option
+# Syntax in EAPI >=4:
+# Python_ABI_pattern global_option
# @ECLASS-VARIABLE: DISTUTILS_SRC_TEST
# @DESCRIPTION:
@@ -100,19 +106,10 @@
EXPORT_FUNCTIONS src_test
fi
-# @ECLASS-VARIABLE: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS
-# @DESCRIPTION:
-# Set this to disable renaming of Python scripts containing versioned shebangs
-# and generation of wrapper scripts.
+# Scheduled for deletion on 2011-06-01.
if [[ -n "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" ]]; then
- ewarn
- ewarn "\"${EBUILD}\":"
- ewarn "Deprecation Warning: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS is deprecated"
- ewarn "and will be banned on 2011-02-01. Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\")."
- ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
- ewarn
-
- PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+ eerror "Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\") instead of DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS variable."
+ die "DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS variable is banned"
fi
# @ECLASS-VARIABLE: DOCS
@@ -144,6 +141,48 @@
fi
}
+_distutils_prepare_global_options() {
+ local element option pattern
+
+ if [[ -n "$(declare -p DISTUTILS_GLOBAL_OPTIONS 2> /dev/null)" && "$(declare -p DISTUTILS_GLOBAL_OPTIONS)" != "declare -a DISTUTILS_GLOBAL_OPTIONS="* ]]; then
+ die "DISTUTILS_GLOBAL_OPTIONS should be indexed array"
+ fi
+
+ if has "${EAPI:-0}" 0 1 2 3; then
+ _DISTUTILS_GLOBAL_OPTIONS=("${DISTUTILS_GLOBAL_OPTIONS[@]}")
+ else
+ _DISTUTILS_GLOBAL_OPTIONS=()
+
+ for element in "${DISTUTILS_GLOBAL_OPTIONS[@]}"; do
+ if [[ ! "${element}" =~ ^[^[:space:]]+\ . ]]; then
+ die "Element '${element}' of DISTUTILS_GLOBAL_OPTIONS array has invalid syntax"
+ fi
+ pattern="${element%% *}"
+ option="${element#* }"
+ if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
+ _DISTUTILS_GLOBAL_OPTIONS+=("${option}")
+ fi
+ done
+ fi
+}
+
+_distutils_prepare_current_working_directory() {
+ if [[ "$1" == *"|"*"|"* ]]; then
+ die "Element '$1' of DISTUTILS_SETUP_FILES array has invalid syntax"
+ fi
+
+ if [[ "$1" == *"|"* ]]; then
+ echo "${_BOLD}[${1%|*}]${_NORMAL}"
+ pushd "${1%|*}" > /dev/null || die "Entering directory '${1%|*}' failed"
+ fi
+}
+
+_distutils_restore_current_working_directory() {
+ if [[ "$1" == *"|"* ]]; then
+ popd > /dev/null || die "Leaving directory '${1%|*}' failed"
+ fi
+}
+
# @FUNCTION: distutils_src_unpack
# @DESCRIPTION:
# The distutils src_unpack function. This function is exported.
@@ -170,8 +209,15 @@
die "${FUNCNAME}() can be used only in src_prepare() phase"
fi
+ _python_check_python_pkg_setup_execution
+
+ local distribute_setup_existence="0" ez_setup_existence="0"
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
# Delete ez_setup files to prevent packages from installing Setuptools on their own.
- local ez_setup_existence="0"
[[ -d ez_setup || -f ez_setup.py ]] && ez_setup_existence="1"
rm -fr ez_setup*
if [[ "${ez_setup_existence}" == "1" ]]; then
@@ -179,7 +225,6 @@
fi
# Delete distribute_setup files to prevent packages from installing Distribute on their own.
- local distribute_setup_existence="0"
[[ -d distribute_setup || -f distribute_setup.py ]] && distribute_setup_existence="1"
rm -fr distribute_setup*
if [[ "${distribute_setup_existence}" == "1" ]]; then
@@ -201,26 +246,40 @@
die "${FUNCNAME}() can be used only in src_compile() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_set_color_variables
+ local setup_file
+
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_building() {
_distutils_hook pre
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_building "$@"
+ unset -f distutils_building
else
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
fi
}
@@ -257,27 +316,41 @@
die "${FUNCNAME}() can be used only in src_test() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_set_color_variables
+ local arguments setup_file
+
if [[ "${DISTUTILS_SRC_TEST}" == "setup.py" ]]; then
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_testing() {
_distutils_hook pre
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_testing "$@"
+ unset -f distutils_testing
else
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
fi
elif [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
@@ -290,16 +363,15 @@
python_execute_py.test -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@"
# trial requires an argument, which is usually equal to "${PN}".
elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then
- local trial_arguments
if [[ "${DISTUTILS_SRC_TEST}" == "trial "* ]]; then
- trial_arguments="${DISTUTILS_SRC_TEST#trial }"
+ arguments="${DISTUTILS_SRC_TEST#trial }"
else
- trial_arguments="${PN}"
+ arguments="${PN}"
fi
_distutils_src_test_hook trial
- python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${trial_arguments} "$@"
+ python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${arguments} "$@"
else
die "'DISTUTILS_SRC_TEST' variable has unsupported value '${DISTUTILS_SRC_TEST}'"
fi
@@ -311,56 +383,95 @@
# In ebuilds of packages supporting installation for multiple versions of Python, this function
# calls distutils_src_install_pre_hook() and distutils_src_install_post_hook(), if they are defined.
# It also installs some standard documentation files (AUTHORS, Change*, CHANGELOG, CONTRIBUTORS,
-# KNOWN_BUGS, MAINTAINERS, MANIFEST*, NEWS, PKG-INFO, README*, TODO).
+# KNOWN_BUGS, MAINTAINERS, NEWS, README*, TODO).
distutils_src_install() {
if [[ "${EBUILD_PHASE}" != "install" ]]; then
die "${FUNCNAME}() can be used only in src_install() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
_python_set_color_variables
+ local default_docs doc line nspkg_pth_file nspkg_pth_files=() setup_file
+
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_installation() {
_distutils_hook pre
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_installation "$@"
+ unset -f distutils_installation
python_merge_intermediate_installation_images "${T}/images"
else
# Mark the package to be rebuilt after a Python upgrade.
python_need_rebuild
- local setup_file
+ _distutils_prepare_global_options
+
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
+ done
+ fi
+
+ while read -d $'\0' -r nspkg_pth_file; do
+ nspkg_pth_files+=("${nspkg_pth_file}")
+ done < <(find "${ED}" -name "*-nspkg.pth" -type f -print0)
+
+ if [[ "${#nspkg_pth_files[@]}" -gt 0 ]]; then
+ einfo
+ einfo "Python namespaces:"
+ for nspkg_pth_file in "${nspkg_pth_files[@]}"; do
+ einfo " '${nspkg_pth_file#${ED%/}}':"
+ while read -r line; do
+ einfo " $(echo "${line}" | sed -e "s/.*types\.ModuleType('\([^']\+\)').*/\1/")"
+ done < "${nspkg_pth_file}"
+ if ! has "${EAPI:-0}" 0 1 2 3; then
+ rm -f "${nspkg_pth_file}" || die "Deletion of '${nspkg_pth_file}' failed"
+ fi
done
+ einfo
fi
if [[ -e "${ED}usr/local" ]]; then
die "Illegal installation into /usr/local"
fi
- local default_docs
- default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO"
+ default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS NEWS README* TODO"
- local doc
for doc in ${default_docs}; do
[[ -s "${doc}" ]] && dodoc "${doc}"
done
- if [[ -n "${DOCS}" ]]; then
- dodoc ${DOCS} || die "dodoc failed"
+ if has "${EAPI:-0}" 0 1 2 3; then
+ if [[ -n "${DOCS}" ]]; then
+ dodoc ${DOCS} || die "dodoc failed"
+ fi
+ else
+ if [[ -n "${DOCS}" ]]; then
+ dodoc -r ${DOCS} || die "dodoc failed"
+ fi
fi
+
+ DISTUTILS_SRC_INSTALL_EXECUTED="1"
}
# @FUNCTION: distutils_pkg_postinst
@@ -374,9 +485,19 @@
die "${FUNCNAME}() can be used only in pkg_postinst() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
+ if [[ -z "${DISTUTILS_SRC_INSTALL_EXECUTED}" ]]; then
+ die "${FUNCNAME}() called illegally"
+ fi
+
local pylibdir pymod
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
@@ -407,9 +528,19 @@
die "${FUNCNAME}() can be used only in pkg_postrm() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
+ if [[ -z "${DISTUTILS_SRC_INSTALL_EXECUTED}" ]]; then
+ die "${FUNCNAME}() called illegally"
+ fi
+
local pylibdir pymod
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
@@ -433,14 +564,29 @@
fi
}
-# Scheduled for deletion on 2011-01-01.
-distutils_python_version() {
- eerror "Use PYTHON() instead of python variable. Use python_get_*() instead of PYVER* variables."
- die "${FUNCNAME}() is banned"
-}
+# @FUNCTION: distutils_get_intermediate_installation_image
+# @DESCRIPTION:
+# Print path to intermediate installation image.
+#
+# This function can be used only in distutils_src_install_pre_hook() and distutils_src_install_post_hook().
+distutils_get_intermediate_installation_image() {
+ if [[ "${EBUILD_PHASE}" != "install" ]]; then
+ die "${FUNCNAME}() can be used only in src_install() phase"
+ fi
+
+ if ! _python_package_supporting_installation_for_multiple_python_abis; then
+ die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
+ fi
+
+ _python_check_python_pkg_setup_execution
+
+ if [[ ! "${FUNCNAME[1]}" =~ ^distutils_src_install_(pre|post)_hook$ ]]; then
+ die "${FUNCNAME}() can be used only in distutils_src_install_pre_hook() and distutils_src_install_post_hook()"
+ fi
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
-# Scheduled for deletion on 2011-01-01.
-distutils_python_tkinter() {
- eerror "Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}()."
- die "${FUNCNAME}() is banned"
+ echo "${T}/images/${PYTHON_ABI}"
}
[-- Attachment #1.3: distutils.eclass.patch.1 --]
[-- Type: text/x-patch, Size: 1308 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.79 2010/12/24 15:05:24 arfrever Exp $
@@ -100,19 +100,10 @@
EXPORT_FUNCTIONS src_test
fi
-# @ECLASS-VARIABLE: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS
-# @DESCRIPTION:
-# Set this to disable renaming of Python scripts containing versioned shebangs
-# and generation of wrapper scripts.
+# Scheduled for deletion on 2011-06-01.
if [[ -n "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" ]]; then
- ewarn
- ewarn "\"${EBUILD}\":"
- ewarn "Deprecation Warning: DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS is deprecated"
- ewarn "and will be banned on 2011-02-01. Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\")."
- ewarn "The ebuild needs to be fixed. Please report a bug, if it has not been already reported."
- ewarn
-
- PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+ eerror "Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\") instead of DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS variable."
+ die "DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS variable is banned"
fi
# @ECLASS-VARIABLE: DOCS
[-- Attachment #1.4: distutils.eclass.patch.2 --]
[-- Type: text/x-patch, Size: 481 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -423,15 +423,3 @@
fi
fi
}
-
-# Scheduled for deletion on 2011-01-01.
-distutils_python_version() {
- eerror "Use PYTHON() instead of python variable. Use python_get_*() instead of PYVER* variables."
- die "${FUNCNAME}() is banned"
-}
-
-# Scheduled for deletion on 2011-01-01.
-distutils_python_tkinter() {
- eerror "Use PYTHON_USE_WITH=\"xml\" and python_pkg_setup() instead of ${FUNCNAME}()."
- die "${FUNCNAME}() is banned"
-}
[-- Attachment #1.5: distutils.eclass.patch.3 --]
[-- Type: text/x-patch, Size: 1106 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -311,6 +311,8 @@
_python_initialize_prefix_variables
_python_set_color_variables
+ local line nspkg_pth_file nspkg_pth_files=()
+
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_installation() {
_distutils_hook pre
@@ -337,6 +339,25 @@
done
fi
+ while read -d $'\0' -r nspkg_pth_file; do
+ nspkg_pth_files+=("${nspkg_pth_file}")
+ done < <(find "${ED}" -name "*-nspkg.pth" -type f -print0)
+
+ if [[ "${#nspkg_pth_files[@]}" -gt 0 ]]; then
+ einfo
+ einfo "Python namespaces:"
+ for nspkg_pth_file in "${nspkg_pth_files[@]}"; do
+ einfo " '${nspkg_pth_file#${ED%/}}':"
+ while read -r line; do
+ einfo " $(echo "${line}" | sed -e "s/.*types\.ModuleType('\([^']\+\)').*/\1/")"
+ done < "${nspkg_pth_file}"
+ if ! has "${EAPI:-0}" 0 1 2 3; then
+ rm -f "${nspkg_pth_file}" || die "Deletion of '${nspkg_pth_file}' failed"
+ fi
+ done
+ einfo
+ fi
+
if [[ -e "${ED}usr/local" ]]; then
die "Illegal installation into /usr/local"
fi
[-- Attachment #1.6: distutils.eclass.patch.4 --]
[-- Type: text/x-patch, Size: 1463 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -161,6 +161,8 @@
die "${FUNCNAME}() can be used only in src_prepare() phase"
fi
+ _python_check_python_pkg_setup_execution
+
# Delete ez_setup files to prevent packages from installing Setuptools on their own.
local ez_setup_existence="0"
[[ -d ez_setup || -f ez_setup.py ]] && ez_setup_existence="1"
@@ -192,6 +194,7 @@
die "${FUNCNAME}() can be used only in src_compile() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_set_color_variables
if _python_package_supporting_installation_for_multiple_python_abis; then
@@ -248,6 +251,7 @@
die "${FUNCNAME}() can be used only in src_test() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_set_color_variables
if [[ "${DISTUTILS_SRC_TEST}" == "setup.py" ]]; then
@@ -308,6 +312,7 @@
die "${FUNCNAME}() can be used only in src_install() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
_python_set_color_variables
@@ -386,6 +391,7 @@
die "${FUNCNAME}() can be used only in pkg_postinst() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
local pylibdir pymod
@@ -419,6 +425,7 @@
die "${FUNCNAME}() can be used only in pkg_postrm() phase"
fi
+ _python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
local pylibdir pymod
[-- Attachment #1.7: distutils.eclass.patch.5 --]
[-- Type: text/x-patch, Size: 409 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -375,8 +375,14 @@
[[ -s "${doc}" ]] && dodoc "${doc}"
done
- if [[ -n "${DOCS}" ]]; then
- dodoc ${DOCS} || die "dodoc failed"
+ if has "${EAPI:-0}" 0 1 2 3; then
+ if [[ -n "${DOCS}" ]]; then
+ dodoc ${DOCS} || die "dodoc failed"
+ fi
+ else
+ if [[ -n "${DOCS}" ]]; then
+ dodoc -r ${DOCS} || die "dodoc failed"
+ fi
fi
}
[-- Attachment #1.8: distutils.eclass.patch.6 --]
[-- Type: text/x-patch, Size: 946 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -306,7 +306,7 @@
# In ebuilds of packages supporting installation for multiple versions of Python, this function
# calls distutils_src_install_pre_hook() and distutils_src_install_post_hook(), if they are defined.
# It also installs some standard documentation files (AUTHORS, Change*, CHANGELOG, CONTRIBUTORS,
-# KNOWN_BUGS, MAINTAINERS, MANIFEST*, NEWS, PKG-INFO, README*, TODO).
+# KNOWN_BUGS, MAINTAINERS, NEWS, README*, TODO).
distutils_src_install() {
if [[ "${EBUILD_PHASE}" != "install" ]]; then
die "${FUNCNAME}() can be used only in src_install() phase"
@@ -368,7 +368,7 @@
fi
local default_docs
- default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS MANIFEST* NEWS PKG-INFO README* TODO"
+ default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS NEWS README* TODO"
local doc
for doc in ${default_docs}; do
[-- Attachment #1.9: distutils.eclass.patch.7 --]
[-- Type: text/x-patch, Size: 1002 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -384,6 +384,8 @@
dodoc -r ${DOCS} || die "dodoc failed"
fi
fi
+
+ DISTUTILS_SRC_INSTALL_EXECUTED="1"
}
# @FUNCTION: distutils_pkg_postinst
@@ -400,6 +402,10 @@
_python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
+ if [[ -z "${DISTUTILS_SRC_INSTALL_EXECUTED}" ]]; then
+ die "${FUNCNAME}() called illegally"
+ fi
+
local pylibdir pymod
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
@@ -434,6 +440,10 @@
_python_check_python_pkg_setup_execution
_python_initialize_prefix_variables
+ if [[ -z "${DISTUTILS_SRC_INSTALL_EXECUTED}" ]]; then
+ die "${FUNCNAME}() called illegally"
+ fi
+
local pylibdir pymod
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
[-- Attachment #1.10: distutils.eclass.patch.8 --]
[-- Type: text/x-patch, Size: 6685 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -135,6 +135,31 @@
fi
}
+_distutils_prepare_global_options() {
+ local element option pattern
+
+ if [[ -n "$(declare -p DISTUTILS_GLOBAL_OPTIONS 2> /dev/null)" && "$(declare -p DISTUTILS_GLOBAL_OPTIONS)" != "declare -a DISTUTILS_GLOBAL_OPTIONS="* ]]; then
+ die "DISTUTILS_GLOBAL_OPTIONS should be indexed array"
+ fi
+
+ if has "${EAPI:-0}" 0 1 2 3; then
+ _DISTUTILS_GLOBAL_OPTIONS=("${DISTUTILS_GLOBAL_OPTIONS[@]}")
+ else
+ _DISTUTILS_GLOBAL_OPTIONS=()
+
+ for element in "${DISTUTILS_GLOBAL_OPTIONS[@]}"; do
+ if [[ ! "${element}" =~ ^[^[:space:]]+\ . ]]; then
+ die "Element '${element}' of DISTUTILS_GLOBAL_OPTIONS array has invalid syntax"
+ fi
+ pattern="${element%% *}"
+ option="${element#* }"
+ if _python_check_python_abi_matching "${PYTHON_ABI}" "${pattern}"; then
+ _DISTUTILS_GLOBAL_OPTIONS+=("${option}")
+ fi
+ done
+ fi
+}
+
# @FUNCTION: distutils_src_unpack
# @DESCRIPTION:
# The distutils src_unpack function. This function is exported.
@@ -201,20 +226,24 @@
distutils_building() {
_distutils_hook pre
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
+ echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
done
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_building "$@"
else
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
+ echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
done
fi
}
@@ -259,20 +288,24 @@
distutils_testing() {
_distutils_hook pre
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
done
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_testing "$@"
else
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
done
fi
elif [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
@@ -322,10 +355,12 @@
distutils_installation() {
_distutils_hook pre
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
+ echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
done
_distutils_hook post
@@ -337,10 +372,12 @@
# Mark the package to be rebuilt after a Python upgrade.
python_need_rebuild
+ _distutils_prepare_global_options
+
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
+ echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
done
fi
[-- Attachment #1.11: distutils.eclass.patch.9 --]
[-- Type: text/x-patch, Size: 969 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -504,3 +504,26 @@
fi
fi
}
+
+# @FUNCTION: distutils_get_intermediate_installation_image
+# @DESCRIPTION:
+# Print path to intermediate installation image.
+#
+# This function can be used only in distutils_src_install_pre_hook() and distutils_src_install_post_hook().
+distutils_get_intermediate_installation_image() {
+ if [[ "${EBUILD_PHASE}" != "install" ]]; then
+ die "${FUNCNAME}() can be used only in src_install() phase"
+ fi
+
+ if ! _python_package_supporting_installation_for_multiple_python_abis; then
+ die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
+ fi
+
+ _python_check_python_pkg_setup_execution
+
+ if [[ ! "${FUNCNAME[1]}" =~ ^distutils_src_install_(pre|post)_hook$ ]]; then
+ die "${FUNCNAME}() can be used only in distutils_src_install_pre_hook() and distutils_src_install_post_hook()"
+ fi
+
+ echo "${T}/images/${PYTHON_ABI}"
+}
[-- Attachment #1.12: distutils.eclass.patch.10 --]
[-- Type: text/x-patch, Size: 7051 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -58,11 +58,17 @@
# @ECLASS-VARIABLE: DISTUTILS_SETUP_FILES
# @DESCRIPTION:
-# Paths to setup files.
+# Array of paths to setup files.
+# Syntax:
+# [current_working_directory|]path_to_setup_file
# @ECLASS-VARIABLE: DISTUTILS_GLOBAL_OPTIONS
# @DESCRIPTION:
-# Global options passed to setup files.
+# Array of global options passed to setup files.
+# Syntax in EAPI <4:
+# global_option
+# Syntax in EAPI >=4:
+# Python_ABI_pattern global_option
# @ECLASS-VARIABLE: DISTUTILS_SRC_TEST
# @DESCRIPTION:
@@ -160,6 +166,23 @@
fi
}
+_distutils_prepare_current_working_directory() {
+ if [[ "$1" == *"|"*"|"* ]]; then
+ die "Element '$1' of DISTUTILS_SETUP_FILES array has invalid syntax"
+ fi
+
+ if [[ "$1" == *"|"* ]]; then
+ echo "${_BOLD}[${1%|*}]${_NORMAL}"
+ pushd "${1%|*}" > /dev/null || die "Entering directory '${1%|*}' failed"
+ fi
+}
+
+_distutils_restore_current_working_directory() {
+ if [[ "$1" == *"|"* ]]; then
+ popd > /dev/null || die "Leaving directory '${1%|*}' failed"
+ fi
+}
+
# @FUNCTION: distutils_src_unpack
# @DESCRIPTION:
# The distutils src_unpack function. This function is exported.
@@ -230,8 +253,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build -b "$(_distutils_get_build_dir)" "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
@@ -242,8 +269,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" build "$@" || die "Building failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
fi
}
@@ -292,8 +323,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") test "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
@@ -304,8 +339,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
- PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@"${_NORMAL}
+ PYTHONPATH="$(_distutils_get_PYTHONPATH)" "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" test "$@" || die "Testing failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
fi
elif [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
@@ -359,8 +398,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" $([[ -z "${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES}" ]] && echo build -b "$(_distutils_get_build_dir)") install --no-compile --root="${T}/images/${PYTHON_ABI}" "$@" || return "$?"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
_distutils_hook post
@@ -376,8 +419,12 @@
local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
- echo ${_BOLD}"$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
- "$(PYTHON)" "${setup_file}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
+ _distutils_prepare_current_working_directory "${setup_file}"
+
+ echo ${_BOLD}"$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@"${_NORMAL}
+ "$(PYTHON)" "${setup_file#*|}" "${_DISTUTILS_GLOBAL_OPTIONS[@]}" install --root="${D}" --no-compile "$@" || die "Installation failed"
+
+ _distutils_restore_current_working_directory "${setup_file}"
done
fi
[-- Attachment #1.13: distutils.eclass.patch.11 --]
[-- Type: text/x-patch, Size: 1384 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -211,6 +211,10 @@
_python_check_python_pkg_setup_execution
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
# Delete ez_setup files to prevent packages from installing Setuptools on their own.
local ez_setup_existence="0"
[[ -d ez_setup || -f ez_setup.py ]] && ez_setup_existence="1"
@@ -491,6 +495,11 @@
fi
local pylibdir pymod
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
@@ -529,6 +538,11 @@
fi
local pylibdir pymod
+
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
if [[ -z "$(declare -p PYTHON_MODNAME 2> /dev/null)" ]]; then
for pylibdir in "${EROOT}"usr/$(get_libdir)/python* "${EROOT}"usr/share/jython-*/Lib; do
if [[ -d "${pylibdir}/site-packages/${PN}" ]]; then
@@ -572,5 +586,9 @@
die "${FUNCNAME}() can be used only in distutils_src_install_pre_hook() and distutils_src_install_post_hook()"
fi
+ if [[ "$#" -ne 0 ]]; then
+ die "${FUNCNAME}() does not accept arguments"
+ fi
+
echo "${T}/images/${PYTHON_ABI}"
}
[-- Attachment #1.14: distutils.eclass.patch.12 --]
[-- Type: text/x-patch, Size: 787 bytes --]
--- distutils.eclass
+++ distutils.eclass
@@ -268,6 +268,7 @@
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_building "$@"
+ unset -f distutils_building
else
_distutils_prepare_global_options
@@ -338,6 +339,7 @@
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_testing "$@"
+ unset -f distutils_testing
else
_distutils_prepare_global_options
@@ -413,6 +415,7 @@
_distutils_hook post
}
python_execute_function ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} distutils_installation "$@"
+ unset -f distutils_installation
python_merge_intermediate_installation_images "${T}/images"
else
[-- Attachment #1.15: distutils.eclass.patch.13 --]
[-- Type: text/x-patch, Size: 4368 bytes --]
--- distutils.eclass.12 2011-04-03 01:52:18.815859897 +0200
+++ distutils.eclass.13 2011-04-03 02:04:03.093858500 +0200
@@ -211,12 +211,13 @@
_python_check_python_pkg_setup_execution
+ local distribute_setup_existence="0" ez_setup_existence="0"
+
if [[ "$#" -ne 0 ]]; then
die "${FUNCNAME}() does not accept arguments"
fi
# Delete ez_setup files to prevent packages from installing Setuptools on their own.
- local ez_setup_existence="0"
[[ -d ez_setup || -f ez_setup.py ]] && ez_setup_existence="1"
rm -fr ez_setup*
if [[ "${ez_setup_existence}" == "1" ]]; then
@@ -224,7 +225,6 @@
fi
# Delete distribute_setup files to prevent packages from installing Distribute on their own.
- local distribute_setup_existence="0"
[[ -d distribute_setup || -f distribute_setup.py ]] && distribute_setup_existence="1"
rm -fr distribute_setup*
if [[ "${distribute_setup_existence}" == "1" ]]; then
@@ -249,13 +249,14 @@
_python_check_python_pkg_setup_execution
_python_set_color_variables
+ local setup_file
+
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_building() {
_distutils_hook pre
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -272,7 +273,6 @@
else
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -319,6 +319,8 @@
_python_check_python_pkg_setup_execution
_python_set_color_variables
+ local arguments setup_file
+
if [[ "${DISTUTILS_SRC_TEST}" == "setup.py" ]]; then
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_testing() {
@@ -326,7 +328,6 @@
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -343,7 +344,6 @@
else
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -363,16 +363,15 @@
python_execute_py.test -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- "$@"
# trial requires an argument, which is usually equal to "${PN}".
elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then
- local trial_arguments
if [[ "${DISTUTILS_SRC_TEST}" == "trial "* ]]; then
- trial_arguments="${DISTUTILS_SRC_TEST#trial }"
+ arguments="${DISTUTILS_SRC_TEST#trial }"
else
- trial_arguments="${PN}"
+ arguments="${PN}"
fi
_distutils_src_test_hook trial
- python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${trial_arguments} "$@"
+ python_execute_trial -P '$(_distutils_get_PYTHONPATH)' ${DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES:+-s} -- ${arguments} "$@"
else
die "'DISTUTILS_SRC_TEST' variable has unsupported value '${DISTUTILS_SRC_TEST}'"
fi
@@ -394,7 +393,7 @@
_python_initialize_prefix_variables
_python_set_color_variables
- local line nspkg_pth_file nspkg_pth_files=()
+ local default_docs doc line nspkg_pth_file nspkg_pth_files=() setup_file
if _python_package_supporting_installation_for_multiple_python_abis; then
distutils_installation() {
@@ -402,7 +401,6 @@
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -424,7 +422,6 @@
_distutils_prepare_global_options
- local setup_file
for setup_file in "${DISTUTILS_SETUP_FILES[@]-setup.py}"; do
_distutils_prepare_current_working_directory "${setup_file}"
@@ -458,10 +455,8 @@
die "Illegal installation into /usr/local"
fi
- local default_docs
default_docs="AUTHORS Change* CHANGELOG CONTRIBUTORS KNOWN_BUGS MAINTAINERS NEWS README* TODO"
- local doc
for doc in ${default_docs}; do
[[ -s "${doc}" ]] && dodoc "${doc}"
done
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-03 18:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-03 18:04 [gentoo-dev] Patch for distutils.eclass [2011-04-03] Arfrever Frehtes Taifersar Arahesis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox