Update EAPI checks due to missing features in gentoo-x86. Patch by Arfrever. --- python.eclass +++ python.eclass @@ -261,7 +261,7 @@ DEPEND=">=app-admin/eselect-python-20091230" RDEPEND="${DEPEND}" -if has "${EAPI:-0}" 0 1 2 3; then +if has "${EAPI:-0}" 0 1 2 3 4; then _PYTHON_ATOMS_FROM_PYTHON_DEPEND=() _PYTHON_ATOMS_FROM_PYTHON_BDEPEND=() if [[ -z "${PYTHON_DEPEND}" && -z "${PYTHON_BDEPEND}" ]]; then @@ -284,21 +284,21 @@ # @ECLASS-VARIABLE: PYTHON_USE_WITH # @DESCRIPTION: # Set this to a space separated list of USE flags the Python slot in use must be built with. -# This variable can be used only in EAPI 2 and 3. +# This variable can be used only in EAPI 2, 3 and 4. # @ECLASS-VARIABLE: PYTHON_USE_WITH_OR # @DESCRIPTION: # Set this to a space separated list of USE flags of which one must be turned on for the slot in use. # This variable is ignored when PYTHON_USE_WITH is set. -# This variable can be used only in EAPI 2 and 3. +# This variable can be used only in EAPI 2, 3 and 4. # @ECLASS-VARIABLE: PYTHON_USE_WITH_OPT # @DESCRIPTION: # Set this to a name of a USE flag if you need to make either PYTHON_USE_WITH or # PYTHON_USE_WITH_OR atoms conditional under a USE flag. -# This variable can be used only in EAPI 2 and 3. +# This variable can be used only in EAPI 2, 3 and 4. -if has "${EAPI:-0}" 2 3; then +if has "${EAPI:-0}" 2 3 4; then if [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then _PYTHON_USE_WITH_ATOMS_ARRAY_FROM_PYTHON_DEPEND=() _PYTHON_USE_WITH_ATOMS_ARRAY_FROM_PYTHON_BDEPEND=() @@ -360,7 +360,7 @@ fi fi -if has "${EAPI:-0}" 0 1 2 3; then +if has "${EAPI:-0}" 0 1 2 3 4; then unset _PYTHON_ATOMS_FROM_PYTHON_DEPEND _PYTHON_ATOMS_FROM_PYTHON_BDEPEND fi