1 |
commit: 3dd8c5623b7df6f329008183d814f59cdd57a7fb |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 25 20:25:38 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 25 20:29:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd8c562 |
7 |
|
8 |
dev-lang/python-exec: Drop intermediate masked versions |
9 |
|
10 |
dev-lang/python-exec/Manifest | 4 - |
11 |
dev-lang/python-exec/python-exec-2.2.1.ebuild | 40 --------- |
12 |
dev-lang/python-exec/python-exec-2.2.ebuild | 40 --------- |
13 |
dev-lang/python-exec/python-exec-2.3.2.ebuild | 113 -------------------------- |
14 |
dev-lang/python-exec/python-exec-2.3.ebuild | 111 ------------------------- |
15 |
5 files changed, 308 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest |
18 |
index 37e1a28..111ee0e 100644 |
19 |
--- a/dev-lang/python-exec/Manifest |
20 |
+++ b/dev-lang/python-exec/Manifest |
21 |
@@ -1,8 +1,4 @@ |
22 |
DIST python-exec-2.0.1.tar.bz2 80965 SHA256 3eddcb0d6c682a5c182c62578bb8d6ce1140a009873747e9ba1bf9de72ed7efd SHA512 0396e2617c759a66b16e57b0ca60b57e03f3c8096ae4a7f2e402eafcbee4ffd839bf0c6e4d259c6ba90940f9ba7e3f191125e395080cce3ef82e5f52053d0462 WHIRLPOOL 50c0cac1c7e2b5d2a21125647874c83caeabee293b87ef01926474d492b79b7837754c2d26173282977e9d00024559bb070f8d76bb5227df1776e937cd280c32 |
23 |
DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a817633fbc9cb7d410982778042051bb0 SHA512 96198dda88a73b902d617a32f10ddf2ac981b1871fb5eaf5003d77453df8a0aacf299c39c6e49ebaa620994a30e57ee7a1128fb4ba41aa4f503031fa2addef7f WHIRLPOOL 603b494c7b87f0f3f0cfba35378e1a2e231879a01b730657e09ecf798957fa4dfd54a6d852074c2aa9ae3c15e5d1d3203584b8a120e5dd0dee2117319706a5ce |
24 |
DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525 |
25 |
-DIST python-exec-2.2.1.tar.bz2 82990 SHA256 c0fcb0c9593b26cf56cdf39ff265586a2203d608f6bfafecde0ff756de019f04 SHA512 3ca01ce229e4ecdf09a55f6bad0c90c1f0a9cff1fecb0013bb2ada1e187044631ad01af0fa70fb805465dd4e6c953cc97203d91f55ccb5208f63bf4771c0bb20 WHIRLPOOL 92e9c4629f292a0f517927e05aceda68f0c797426070ec23139dedeb1eac4d2a315892fd231ee0fe019dd3e9c6bd148fad9764ad65617012b1ef0bfbe0415506 |
26 |
-DIST python-exec-2.2.tar.bz2 82269 SHA256 041dccf96c31bfac5eee9c43bdf511821449313a5b7d0bd745bed09151e1bffe SHA512 9492d94e7134b555a2f3b81cbd4e159074fed21b1471090547618da34dab70264a3fa40c8b7f79c42b61938655006dd5659e26389649a2401c26b4e0c90c9ac1 WHIRLPOOL 0b13d73c2e3c9606589201af34504c317965c29bb5cfe211479d893c606ca05dff62755fcba5f76d0a653a2719f36119e6f3db050ffa9f9bb01ef2ff7b68cb4d |
27 |
-DIST python-exec-2.3.2.tar.bz2 84786 SHA256 c575247d6152c4f524c716a7fed879ffeb9ca7d65fac591b05cf0d726bf9cd1f SHA512 7beb938e338eb9abc711f6ba844f57647b679fe3e2b2d984897de142b81506bf5614565c30c119905bbb6949c5717d8ba23d5c9fd0208d554cd62fb5bb0ca30e WHIRLPOOL 47a4e5d76c1f40184b54e1cb8535ddbbf0a0f3042f59190730e6270acbc1ff8ba303c88cee818e88108d64cf25c6f13d869cf5aba74f51f11bf408723b8af274 |
28 |
-DIST python-exec-2.3.tar.bz2 84201 SHA256 04f7c92727f666e4f950157a39ed6ac0a48d1a746736cc515a97195a30a3f9fe SHA512 fc6b8702a7009873b42dcde4b1771913f43ab45d92c62b9856a903b48dbe32c4ab588abe239e4512d9e2026a24aff26ec572f5cd98613e6a0160dcbd642e0849 WHIRLPOOL 3c5c238dbbf174dbbede06109bfc32e9675f53ded011dffdc0ce9327adff778bec6d89aba18ea531548d3e1ed17808f1a29cc1085f620baada74d71695f56b41 |
29 |
DIST python-exec-2.4.2.tar.bz2 86808 SHA256 d3659764eeb462492a0e6586e74d618a1e2329353dddcf50519052a9a6a1dbe5 SHA512 728bf9fc23ce5f8ebdd2f8c385f779378beb8eabb61d227df9a40dad1157eb4619426b14eaf1f44d0591f2110c7930cdbe7c9ee3eb380574fafa243a19b128d3 WHIRLPOOL 9cc952c33634be6463ad69f162dfb514bc2573535a324736a4f7d8d1158470f2e47cdc0ad05b0ac8e60c098d7a4308a888943f966fb3c10a1a09657363947aaa |
30 |
|
31 |
diff --git a/dev-lang/python-exec/python-exec-2.2.1.ebuild b/dev-lang/python-exec/python-exec-2.2.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index e0674e0..0000000 |
34 |
--- a/dev-lang/python-exec/python-exec-2.2.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,40 +0,0 @@ |
37 |
-# Copyright 1999-2016 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=5 |
42 |
- |
43 |
-# Kids, don't do this at home! |
44 |
-inherit python-utils-r1 |
45 |
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) |
46 |
- |
47 |
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE |
48 |
-# dependencies and trigger necessary rebuilds. |
49 |
-inherit python-r1 |
50 |
- |
51 |
-DESCRIPTION="Python script wrapper" |
52 |
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/" |
53 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" |
54 |
- |
55 |
-LICENSE="BSD-2" |
56 |
-SLOT="2" |
57 |
-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" |
58 |
-IUSE="" |
59 |
- |
60 |
-RDEPEND="!<dev-python/python-exec-10000 |
61 |
- !<app-eselect/eselect-python-20151117" |
62 |
- |
63 |
-src_configure() { |
64 |
- local pyimpls=() i EPYTHON |
65 |
- for i in "${PYTHON_COMPAT[@]}"; do |
66 |
- python_export "${i}" EPYTHON |
67 |
- pyimpls+=( "${EPYTHON}" ) |
68 |
- done |
69 |
- |
70 |
- local myconf=( |
71 |
- --with-eprefix="${EPREFIX}" |
72 |
- --with-python-impls="${pyimpls[*]}" |
73 |
- ) |
74 |
- |
75 |
- econf "${myconf[@]}" |
76 |
-} |
77 |
|
78 |
diff --git a/dev-lang/python-exec/python-exec-2.2.ebuild b/dev-lang/python-exec/python-exec-2.2.ebuild |
79 |
deleted file mode 100644 |
80 |
index dbcb2ed..0000000 |
81 |
--- a/dev-lang/python-exec/python-exec-2.2.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,40 +0,0 @@ |
84 |
-# Copyright 1999-2015 Gentoo Foundation |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
-# $Id$ |
87 |
- |
88 |
-EAPI=5 |
89 |
- |
90 |
-# Kids, don't do this at home! |
91 |
-inherit python-utils-r1 |
92 |
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) |
93 |
- |
94 |
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE |
95 |
-# dependencies and trigger necessary rebuilds. |
96 |
-inherit python-r1 |
97 |
- |
98 |
-DESCRIPTION="Python script wrapper" |
99 |
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/" |
100 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" |
101 |
- |
102 |
-LICENSE="BSD-2" |
103 |
-SLOT="2" |
104 |
-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" |
105 |
-IUSE="" |
106 |
- |
107 |
-RDEPEND="!<dev-python/python-exec-10000 |
108 |
- !<app-eselect/eselect-python-20151117" |
109 |
- |
110 |
-src_configure() { |
111 |
- local pyimpls=() i EPYTHON |
112 |
- for i in "${PYTHON_COMPAT[@]}"; do |
113 |
- python_export "${i}" EPYTHON |
114 |
- pyimpls+=( "${EPYTHON}" ) |
115 |
- done |
116 |
- |
117 |
- local myconf=( |
118 |
- --with-eprefix="${EPREFIX}" |
119 |
- --with-python-impls="${pyimpls[*]}" |
120 |
- ) |
121 |
- |
122 |
- econf "${myconf[@]}" |
123 |
-} |
124 |
|
125 |
diff --git a/dev-lang/python-exec/python-exec-2.3.2.ebuild b/dev-lang/python-exec/python-exec-2.3.2.ebuild |
126 |
deleted file mode 100644 |
127 |
index 121f31e..0000000 |
128 |
--- a/dev-lang/python-exec/python-exec-2.3.2.ebuild |
129 |
+++ /dev/null |
130 |
@@ -1,113 +0,0 @@ |
131 |
-# Copyright 1999-2016 Gentoo Foundation |
132 |
-# Distributed under the terms of the GNU General Public License v2 |
133 |
-# $Id$ |
134 |
- |
135 |
-EAPI=5 |
136 |
- |
137 |
-# Kids, don't do this at home! |
138 |
-inherit python-utils-r1 |
139 |
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) |
140 |
- |
141 |
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE |
142 |
-# dependencies and trigger necessary rebuilds. |
143 |
-inherit python-r1 |
144 |
- |
145 |
-DESCRIPTION="Python script wrapper" |
146 |
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/" |
147 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" |
148 |
- |
149 |
-LICENSE="BSD-2" |
150 |
-SLOT="2" |
151 |
-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" |
152 |
-IUSE="" |
153 |
- |
154 |
-# eselect-python because of /usr/bin/python* collisions and new config |
155 |
-# python versions because of missing $scriptdir/python* symlinks |
156 |
-RDEPEND=" |
157 |
- !<app-eselect/eselect-python-20160206 |
158 |
- !<dev-lang/python-2.7.10-r4:2.7 |
159 |
- !<dev-lang/python-3.3.5-r4:3.3 |
160 |
- !<dev-lang/python-3.4.3-r4:3.4 |
161 |
- !<dev-lang/python-3.5.0-r3:3.5" |
162 |
- |
163 |
-src_configure() { |
164 |
- local pyimpls=() i EPYTHON |
165 |
- for i in "${PYTHON_COMPAT[@]}"; do |
166 |
- python_export "${i}" EPYTHON |
167 |
- pyimpls+=( "${EPYTHON}" ) |
168 |
- done |
169 |
- |
170 |
- local myconf=( |
171 |
- --with-python-impls="${pyimpls[*]}" |
172 |
- ) |
173 |
- |
174 |
- econf "${myconf[@]}" |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- default |
179 |
- |
180 |
- # Prepare and own the template |
181 |
- sed -n -e '/^#/p' config/python-exec.conf.example \ |
182 |
- > "${T}"/python-exec.conf || die |
183 |
- insinto /etc/python-exec |
184 |
- doins "${T}"/python-exec.conf |
185 |
- |
186 |
- local f |
187 |
- for f in python{,2,3}; do |
188 |
- # symlink the C wrapper for python to avoid shebang recursion |
189 |
- # bug #568974 |
190 |
- dosym python-exec2c /usr/bin/"${f}" |
191 |
- done |
192 |
- for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do |
193 |
- # those are python scripts (except for new python-configs) |
194 |
- # so symlink them via the python wrapper |
195 |
- dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" |
196 |
- done |
197 |
-} |
198 |
- |
199 |
-pkg_preinst() { |
200 |
- if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then |
201 |
- # preserve current configuration |
202 |
- cp "${EROOT}"etc/python-exec/python-exec.conf \ |
203 |
- "${ED}"etc/python-exec/python-exec.conf || die |
204 |
- else |
205 |
- # preserve previous Python version preference |
206 |
- local py old_pythons=() |
207 |
- local config_base=${EROOT}etc/env.d/python |
208 |
- |
209 |
- # start with the 'global' preference (2 vs 3) |
210 |
- if [[ -f ${config_base}/config ]]; then |
211 |
- old_pythons+=( "$(<${config_base}/config)" ) |
212 |
- fi |
213 |
- |
214 |
- # then try specific py3 selection |
215 |
- for py in 3; do |
216 |
- local target= |
217 |
- |
218 |
- if [[ -f ${config_base}/python${py} ]]; then |
219 |
- # try the newer config files |
220 |
- target=$(<${config_base}/python${py}) |
221 |
- elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then |
222 |
- # check the older symlink format |
223 |
- target=$(readlink "${EROOT}/usr/bin/python${py}") |
224 |
- |
225 |
- # check if it's actually old eselect symlink |
226 |
- [[ ${target} == python?.? ]] || target= |
227 |
- fi |
228 |
- |
229 |
- # add the extra target if found and != global |
230 |
- if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then |
231 |
- old_pythons+=( "${target}" ) |
232 |
- fi |
233 |
- done |
234 |
- |
235 |
- if [[ ${old_pythons[@]} ]]; then |
236 |
- einfo "Keeping the following Python preference: ${old_pythons[*]}" |
237 |
- |
238 |
- local IFS=$'\n' |
239 |
- echo "${old_pythons[*]}" \ |
240 |
- >> "${ED}"etc/python-exec/python-exec.conf || die |
241 |
- fi |
242 |
- fi |
243 |
-} |
244 |
|
245 |
diff --git a/dev-lang/python-exec/python-exec-2.3.ebuild b/dev-lang/python-exec/python-exec-2.3.ebuild |
246 |
deleted file mode 100644 |
247 |
index cbf297e..0000000 |
248 |
--- a/dev-lang/python-exec/python-exec-2.3.ebuild |
249 |
+++ /dev/null |
250 |
@@ -1,111 +0,0 @@ |
251 |
-# Copyright 1999-2016 Gentoo Foundation |
252 |
-# Distributed under the terms of the GNU General Public License v2 |
253 |
-# $Id$ |
254 |
- |
255 |
-EAPI=5 |
256 |
- |
257 |
-# Kids, don't do this at home! |
258 |
-inherit python-utils-r1 |
259 |
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" ) |
260 |
- |
261 |
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE |
262 |
-# dependencies and trigger necessary rebuilds. |
263 |
-inherit python-r1 |
264 |
- |
265 |
-DESCRIPTION="Python script wrapper" |
266 |
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/" |
267 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" |
268 |
- |
269 |
-LICENSE="BSD-2" |
270 |
-SLOT="2" |
271 |
-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" |
272 |
-IUSE="" |
273 |
- |
274 |
-# eselect-python because of /usr/bin/python* collisions and new config |
275 |
-# python versions because of missing $scriptdir/python* symlinks |
276 |
-RDEPEND=" |
277 |
- !<app-eselect/eselect-python-20160206 |
278 |
- !<dev-lang/python-2.7.10-r4:2.7 |
279 |
- !<dev-lang/python-3.3.5-r4:3.3 |
280 |
- !<dev-lang/python-3.4.3-r4:3.4 |
281 |
- !<dev-lang/python-3.5.0-r3:3.5" |
282 |
- |
283 |
-src_configure() { |
284 |
- local pyimpls=() i EPYTHON |
285 |
- for i in "${PYTHON_COMPAT[@]}"; do |
286 |
- python_export "${i}" EPYTHON |
287 |
- pyimpls+=( "${EPYTHON}" ) |
288 |
- done |
289 |
- |
290 |
- local myconf=( |
291 |
- --with-python-impls="${pyimpls[*]}" |
292 |
- ) |
293 |
- |
294 |
- econf "${myconf[@]}" |
295 |
-} |
296 |
- |
297 |
-src_install() { |
298 |
- default |
299 |
- |
300 |
- # Prepare and own the template |
301 |
- sed -n -e '/^#/p' config/python-exec.conf.example \ |
302 |
- > "${T}"/python-exec.conf || die |
303 |
- insinto /etc/python-exec |
304 |
- doins "${T}"/python-exec.conf |
305 |
- |
306 |
- local f |
307 |
- for f in python{,2,3}; do |
308 |
- # can't use symlinks here since random stuff |
309 |
- # loves to do readlink on sys.executable... |
310 |
- newbin python-exec2-c "${f}" |
311 |
- done |
312 |
- for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do |
313 |
- dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" |
314 |
- done |
315 |
-} |
316 |
- |
317 |
-pkg_preinst() { |
318 |
- if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then |
319 |
- # preserve current configuration |
320 |
- cp "${EROOT}"etc/python-exec/python-exec.conf \ |
321 |
- "${ED}"etc/python-exec/python-exec.conf || die |
322 |
- else |
323 |
- # preserve previous Python version preference |
324 |
- local py old_pythons=() |
325 |
- local config_base=${EROOT}etc/env.d/python |
326 |
- |
327 |
- # start with the 'global' preference (2 vs 3) |
328 |
- if [[ -f ${config_base}/config ]]; then |
329 |
- old_pythons+=( "$(<${config_base}/config)" ) |
330 |
- fi |
331 |
- |
332 |
- # then try specific py3 selection |
333 |
- for py in 3; do |
334 |
- local target= |
335 |
- |
336 |
- if [[ -f ${config_base}/python${py} ]]; then |
337 |
- # try the newer config files |
338 |
- target=$(<${config_base}/python${py}) |
339 |
- elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then |
340 |
- # check the older symlink format |
341 |
- target=$(readlink "${EROOT}/usr/bin/python${py}") |
342 |
- |
343 |
- # check if it's actually old eselect symlink |
344 |
- [[ ${target} == python?.? ]] || target= |
345 |
- fi |
346 |
- |
347 |
- # add the extra target if found and != global |
348 |
- if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then |
349 |
- old_pythons+=( "${target}" ) |
350 |
- fi |
351 |
- done |
352 |
- |
353 |
- if [[ ${old_pythons[@]} ]]; then |
354 |
- einfo "Keeping the following Python preference: ${old_pythons[*]}" |
355 |
- |
356 |
- local IFS=$'\n' |
357 |
- echo "${old_pythons[*]}" \ |
358 |
- >> "${ED}"etc/python-exec/python-exec.conf || die |
359 |
- fi |
360 |
- fi |
361 |
-} |