gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-06 05:37:14 -08:00
Code Issues Projects Releases Wiki Activity

dev-lang/python: Ensure python-config & .pc ABI symlinks, idle wrapping

Browse Source 
Fix the pythonX.Y-config symlink creation to be only applied when
ABIFLAGS are not empty, and add additional python-X.Ym.pc symlink for
pkg-config. Make both official as they are created as part of regular
upstream 'make install' (but not 'make altinstall' used by Gentoo).

Install python-exec wrapping symlink for the idle executable when USE=tk
is enabled.
This commit is contained in:
Michał Górny
2015-12-18 23:01:15 +01:00
parent 1255f10db5
commit c673770d67
6 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-lang/python/python-2.7.10-r4.ebuild → dev-lang/python/python-2.7.10-r5.ebuild
+5
View File
@@ -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() {
dev-lang/python/python-2.7.11.ebuild → dev-lang/python/python-2.7.11-r1.ebuild
+5
View File
@@ -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() {
dev-lang/python/python-3.3.5-r5.ebuild → dev-lang/python/python-3.3.5-r6.ebuild
+10 -5
View File
@@ -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() {
dev-lang/python/python-3.4.3-r5.ebuild → dev-lang/python/python-3.4.3-r6.ebuild
+10 -5
View File
@@ -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() {
dev-lang/python/python-3.5.0-r4.ebuild → dev-lang/python/python-3.5.0-r5.ebuild
+10 -5
View File
@@ -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() {
dev-lang/python/python-3.5.1.ebuild → dev-lang/python/python-3.5.1-r1.ebuild
+10 -5
View File
@@ -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() {