Gentoo Archives: gentoo-python

From: "Michał Górny" <mgorny@g.o>
To: gentoo-python@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-python] [PATCH 01/10] python-utils-r1: support all EAPIs.
Date: Mon, 26 Nov 2012 21:24:05
Message-Id: 1353964837-24198-2-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-python] python2.7 ebuild patches, split up by "Michał Górny"
1 ---
2 gx86/eclass/python-utils-r1.eclass | 9 +++------
3 1 file changed, 3 insertions(+), 6 deletions(-)
4
5 diff --git a/gx86/eclass/python-utils-r1.eclass b/gx86/eclass/python-utils-r1.eclass
6 index d8e4b81..abc3c0c 100644
7 --- a/gx86/eclass/python-utils-r1.eclass
8 +++ b/gx86/eclass/python-utils-r1.eclass
9 @@ -21,10 +21,7 @@
10 # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
11
12 case "${EAPI:-0}" in
13 - 0|1|2|3)
14 - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
15 - ;;
16 - 4|5)
17 + 0|1|2|3|4|5)
18 # EAPI=4 makes die behavior clear
19 ;;
20 *)
21 @@ -399,7 +396,7 @@ python_doscript() {
22 local newfn=${oldfn}-${EPYTHON}
23
24 debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
25 - newins "${f}" "${newfn}"
26 + newins "${f}" "${newfn}" || die
27 _python_rewrite_shebang "${D}/${d}/${newfn}"
28
29 # install the wrapper
30 @@ -477,7 +474,7 @@ python_domodule() {
31 local INSDESTTREE
32
33 insinto "${d}"
34 - doins -r "${@}"
35 + doins -r "${@}" || die
36
37 python_optimize "${D}/${d}"
38 }
39 --
40 1.8.0