1 |
commit: f11552cb4b40a58774f2573508054e235f651947 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 20 21:35:40 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 20 21:37:49 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11552cb |
7 |
|
8 |
dev-lang/python-exec: Remove 2.4 due to issues with python wrapping |
9 |
|
10 |
Remove 2.4 as it fails at symlink resolution when argv[0] contains |
11 |
only basename (and requires PATH lookup), which breaks executables |
12 |
linked directly to python-exec2c such as python wrappers. |
13 |
|
14 |
dev-lang/python-exec/Manifest | 1 - |
15 |
dev-lang/python-exec/python-exec-2.4.ebuild | 113 ---------------------------- |
16 |
2 files changed, 114 deletions(-) |
17 |
|
18 |
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest |
19 |
index 8abd7f2..949521a 100644 |
20 |
--- a/dev-lang/python-exec/Manifest |
21 |
+++ b/dev-lang/python-exec/Manifest |
22 |
@@ -5,4 +5,3 @@ DIST python-exec-2.2.1.tar.bz2 82990 SHA256 c0fcb0c9593b26cf56cdf39ff265586a2203 |
23 |
DIST python-exec-2.2.tar.bz2 82269 SHA256 041dccf96c31bfac5eee9c43bdf511821449313a5b7d0bd745bed09151e1bffe SHA512 9492d94e7134b555a2f3b81cbd4e159074fed21b1471090547618da34dab70264a3fa40c8b7f79c42b61938655006dd5659e26389649a2401c26b4e0c90c9ac1 WHIRLPOOL 0b13d73c2e3c9606589201af34504c317965c29bb5cfe211479d893c606ca05dff62755fcba5f76d0a653a2719f36119e6f3db050ffa9f9bb01ef2ff7b68cb4d |
24 |
DIST python-exec-2.3.2.tar.bz2 84786 SHA256 c575247d6152c4f524c716a7fed879ffeb9ca7d65fac591b05cf0d726bf9cd1f SHA512 7beb938e338eb9abc711f6ba844f57647b679fe3e2b2d984897de142b81506bf5614565c30c119905bbb6949c5717d8ba23d5c9fd0208d554cd62fb5bb0ca30e WHIRLPOOL 47a4e5d76c1f40184b54e1cb8535ddbbf0a0f3042f59190730e6270acbc1ff8ba303c88cee818e88108d64cf25c6f13d869cf5aba74f51f11bf408723b8af274 |
25 |
DIST python-exec-2.3.tar.bz2 84201 SHA256 04f7c92727f666e4f950157a39ed6ac0a48d1a746736cc515a97195a30a3f9fe SHA512 fc6b8702a7009873b42dcde4b1771913f43ab45d92c62b9856a903b48dbe32c4ab588abe239e4512d9e2026a24aff26ec572f5cd98613e6a0160dcbd642e0849 WHIRLPOOL 3c5c238dbbf174dbbede06109bfc32e9675f53ded011dffdc0ce9327adff778bec6d89aba18ea531548d3e1ed17808f1a29cc1085f620baada74d71695f56b41 |
26 |
-DIST python-exec-2.4.tar.bz2 85838 SHA256 d299e704e3a9c9b3657cb45ebb92efedab22d175b99a3dc01e03293671b53704 SHA512 288141da7dba0b208d9dbc2f8fd2051f25b8d09dec7fc29c4928444c0ee7dd2da9b4d2e5c66b599779a7880b3bf9b202db97b2e2703cbb344c53544550673be0 WHIRLPOOL 01bfb2ee01e1807d5de64052876530bfb7a4927d6274ae2df8a3e112dfeed8368fe484a8d4ddf2b1d24a0e7da79043863a5bb64ebadbf21bc60f81f1980d3e4b |
27 |
|
28 |
diff --git a/dev-lang/python-exec/python-exec-2.4.ebuild b/dev-lang/python-exec/python-exec-2.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 121f31e..0000000 |
31 |
--- a/dev-lang/python-exec/python-exec-2.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,113 +0,0 @@ |
34 |
-# Copyright 1999-2016 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-# Kids, don't do this at home! |
41 |
-inherit python-utils-r1 |
42 |
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) |
43 |
- |
44 |
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE |
45 |
-# dependencies and trigger necessary rebuilds. |
46 |
-inherit python-r1 |
47 |
- |
48 |
-DESCRIPTION="Python script wrapper" |
49 |
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/" |
50 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" |
51 |
- |
52 |
-LICENSE="BSD-2" |
53 |
-SLOT="2" |
54 |
-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" |
55 |
-IUSE="" |
56 |
- |
57 |
-# eselect-python because of /usr/bin/python* collisions and new config |
58 |
-# python versions because of missing $scriptdir/python* symlinks |
59 |
-RDEPEND=" |
60 |
- !<app-eselect/eselect-python-20160206 |
61 |
- !<dev-lang/python-2.7.10-r4:2.7 |
62 |
- !<dev-lang/python-3.3.5-r4:3.3 |
63 |
- !<dev-lang/python-3.4.3-r4:3.4 |
64 |
- !<dev-lang/python-3.5.0-r3:3.5" |
65 |
- |
66 |
-src_configure() { |
67 |
- local pyimpls=() i EPYTHON |
68 |
- for i in "${PYTHON_COMPAT[@]}"; do |
69 |
- python_export "${i}" EPYTHON |
70 |
- pyimpls+=( "${EPYTHON}" ) |
71 |
- done |
72 |
- |
73 |
- local myconf=( |
74 |
- --with-python-impls="${pyimpls[*]}" |
75 |
- ) |
76 |
- |
77 |
- econf "${myconf[@]}" |
78 |
-} |
79 |
- |
80 |
-src_install() { |
81 |
- default |
82 |
- |
83 |
- # Prepare and own the template |
84 |
- sed -n -e '/^#/p' config/python-exec.conf.example \ |
85 |
- > "${T}"/python-exec.conf || die |
86 |
- insinto /etc/python-exec |
87 |
- doins "${T}"/python-exec.conf |
88 |
- |
89 |
- local f |
90 |
- for f in python{,2,3}; do |
91 |
- # symlink the C wrapper for python to avoid shebang recursion |
92 |
- # bug #568974 |
93 |
- dosym python-exec2c /usr/bin/"${f}" |
94 |
- done |
95 |
- for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do |
96 |
- # those are python scripts (except for new python-configs) |
97 |
- # so symlink them via the python wrapper |
98 |
- dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" |
99 |
- done |
100 |
-} |
101 |
- |
102 |
-pkg_preinst() { |
103 |
- if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then |
104 |
- # preserve current configuration |
105 |
- cp "${EROOT}"etc/python-exec/python-exec.conf \ |
106 |
- "${ED}"etc/python-exec/python-exec.conf || die |
107 |
- else |
108 |
- # preserve previous Python version preference |
109 |
- local py old_pythons=() |
110 |
- local config_base=${EROOT}etc/env.d/python |
111 |
- |
112 |
- # start with the 'global' preference (2 vs 3) |
113 |
- if [[ -f ${config_base}/config ]]; then |
114 |
- old_pythons+=( "$(<${config_base}/config)" ) |
115 |
- fi |
116 |
- |
117 |
- # then try specific py3 selection |
118 |
- for py in 3; do |
119 |
- local target= |
120 |
- |
121 |
- if [[ -f ${config_base}/python${py} ]]; then |
122 |
- # try the newer config files |
123 |
- target=$(<${config_base}/python${py}) |
124 |
- elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then |
125 |
- # check the older symlink format |
126 |
- target=$(readlink "${EROOT}/usr/bin/python${py}") |
127 |
- |
128 |
- # check if it's actually old eselect symlink |
129 |
- [[ ${target} == python?.? ]] || target= |
130 |
- fi |
131 |
- |
132 |
- # add the extra target if found and != global |
133 |
- if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then |
134 |
- old_pythons+=( "${target}" ) |
135 |
- fi |
136 |
- done |
137 |
- |
138 |
- if [[ ${old_pythons[@]} ]]; then |
139 |
- einfo "Keeping the following Python preference: ${old_pythons[*]}" |
140 |
- |
141 |
- local IFS=$'\n' |
142 |
- echo "${old_pythons[*]}" \ |
143 |
- >> "${ED}"etc/python-exec/python-exec.conf || die |
144 |
- fi |
145 |
- fi |
146 |
-} |