--- trunk/include/pypi.sminc 2017/10/16 09:19:58 29840 +++ trunk/include/pypi.sminc 2017/10/16 09:21:22 29841 @@ -7,7 +7,7 @@ # needs python sminclude python -: ${SPLITPNAME="${PNAME}"} +: ${SPLIT_PNAME="${PNAME}"} : ${PYPI_MODULE="${PNAME}"} : ${PYPI_ARCHIVE="gz"} @@ -27,15 +27,15 @@ if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]] then sminclude python2 python3 - SPLIT_PACKAGES="python2-${SPLITPNAME} python3-${SPLITPNAME}" + SPLIT_PACKAGES="python2-${SPLIT_PNAME} python3-${SPLIT_PNAME}" - eval "split_info_python2-${SPLITPNAME}() + eval "split_info_python2-${SPLIT_PNAME}() { DEPEND=\"\${DEPEND} >= dev-lang/python2-2.7\" }" - eval "split_info_python3-${SPLITPNAME}() + eval "split_info_python3-${SPLIT_PNAME}() { DEPEND=\"\${DEPEND} >= dev-lang/python3-3.6\" @@ -84,12 +84,12 @@ python_src_install || die } -eval "pypi_src_install_python2-${SPLITPNAME}() +eval "pypi_src_install_python2-${SPLIT_PNAME}() { python2_src_install || die }" -eval "pypi_src_install_python3-${SPLITPNAME}() +eval "pypi_src_install_python3-${SPLIT_PNAME}() { python3_src_install || die }" @@ -119,12 +119,12 @@ python_multilib_src_install || die } -eval "pypi_multilib_src_install_python2-${SPLITPNAME}() +eval "pypi_multilib_src_install_python2-${SPLIT_PNAME}() { python2_multilib_src_install || die }" -eval "pypi_multilib_src_install_python3-${SPLITPNAME}() +eval "pypi_multilib_src_install_python3-${SPLIT_PNAME}() { python3_multilib_src_install || die }" @@ -134,14 +134,14 @@ then if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]] then - export_inherits pypi_multilib src_compile src_install_python2-${SPLITPNAME} src_install_python3-${SPLITPNAME} + export_inherits pypi_multilib src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME} else export_inherits pypi_multilib src_compile src_install fi else if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]] then - export_inherits pypi src_compile src_install_python2-${SPLITPNAME} src_install_python3-${SPLITPNAME} + export_inherits pypi src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME} else export_inherits pypi src_compile src_install fi