diff options
-rw-r--r-- | dev-lang/python/python-2.7.10-r5.ebuild (renamed from dev-lang/python/python-2.7.10-r4.ebuild) | 5 | ||||
-rw-r--r-- | dev-lang/python/python-2.7.11-r1.ebuild (renamed from dev-lang/python/python-2.7.11.ebuild) | 5 | ||||
-rw-r--r-- | dev-lang/python/python-3.3.5-r6.ebuild (renamed from dev-lang/python/python-3.3.5-r5.ebuild) | 15 | ||||
-rw-r--r-- | dev-lang/python/python-3.4.3-r6.ebuild (renamed from dev-lang/python/python-3.4.3-r5.ebuild) | 15 | ||||
-rw-r--r-- | dev-lang/python/python-3.5.0-r5.ebuild (renamed from dev-lang/python/python-3.5.0-r4.ebuild) | 15 | ||||
-rw-r--r-- | dev-lang/python/python-3.5.1-r1.ebuild (renamed from dev-lang/python/python-3.5.1.ebuild) | 15 |
6 files changed, 50 insertions, 20 deletions
diff --git a/dev-lang/python/python-2.7.10-r4.ebuild b/dev-lang/python/python-2.7.10-r5.ebuild index ee529588dee..e4d9824406d 100644 --- a/dev-lang/python/python-2.7.10-r4.ebuild +++ b/dev-lang/python/python-2.7.10-r5.ebuild @@ -337,6 +337,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/2to3" || die ln -s "../../../bin/pydoc${SLOT}" \ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { diff --git a/dev-lang/python/python-2.7.11.ebuild b/dev-lang/python/python-2.7.11-r1.ebuild index f3113c660a2..3cf1079074b 100644 --- a/dev-lang/python/python-2.7.11.ebuild +++ b/dev-lang/python/python-2.7.11-r1.ebuild @@ -338,6 +338,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/2to3" || die ln -s "../../../bin/pydoc${SLOT}" \ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { diff --git a/dev-lang/python/python-3.3.5-r5.ebuild b/dev-lang/python/python-3.3.5-r6.ebuild index eac97eec48d..a85ba3c2910 100644 --- a/dev-lang/python/python-3.3.5-r5.ebuild +++ b/dev-lang/python/python-3.3.5-r6.ebuild @@ -254,10 +254,14 @@ src_install() { # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}usr/include"; echo python*) - # Replace python3.X with a symlink if appropriate if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm rm "${ED}usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" fi if use build; then @@ -325,10 +329,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - - # Compatibility link for stuff that calls ${PYTHON}-config - # Remove this when all revdeps have been fixed to not do that. - dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { diff --git a/dev-lang/python/python-3.4.3-r5.ebuild b/dev-lang/python/python-3.4.3-r6.ebuild index ecdb23d62f7..98549fa3b72 100644 --- a/dev-lang/python/python-3.4.3-r5.ebuild +++ b/dev-lang/python/python-3.4.3-r6.ebuild @@ -241,10 +241,14 @@ src_install() { # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}usr/include"; echo python*) - # Replace python3.X with a symlink if appropriate if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm rm "${ED}usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" fi use elibc_uclibc && rm -fr "${libdir}/test" @@ -308,10 +312,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - - # Compatibility link for stuff that calls ${PYTHON}-config - # Remove this when all revdeps have been fixed to not do that. - dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { diff --git a/dev-lang/python/python-3.5.0-r4.ebuild b/dev-lang/python/python-3.5.0-r5.ebuild index df51c6009fd..2ed98982edb 100644 --- a/dev-lang/python/python-3.5.0-r4.ebuild +++ b/dev-lang/python/python-3.5.0-r5.ebuild @@ -244,10 +244,14 @@ src_install() { # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}usr/include"; echo python*) - # Replace python3.X with a symlink if appropriate if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm rm "${ED}usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" fi use elibc_uclibc && rm -fr "${libdir}/test" @@ -311,10 +315,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - - # Compatibility link for stuff that calls ${PYTHON}-config - # Remove this when all revdeps have been fixed to not do that. - dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { diff --git a/dev-lang/python/python-3.5.1.ebuild b/dev-lang/python/python-3.5.1-r1.ebuild index cce4c7da667..ef7c58e30a9 100644 --- a/dev-lang/python/python-3.5.1.ebuild +++ b/dev-lang/python/python-3.5.1-r1.ebuild @@ -244,10 +244,14 @@ src_install() { # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}usr/include"; echo python*) - # Replace python3.X with a symlink if appropriate if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm rm "${ED}usr/bin/python${PYVER}" || die dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" fi use elibc_uclibc && rm -fr "${libdir}/test" @@ -311,10 +315,11 @@ src_install() { "${D}${PYTHON_SCRIPTDIR}/pydoc" || die ln -s "../../../bin/pyvenv-${PYVER}" \ "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - - # Compatibility link for stuff that calls ${PYTHON}-config - # Remove this when all revdeps have been fixed to not do that. - dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi } pkg_preinst() { |