mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-04 04:57:07 -08:00
dev-lang/python-exec: Bump to 2.4.5
Bump to the new 2.4.5 release. It includes a fallback for symlink resolution when PATH is wiped out the environment (when 'env -i' is used, e.g. in gcc-config).
This commit is contained in:
Michał Górny
@@ -3,3 +3,4 @@ DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a8176
|
||||
DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525
|
||||
DIST python-exec-2.4.3.tar.bz2 86815 SHA256 581aa0c033632269d553754440d4017c21afc1c1500fd8951de093bc715c63fb SHA512 37fb7f915a2848699e9fca4e09d167b6d6aa192e3c374d7f01aec09529b5f1346ce2c45139f4e8f68b53e3f197b4d77b7f58519b012c117dd5ec8535a43fbe34 WHIRLPOOL 117564deb6f35387757ebbbff96d0325d5979d2933bbfca184cde0170cdd923bf9fa71ba76f234b098df12f006b6f8b5ba388416692ceff56ec7c16173777ab6
|
||||
DIST python-exec-2.4.4.tar.bz2 86945 SHA256 cdc780764bce79047ab047160156c5dc3bf5728d9c59cf1ed904fdf12638d60b SHA512 26b76960430dc3b2b79aab5e8a72498144d4e78bed5291fe9361afe081f0e8d70049a74ec29384cb0fc199f76c23499324d2eddcaea521ef33d88e61b1b674f9 WHIRLPOOL 791fd9732179d17bf5cd981956759e7c25e1e1dcbaf6fdfb05cf4fed8d4f44490740aaa5b4d38335a72128f8fdea0f6ab2e34c331a2b7f6b0897aa7eaa1f0c48
|
||||
DIST python-exec-2.4.5.tar.bz2 87137 SHA256 8649def42af569cc65598da6af49e554351dc138ccc8a96198c2a425494a8559 SHA512 8c1a520c565afa775cad0e8b88248b688814664e588f683fc2b2c039ee0494b168ebd3cd1042b8b7fe2583f287cf55b22ea0585bfb43efe2f8450d809cde0b21 WHIRLPOOL 5de79c34c31eee131799524a8ad19262a1455d59ee4db0cc99468820fe142c864f10999834734b70a6d6868ead97e2d389e83dc1679248e862b02b332a177954
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
# Kids, don't do this at home!
|
||||
inherit python-utils-r1
|
||||
PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
|
||||
|
||||
# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
|
||||
# dependencies and trigger necessary rebuilds.
|
||||
inherit python-r1
|
||||
|
||||
DESCRIPTION="Python script wrapper"
|
||||
HOMEPAGE="https://github.com/mgorny/python-exec/"
|
||||
SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
# eselect-python because of /usr/bin/python* collisions and new config
|
||||
# python versions because of missing $scriptdir/python* symlinks
|
||||
RDEPEND="
|
||||
!<app-eselect/eselect-python-20160206
|
||||
!<dev-lang/python-2.7.10-r4:2.7
|
||||
!<dev-lang/python-3.3.5-r4:3.3
|
||||
!<dev-lang/python-3.4.3-r4:3.4
|
||||
!<dev-lang/python-3.5.0-r3:3.5"
|
||||
|
||||
src_configure() {
|
||||
local pyimpls=() i EPYTHON
|
||||
for i in "${PYTHON_COMPAT[@]}"; do
|
||||
python_export "${i}" EPYTHON
|
||||
pyimpls+=( "${EPYTHON}" )
|
||||
done
|
||||
|
||||
local myconf=(
|
||||
--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
|
||||
--with-python-impls="${pyimpls[*]}"
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Prepare and own the template
|
||||
sed -n -e '/^#/p' config/python-exec.conf.example \
|
||||
> "${T}"/python-exec.conf || die
|
||||
insinto /etc/python-exec
|
||||
doins "${T}"/python-exec.conf
|
||||
|
||||
local f
|
||||
for f in python{,2,3}; do
|
||||
# symlink the C wrapper for python to avoid shebang recursion
|
||||
# bug #568974
|
||||
dosym python-exec2c /usr/bin/"${f}"
|
||||
done
|
||||
for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
|
||||
# those are python scripts (except for new python-configs)
|
||||
# so symlink them via the python wrapper
|
||||
dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
|
||||
done
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
|
||||
# preserve current configuration
|
||||
cp "${EROOT}"etc/python-exec/python-exec.conf \
|
||||
"${ED}"etc/python-exec/python-exec.conf || die
|
||||
else
|
||||
# preserve previous Python version preference
|
||||
local py old_pythons=()
|
||||
local config_base=${EROOT}etc/env.d/python
|
||||
|
||||
# start with the 'global' preference (2 vs 3)
|
||||
if [[ -f ${config_base}/config ]]; then
|
||||
old_pythons+=( "$(<${config_base}/config)" )
|
||||
fi
|
||||
|
||||
# then try specific py3 selection
|
||||
for py in 3; do
|
||||
local target=
|
||||
|
||||
if [[ -f ${config_base}/python${py} ]]; then
|
||||
# try the newer config files
|
||||
target=$(<${config_base}/python${py})
|
||||
elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
|
||||
# check the older symlink format
|
||||
target=$(readlink "${EROOT}/usr/bin/python${py}")
|
||||
|
||||
# check if it's actually old eselect symlink
|
||||
[[ ${target} == python?.? ]] || target=
|
||||
fi
|
||||
|
||||
# add the extra target if found and != global
|
||||
if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
|
||||
old_pythons+=( "${target}" )
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ ${old_pythons[@]} ]]; then
|
||||
elog "You seem to have just upgraded into the new version of python-exec"
|
||||
elog "that uses python-exec.conf for configuration. The ebuild has attempted"
|
||||
elog "to convert your previous configuration to the new format, resulting"
|
||||
elog "in the following preferences (most preferred version first):"
|
||||
elog
|
||||
for py in "${old_pythons[@]}"; do
|
||||
elog " ${py}"
|
||||
done
|
||||
elog
|
||||
elog "Those interpreters will be preferred when running Python scripts or"
|
||||
elog "calling wrapped Python executables (python, python2, pydoc...)."
|
||||
elog "If none of the preferred interpreters are supported, python-exec will"
|
||||
elog "fall back to the newest supported Python version."
|
||||
elog
|
||||
elog "Please note that due to the ambiguous character of the old settings,"
|
||||
elog "you may want to modify the preference list yourself. In order to do so,"
|
||||
elog "open the following file in your favorite editor:"
|
||||
elog
|
||||
elog " ${EROOT}etc/python-exec/python-exec.conf"
|
||||
elog
|
||||
elog "For more information on the new configuration format, please read"
|
||||
elog "the comment on top of the installed configuration file."
|
||||
|
||||
local IFS=$'\n'
|
||||
echo "${old_pythons[*]}" \
|
||||
>> "${ED}"etc/python-exec/python-exec.conf || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user