From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python-exec/
Date: Mon, 8 Mar 2021 14:44:04 +0000 (UTC) [thread overview]
Message-ID: <1615214629.bad5cb209ecac85994535cba60734d03f159bc03.mgorny@gentoo> (raw)
commit: bad5cb209ecac85994535cba60734d03f159bc03
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 8 14:43:49 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 8 14:43:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad5cb20
dev-lang/python-exec: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/python-exec/python-exec-2.4.6-r2.ebuild | 126 ----------------------
dev-lang/python-exec/python-exec-2.4.6-r3.ebuild | 128 -----------------------
2 files changed, 254 deletions(-)
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
deleted file mode 100644
index 14bfdf3a2bc..00000000000
--- a/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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
-}
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild
deleted file mode 100644
index 0ba2c499b94..00000000000
--- a/dev-lang/python-exec/python-exec-2.4.6-r3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Internal Python project hack. Do not copy it. Ever.
-IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks"
-
-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)
-
- if use native-symlinks; then
- 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
- fi
-}
-
-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
-}
next reply other threads:[~2021-03-08 14:44 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 14:44 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-09 15:55 [gentoo-commits] repo/gentoo:master commit in: dev-lang/python-exec/ Michał Górny
2024-10-30 12:09 Sam James
2024-04-14 14:58 Michał Górny
2024-04-14 14:58 Michał Górny
2022-12-18 19:26 Michał Górny
2022-12-18 19:04 Arthur Zamarin
2022-12-18 19:04 Arthur Zamarin
2022-12-18 19:04 Arthur Zamarin
2022-12-18 19:04 Arthur Zamarin
2022-12-18 19:04 Arthur Zamarin
2022-12-18 19:03 Arthur Zamarin
2022-12-18 15:10 Michał Górny
2022-06-10 6:54 Michał Górny
2022-06-10 5:29 Jakov Smolić
2022-06-10 0:38 Sam James
2022-06-10 0:38 Sam James
2022-06-09 1:25 Sam James
2022-06-08 20:59 Sam James
2022-06-08 20:59 Sam James
2022-06-08 14:43 Michał Górny
2022-06-08 12:22 Jakov Smolić
2022-06-08 12:22 Jakov Smolić
2022-05-09 20:33 Michał Górny
2022-05-09 9:17 Michał Górny
2021-09-07 7:47 Michał Górny
2021-09-07 4:57 Sam James
2021-09-07 2:43 Sam James
2021-08-01 5:19 Sam James
2021-08-01 5:19 Sam James
2021-08-01 5:14 Sam James
2021-07-31 22:23 Sam James
2021-06-10 16:54 Michał Górny
2021-06-07 20:55 Michał Górny
2021-03-08 13:09 Sam James
2021-03-08 13:09 Sam James
2021-03-06 15:14 Sergei Trofimovich
2021-02-19 1:51 Thomas Deutschmann
2021-02-18 20:11 Sergei Trofimovich
2021-02-10 3:46 Sam James
2021-02-09 23:58 Sam James
2021-02-06 0:02 Sam James
2021-02-05 6:36 Sam James
2021-01-19 13:35 Michał Górny
2020-12-27 14:08 Fabian Groffen
2020-12-11 21:56 Mike Gilbert
2020-12-09 22:17 Michał Górny
2020-12-09 22:17 Michał Górny
2020-10-10 17:48 Michał Górny
2020-10-10 17:03 Sam James
2020-10-08 12:42 Sam James
2020-10-08 12:42 Sam James
2020-10-08 12:42 Sam James
2020-10-08 12:42 Sam James
2020-10-06 15:41 Sam James
2020-10-06 15:06 Sam James
2020-10-01 14:04 Michał Górny
2020-10-01 14:04 Michał Górny
2020-10-01 14:04 Michał Górny
2020-01-03 20:40 Michał Górny
2019-09-09 18:48 Michał Górny
2019-09-09 18:48 Michał Górny
2019-09-01 18:16 Mikle Kolyada
2019-09-01 18:16 Mikle Kolyada
2019-08-30 17:50 Michał Górny
2019-08-30 16:47 Steve Arnold
2019-08-23 16:33 Agostino Sarubbo
2019-08-23 10:00 Agostino Sarubbo
2019-08-18 21:51 Agostino Sarubbo
2019-08-17 20:41 Sergei Trofimovich
2019-08-17 20:33 Sergei Trofimovich
2019-08-17 20:22 Sergei Trofimovich
2019-08-17 20:17 Sergei Trofimovich
2019-08-17 0:39 Aaron Bauman
2019-08-16 22:38 Thomas Deutschmann
2019-08-15 18:51 Sergei Trofimovich
2019-08-11 6:40 Michał Górny
2019-08-04 8:28 Michał Górny
2019-05-03 23:34 Mikle Kolyada
2018-09-15 20:12 Michał Górny
2018-09-15 19:40 Mikle Kolyada
2018-09-14 12:17 Tobias Klausmann
2018-09-09 1:12 Thomas Deutschmann
2018-09-08 12:53 Mart Raudsepp
2018-09-07 23:03 Sergei Trofimovich
2018-09-07 22:57 Sergei Trofimovich
2018-09-07 22:54 Sergei Trofimovich
2018-09-07 22:43 Sergei Trofimovich
2018-09-07 19:04 Sergei Trofimovich
2018-09-07 13:47 Mikle Kolyada
2018-05-27 9:03 Michał Górny
2018-05-27 9:03 Michał Górny
2018-05-27 8:41 Michał Górny
2018-05-01 18:24 Mikle Kolyada
2018-04-18 8:04 Mart Raudsepp
2018-03-22 16:33 Mikle Kolyada
2018-01-17 18:01 Markus Meier
2017-12-15 9:36 Jason Zaman
2017-12-08 20:39 Thomas Deutschmann
2017-11-28 20:48 Sergei Trofimovich
2017-11-09 22:21 Sergei Trofimovich
2017-11-08 20:03 Sergei Trofimovich
2017-11-08 12:51 Tobias Klausmann
2017-11-04 13:04 Sergei Trofimovich
2017-04-21 14:12 Michał Górny
2017-02-17 6:01 Markus Meier
2017-01-26 17:54 Michał Górny
2017-01-26 17:54 Michał Górny
2017-01-26 17:08 Jeroen Roovers
2017-01-23 18:27 Tobias Klausmann
2017-01-17 20:38 Mike Frysinger
2017-01-11 3:03 Aaron Bauman
2016-11-16 15:50 Michał Górny
2016-10-01 13:40 Jeroen Roovers
2016-05-23 13:32 Tobias Klausmann
2016-05-14 12:00 Michał Górny
2016-03-19 11:35 Agostino Sarubbo
2016-03-13 12:30 Markus Meier
2016-03-07 19:00 Michał Górny
2016-02-25 20:29 Michał Górny
2016-02-25 20:29 Michał Górny
2016-02-23 22:20 Michał Górny
2016-02-21 9:23 Michał Górny
2016-02-20 21:37 Michał Górny
2016-02-20 20:53 Michał Górny
2016-02-18 21:44 Michał Górny
2016-02-17 14:44 Fabian Groffen
2016-02-16 22:57 Michał Górny
2016-02-16 22:57 Michał Górny
2016-02-16 22:57 Michał Górny
2016-02-09 17:13 Michał Górny
2016-02-08 17:57 Michał Górny
2016-02-07 18:51 Michał Górny
2016-02-07 8:45 Michał Górny
2016-02-07 8:45 Michał Górny
2016-02-06 9:58 Michał Górny
2016-02-06 9:58 Michał Górny
2016-02-06 9:58 Michał Górny
2016-02-06 9:58 Michał Górny
2016-01-31 16:52 Michał Górny
2016-01-11 16:00 Michał Górny
2015-11-17 20:39 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1615214629.bad5cb209ecac85994535cba60734d03f159bc03.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox