From c9c68d5695775a3967d1ef0a3586b2eeb7076afc Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Wed, 17 Feb 2016 10:31:00 +0000 Subject: app-shells/autojump: Stable for amd64+x86. Package-Manager: portage-2.2.26 --- app-shells/autojump/autojump-22.2.4-r4.ebuild | 16 ++++-- .../autojump-22.2.4-fix-__aj_error-typo.patch | 22 +++++++ .../autojump-22.2.4-fix-autojump.fish-bugs.patch | 67 ++++++++++++++++++++++ .../autojump-22.4.4-fix-__aj_error-typo.patch | 22 ------- .../autojump-22.4.4-fix-autojump.fish-bugs.patch | 67 ---------------------- 5 files changed, 99 insertions(+), 95 deletions(-) create mode 100644 app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch create mode 100644 app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch delete mode 100644 app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch delete mode 100644 app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch (limited to 'app-shells/autojump') diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild index 84bf29112be3..8ba85aaf46a4 100644 --- a/app-shells/autojump/autojump-22.2.4-r4.ebuild +++ b/app-shells/autojump/autojump-22.2.4-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> $ LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc ~ppc64" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="ipython test" # Not all tests pass. Need investigation. @@ -22,6 +22,11 @@ RESTRICT="test" RDEPEND="ipython? ( ${PYTHON_DEPS} )" DEPEND="test? ( dev-python/flake8 dev-python/tox )" +PATCHES=( + "${FILESDIR}/${P}-fix-autojump.fish-bugs.patch" + "${FILESDIR}/${P}-fix-__aj_error-typo.patch" +) + src_prepare() { sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \ -e "s:/usr/local/share:/usr/share:" \ @@ -33,8 +38,7 @@ src_prepare() { # 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" - epatch "${FILESDIR}/autojump-22.4.4-fix-__aj_error-typo.patch" + epatch "${PATCHES[@]}" } src_compile() { @@ -42,8 +46,8 @@ src_compile() { } src_install() { - dobin bin/autojump - python_replicate_script "${ED}"/usr/bin/autojump + dobin bin/"${PN}" + python_replicate_script "${ED}"/usr/bin/"${PN}" insinto /etc/profile.d doins bin/"${PN}".sh diff --git a/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch new file mode 100644 index 000000000000..6a9ac3c83c8e --- /dev/null +++ b/app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch @@ -0,0 +1,22 @@ +From d188d7e6757a4d0cad619b6d5ab729fdc59b1593 Mon Sep 17 00:00:00 2001 +From: Scott Olson +Date: Mon, 6 Jul 2015 23:12:35 -0400 +Subject: [PATCH] Fix typo (__aj_error -> __aj_err). + +--- + bin/autojump.fish | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/autojump.fish b/bin/autojump.fish +index ead7ea1..b16ef01 100644 +--- a/bin/autojump.fish ++++ b/bin/autojump.fish +@@ -91,7 +91,7 @@ function jo + case cygwin + cygstart "" (cygpath -w -a (pwd)) + case '*' +- __aj_error "Unknown operating system: \"$OSTYPE\"" ++ __aj_err "Unknown operating system: \"$OSTYPE\"" + end + else + __aj_err "autojump: directory '"$argv"' not found" diff --git a/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch new file mode 100644 index 000000000000..6048ca989376 --- /dev/null +++ b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch @@ -0,0 +1,67 @@ +From f09d23e30d3159db18872a3e8f8f579ed9e77231 Mon Sep 17 00:00:00 2001 +From: David Frascone +Date: Tue, 9 Jun 2015 14:32:38 -0600 +Subject: [PATCH] Fixed some bugs in fish script + +OSTYPE was not being set correctly. It is in bash, not sh. + Since the value is unlikely to change, I read it once and + stored it globally +Test logic was backward in jo function, causing error to always + be printed, unless you did NOT specify a directory name. +--- + bin/autojump.fish | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/bin/autojump.fish b/bin/autojump.fish +index 2cf5001..19cb27e 100644 +--- a/bin/autojump.fish ++++ b/bin/autojump.fish +@@ -5,6 +5,11 @@ if test -d ~/.autojump + set -x PATH ~/.autojump/bin $PATH + end + ++# Set ostype, if not set ++if not set -q OSTYPE ++ set -gx OSTYPE (bash -c 'echo ${OSTYPE}') ++end ++ + + # enable tab completion + complete -x -c j -a '(autojump --complete (commandline -t))' +@@ -34,7 +39,7 @@ end + # misc helper functions + function __aj_err + # TODO(ting|#247): set error file location +- echo $argv 1>&2; false ++ echo -e $argv 1>&2; false + end + + # default autojump command +@@ -73,11 +78,7 @@ end + function jo + set -l output (autojump $argv) + if test -d "$output" +- __aj_err "autojump: directory '"$argv"' not found" +- __aj_err "\n$output\n" +- __aj_err "Try `autojump --help` for more information." +- else +- switch (sh -c 'echo ${OSTYPE}') ++ switch $OSTYPE + case 'linux*' + xdg-open (autojump $argv) + case 'darwin*' +@@ -85,9 +86,12 @@ function jo + case cygwin + cygstart "" (cygpath -w -a (pwd)) + case '*' +- __aj_error "Unknown operating system: '"$OSTYPE"'" ++ __aj_error "Unknown operating system: \"$OSTYPE\"" + end +- echo end ++ else ++ __aj_err "autojump: directory '"$argv"' not found" ++ __aj_err "\n$output\n" ++ __aj_err "Try `autojump --help` for more information." + end + end + diff --git a/app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch b/app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch deleted file mode 100644 index 6a9ac3c83c8e..000000000000 --- a/app-shells/autojump/files/autojump-22.4.4-fix-__aj_error-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d188d7e6757a4d0cad619b6d5ab729fdc59b1593 Mon Sep 17 00:00:00 2001 -From: Scott Olson -Date: Mon, 6 Jul 2015 23:12:35 -0400 -Subject: [PATCH] Fix typo (__aj_error -> __aj_err). - ---- - bin/autojump.fish | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/autojump.fish b/bin/autojump.fish -index ead7ea1..b16ef01 100644 ---- a/bin/autojump.fish -+++ b/bin/autojump.fish -@@ -91,7 +91,7 @@ function jo - case cygwin - cygstart "" (cygpath -w -a (pwd)) - case '*' -- __aj_error "Unknown operating system: \"$OSTYPE\"" -+ __aj_err "Unknown operating system: \"$OSTYPE\"" - end - else - __aj_err "autojump: directory '"$argv"' not found" diff --git a/app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch b/app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch deleted file mode 100644 index 6048ca989376..000000000000 --- a/app-shells/autojump/files/autojump-22.4.4-fix-autojump.fish-bugs.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f09d23e30d3159db18872a3e8f8f579ed9e77231 Mon Sep 17 00:00:00 2001 -From: David Frascone -Date: Tue, 9 Jun 2015 14:32:38 -0600 -Subject: [PATCH] Fixed some bugs in fish script - -OSTYPE was not being set correctly. It is in bash, not sh. - Since the value is unlikely to change, I read it once and - stored it globally -Test logic was backward in jo function, causing error to always - be printed, unless you did NOT specify a directory name. ---- - bin/autojump.fish | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/bin/autojump.fish b/bin/autojump.fish -index 2cf5001..19cb27e 100644 ---- a/bin/autojump.fish -+++ b/bin/autojump.fish -@@ -5,6 +5,11 @@ if test -d ~/.autojump - set -x PATH ~/.autojump/bin $PATH - end - -+# Set ostype, if not set -+if not set -q OSTYPE -+ set -gx OSTYPE (bash -c 'echo ${OSTYPE}') -+end -+ - - # enable tab completion - complete -x -c j -a '(autojump --complete (commandline -t))' -@@ -34,7 +39,7 @@ end - # misc helper functions - function __aj_err - # TODO(ting|#247): set error file location -- echo $argv 1>&2; false -+ echo -e $argv 1>&2; false - end - - # default autojump command -@@ -73,11 +78,7 @@ end - function jo - set -l output (autojump $argv) - if test -d "$output" -- __aj_err "autojump: directory '"$argv"' not found" -- __aj_err "\n$output\n" -- __aj_err "Try `autojump --help` for more information." -- else -- switch (sh -c 'echo ${OSTYPE}') -+ switch $OSTYPE - case 'linux*' - xdg-open (autojump $argv) - case 'darwin*' -@@ -85,9 +86,12 @@ function jo - case cygwin - cygstart "" (cygpath -w -a (pwd)) - case '*' -- __aj_error "Unknown operating system: '"$OSTYPE"'" -+ __aj_error "Unknown operating system: \"$OSTYPE\"" - end -- echo end -+ else -+ __aj_err "autojump: directory '"$argv"' not found" -+ __aj_err "\n$output\n" -+ __aj_err "Try `autojump --help` for more information." - end - end - -- cgit v1.2.3-65-gdbad