--- trunk/include/pypi.sminc 2017/10/11 09:52:54 29776 +++ trunk/include/pypi.sminc 2017/10/11 10:56:30 29778 @@ -80,15 +80,19 @@ pypi_src_install() { - if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]] - then - python2_src_install || die - python3_src_install || die - else - python_src_install || die - fi + python_src_install || die } +eval "pypi_src_install_python2-${PNAME}() +{ + python2_src_install || die +}" + +eval "pypi_src_install_python3-${PNAME}() +{ + python3_src_install || die +}" + pypi_multilib_src_compile() { local configure_opts="$@" @@ -114,12 +118,12 @@ python_multilib_src_install || die } -eval "pypi_multilib_src_compile-python2-${PNAME}() +eval "pypi_multilib_src_install_python2-${PNAME}() { python2_multilib_src_install || die }" -eval "pypi_multilib_src_compile-python3-${PNAME}() +eval "pypi_multilib_src_install_python3-${PNAME}() { python3_multilib_src_install || die }" @@ -134,5 +138,10 @@ export_inherits pypi_multilib src_compile src_install fi else - export_inherits pypi src_compile src_install + if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]] + then + export_inherits pypi src_compile src_install_python2-${PNAME} src_install_python3-${PNAME} + else + export_inherits pypi src_compile src_install + fi fi