Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/autojump/
Date: Fri, 11 Dec 2015 21:12:36
Message-Id: 1449262820.58d63506e2747f0b734485340f3c29b7d723ee06.monsieurp@gentoo
1 commit: 58d63506e2747f0b734485340f3c29b7d723ee06
2 Author: Marc Joliet <marcec <AT> gmx <DOT> de>
3 AuthorDate: Sun Nov 29 08:25:18 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 4 21:00:20 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d63506
7
8 app-shells/autojump-22.2.4-r4: rm bundled argparse
9
10 Upstream only includes the bundled argparse module for Python 2.6 support.
11 Patch bin/autojump to use the built-in argparse module instead.
12
13 Signed-off-by: Marc Joliet <marcec <AT> gmx.de>
14
15 app-shells/autojump/autojump-22.2.4-r4.ebuild | 6 +++++-
16 1 file changed, 5 insertions(+), 1 deletion(-)
17
18 diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild
19 index 3b21610..af56c09 100644
20 --- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
21 +++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild
22 @@ -27,6 +27,10 @@ src_prepare() {
23 -e "s:/usr/local/share:/usr/share:" \
24 -i bin/autojump.sh || die
25
26 + # autojump_argparse is only there for Python 2.6 compatibility
27 + sed -e "s:autojump_argparse:argparse:" \
28 + -i bin/autojump || die
29 +
30 # upstream fixes to the autojump.fish script; the first patch is needed for
31 # the second patch to apply
32 epatch "${FILESDIR}/autojump-22.4.4-fix-autojump.fish-bugs.patch"
33 @@ -51,7 +55,7 @@ src_install() {
34 insinto /usr/share/zsh/site-functions
35 doins bin/_j
36
37 - python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py bin/autojump_utils.py
38 + python_foreach_impl python_domodule bin/autojump_data.py bin/autojump_utils.py
39 if use python; then
40 python_foreach_impl python_domodule tools/autojump_ipython.py
41 einfo 'This tool provides "j" for ipython, please add'