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