From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E18513835B for ; Thu, 1 Oct 2020 14:04:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 457CDE0901; Thu, 1 Oct 2020 14:04:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2176BE0901 for ; Thu, 1 Oct 2020 14:04:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E01AA340B63 for ; Thu, 1 Oct 2020 14:04:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6626E389 for ; Thu, 1 Oct 2020 14:04:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1601561073.671b6f3393b1b5849b3670334a2881f29169975e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python-exec/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python-exec/python-exec-2.4.6-r2.ebuild X-VCS-Directories: dev-lang/python-exec/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 671b6f3393b1b5849b3670334a2881f29169975e X-VCS-Branch: master Date: Thu, 1 Oct 2020 14:04:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ee3cd24-2a21-43b9-81fd-d7cc4b321875 X-Archives-Hash: 1bb33038ee8fbe539bc525f731f998d3 commit: 671b6f3393b1b5849b3670334a2881f29169975e Author: Michał Górny gentoo org> AuthorDate: Thu Oct 1 13:40:31 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 1 14:04:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671b6f33 dev-lang/python-exec: Remove python2 symlink Stop installing python2* symlinks. We have only one Python 2 interpreter left, so let's move it there. As a bonus, people without Python 2.7 installed will not have it at all. Closes: https://bugs.gentoo.org/745975 Signed-off-by: Michał Górny gentoo.org> dev-lang/python-exec/python-exec-2.4.6-r2.ebuild | 126 +++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild new file mode 100644 index 00000000000..a5edfb3d622 --- /dev/null +++ b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit python-utils-r1 + +DESCRIPTION="Python script wrapper" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" + +RDEPEND="!<=dev-lang/python-2.7.18-r3:2.7" + +src_configure() { + local pyimpls=() i EPYTHON + for i in "${_PYTHON_ALL_IMPLS[@]}"; do + if use "python_targets_${i}"; then + python_export "${i}" EPYTHON + pyimpls+=( "${EPYTHON}" ) + fi + 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 + insinto /etc/python-exec + newins - python-exec.conf \ + < <(sed -n -e '/^#/p' config/python-exec.conf.example) + + local programs=( python python3 ) + local scripts=( python-config python3-config 2to3 idle pydoc pyvenv ) + + local f + for f in "${programs[@]}"; do + # symlink the C wrapper for python to avoid shebang recursion + # bug #568974 + dosym python-exec2c /usr/bin/"${f}" + done + for f in "${scripts[@]}"; 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 +}