commit:     58d63506e2747f0b734485340f3c29b7d723ee06
Author:     Marc Joliet <marcec <AT> gmx <DOT> de>
AuthorDate: Sun Nov 29 08:25:18 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 21:00:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d63506

app-shells/autojump-22.2.4-r4: rm bundled argparse

Upstream only includes the bundled argparse module for Python 2.6 support.
Patch bin/autojump to use the built-in argparse module instead.

Signed-off-by: Marc Joliet <marcec <AT> gmx.de>

 app-shells/autojump/autojump-22.2.4-r4.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild 
b/app-shells/autojump/autojump-22.2.4-r4.ebuild
index 3b21610..af56c09 100644
--- a/app-shells/autojump/autojump-22.2.4-r4.ebuild
+++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild
@@ -27,6 +27,10 @@ src_prepare() {
                -e "s:/usr/local/share:/usr/share:" \
                -i bin/autojump.sh || die
 
+       # autojump_argparse is only there for Python 2.6 compatibility
+       sed -e "s:autojump_argparse:argparse:" \
+               -i bin/autojump || die
+
        # upstream fixes to the autojump.fish script; the first patch is needed 
for
        # the second patch to apply
        epatch "${FILESDIR}/autojump-22.4.4-fix-autojump.fish-bugs.patch"
@@ -51,7 +55,7 @@ src_install() {
        insinto /usr/share/zsh/site-functions
        doins bin/_j
 
-       python_foreach_impl python_domodule bin/autojump_argparse.py 
bin/autojump_data.py bin/autojump_utils.py
+       python_foreach_impl python_domodule bin/autojump_data.py 
bin/autojump_utils.py
        if use python; then
                python_foreach_impl python_domodule tools/autojump_ipython.py
                einfo 'This tool provides "j" for ipython, please add'

Reply via email to