From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-shells/autojump/Manifest | 8 +-- app-shells/autojump/autojump-22.2.4-r4.ebuild | 83 ---------------------- app-shells/autojump/autojump-22.5.1.ebuild | 76 -------------------- app-shells/autojump/autojump-22.5.3.ebuild | 2 +- .../autojump-22.2.4-fix-__aj_error-typo.patch | 22 ------ .../autojump-22.2.4-fix-autojump.fish-bugs.patch | 67 ----------------- 6 files changed, 2 insertions(+), 256 deletions(-) delete mode 100644 app-shells/autojump/autojump-22.2.4-r4.ebuild delete mode 100644 app-shells/autojump/autojump-22.5.1.ebuild delete mode 100644 app-shells/autojump/files/autojump-22.2.4-fix-__aj_error-typo.patch delete mode 100644 app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch (limited to 'app-shells/autojump') diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest index e253f6d7ba5b..7f02e30abb3c 100644 --- a/app-shells/autojump/Manifest +++ b/app-shells/autojump/Manifest @@ -1,9 +1,3 @@ -AUX autojump-22.2.4-fix-__aj_error-typo.patch 755 BLAKE2B 022a80e29cf8a03e358c011f1bb5f8e3625a53d90371ac05b4d8abae94dfdd76a98976b75278b8d3477df2903706eb6a5a4fe16925d5101cb9e11d5549709b95 SHA512 8661ceae090ed70498f5ed34f447c80d3cf359eca304e16c122a992538af8fb5e046c26d739ccf9bcfd7ccd5706735aebc494f95ebcb2d3c300b126dc0e38136 -AUX autojump-22.2.4-fix-autojump.fish-bugs.patch 2100 BLAKE2B 5aef4c4363b0a34238e91a012b19a8a6041a2e72d9d071753ce2c14db2062e93cd7cae93862d3a78ed1645993b41f5c6a31d777dc204675983bd76578400c7dc SHA512 a0a2fb0a06e43f4b1321d0b785ffa3273ba5d35e103f4ac687d6f08502835dd0cd5135a871640e05b535fce31c11f2e9908728c1e6f62ffe1e313ed9c75b7670 -DIST autojump-22.2.4.tar.gz 52724 BLAKE2B 42d5db90d4a29c63f5cd79437ca005f9f6382a607ab9284244fd6bbcf539509c5043df71ab305a5e8420ec225f8d651411d327833762737e0a5ad828ac021d2b SHA512 bdfca07bb57b3a2733a2085af14f23c3e980b1b00db1c90247c2341ac73f60f171bdde29dd9917aac0808d0b8f2902d48096c990e09281745a71755f5abc921c -DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19795d31d22edae90dba19fe3e78a4b78f48f08c338521d89d57af6251d5690c62eab445229812adb154286b0d5c SHA512 ed1bb28b62d14a481d5c8ee8ebbfc286d21ca54c961904f81ac123c784e17810217dfe1689bdd4b50fd7a9d72509c0cb13583a9817074f6afe26dc3144f64243 DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140 -EBUILD autojump-22.2.4-r4.ebuild 2099 BLAKE2B e397cba8017516becef5073c70f8f4c147b5422cf115047928a4de8131ebd83579ea882d9470001095cfc76cfc5730cea100fc12f098eea2e6786e4dddca497b SHA512 00acd5242387bea3b63a500d5a21a5783c74bd60284d90ace76c2962af07696fccb3885a1ba372868352402a3eaf936aa31bb6286c9b09aceb82a9b22b7b92da -EBUILD autojump-22.5.1.ebuild 1906 BLAKE2B ccdb4a0c1d1cbcede3cc3d1ff75c65eaf8cbf5da144c0f5f9f34c7d5904cde654c8dd9819ee90ee6bce9486016df6ccbbe1f0f1d88c6004c4f8d422ac8762240 SHA512 bbf08769ee09b308ab9e28adb6ecf1cacfa125801e982999b1f7adb511b1f666c4767fa4add5a68c56d4d0c2d0465c5ef48e13a031306df95566385ae7a46526 -EBUILD autojump-22.5.3.ebuild 1921 BLAKE2B 8faa33cafd1e4574b768c4e2eb79d7b2295faf9a97b6b9e915a706c8bee113400c30b07df1be72750cdb1c6a70cc6a389713858e852f9fbc8a127d4e6ca88aae SHA512 29f07a2173b0d14c33f95841d7b15f33ea8bbdd874e7e63ee97e9f70b8f100c8d781798dee9d09395a8b895848ec40ca38906772104bf72b17190c5ee0901c83 +EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B 94a6ab588c642b4f7a1006e60f9099e38cbedf426c55109f8023364bd0b8641c77673df3dc9b29e4ad7a8f849cc7e31b494a19a1b66bf24e94258dda1f26625d SHA512 06cfeef316c217541f68c37350a94b201e8f7d471cb0608da39fb5d77e26708a79b651108cba55b87445a7cea87808a28bd59343f91aefe06427066de06468e6 MISC metadata.xml 490 BLAKE2B 33ef64a70f2b0d3211861a9ae667a4ed930f850a0198661cd3371024ac6193c80d3121ca188f48cac4732741fdea08e918c8ef78161a921127ec82b1064dd1c1 SHA512 c7742421c4211de2b774bb6136261863bd69a93debe3f1ab4b921e9f19a7581ef2711fbe2090ada92b60f799cd6683368e48d974ab9698ae3c2b5f768cd34db9 diff --git a/app-shells/autojump/autojump-22.2.4-r4.ebuild b/app-shells/autojump/autojump-22.2.4-r4.ebuild deleted file mode 100644 index cbaa265735d3..000000000000 --- a/app-shells/autojump/autojump-22.2.4-r4.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit bash-completion-r1 python-r1 vcs-snapshot - -DESCRIPTION="change directory command that learns" -HOMEPAGE="https://github.com/joelthelion/autojump" -SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="ipython test" -REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )" - -# Not all tests pass. Need investigation. -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:" \ - -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 "${PATCHES[@]}" -} - -src_compile() { - : -} - -src_install() { - dobin bin/"${PN}" - python_replicate_script "${ED}"/usr/bin/"${PN}" - - insinto /etc/profile.d - doins bin/"${PN}".sh - - insinto /usr/share/"${PN}"/ - doins bin/"${PN}.bash" - doins bin/"${PN}.zsh" - doins bin/"${PN}.fish" - insinto /usr/share/zsh/site-functions - doins bin/_j - - python_foreach_impl python_domodule bin/autojump_data.py bin/autojump_utils.py - if use ipython; then - python_foreach_impl python_domodule tools/autojump_ipython.py - fi - - doman docs/"${PN}.1" - dodoc README.md -} - -pkg_postinst() { - if use ipython; then - elog 'This tool provides "j" for ipython, please add' - elog '"import autojump_ipython" to your ipy_user_conf.py.' - elog - fi - - elog 'If you use app-shells/fish, add the following code to your' - elog 'config.fish to get autojump support:' - elog 'if test -f /usr/share/autojump/autojump.fish' - elog ' source /usr/share/autojump/autojump.fish' - elog 'end' -} diff --git a/app-shells/autojump/autojump-22.5.1.ebuild b/app-shells/autojump/autojump-22.5.1.ebuild deleted file mode 100644 index 245a0758bb79..000000000000 --- a/app-shells/autojump/autojump-22.5.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit bash-completion-r1 python-r1 vcs-snapshot - -DESCRIPTION="change directory command that learns" -HOMEPAGE="https://github.com/wting/autojump" -SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos" -IUSE="ipython test" -REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )" - -# Not all tests pass. Need investigation. -RESTRICT="test" -RDEPEND="ipython? ( ${PYTHON_DEPS} )" -DEPEND="${PYTHON_DEPS}" - -src_prepare() { - eapply_user - sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \ - -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 -} - -src_compile() { - : -} - -src_install() { - dobin bin/"${PN}" - python_replicate_script "${ED}"/usr/bin/"${PN}" - - insinto /etc/profile.d - doins bin/"${PN}".sh - - insinto /usr/share/"${PN}"/ - doins bin/"${PN}.bash" - doins bin/"${PN}.zsh" - doins bin/"${PN}.fish" - insinto /usr/share/zsh/site-functions - doins bin/_j - - python_foreach_impl python_domodule bin/autojump_argparse.py bin/autojump_data.py \ - bin/autojump_match.py bin/autojump_utils.py - if use ipython; then - python_foreach_impl python_domodule tools/autojump_ipython.py - fi - - doman docs/"${PN}.1" - einstalldocs -} - -pkg_postinst() { - if use ipython; then - elog 'This tool provides "j" for ipython, please add' - elog '"import autojump_ipython" to your ipy_user_conf.py.' - elog - fi - - elog 'If you use app-shells/fish, add the following code to your' - elog 'config.fish to get autojump support:' - elog 'if test -f /usr/share/autojump/autojump.fish' - elog ' source /usr/share/autojump/autojump.fish' - elog 'end' -} diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild index 71d13b787032..4f243d7525f7 100644 --- a/app-shells/autojump/autojump-22.5.3.ebuild +++ b/app-shells/autojump/autojump-22.5.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python3_{6..8} ) inherit bash-completion-r1 python-r1 vcs-snapshot prefix 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 deleted file mode 100644 index 6a9ac3c83c8e..000000000000 --- a/app-shells/autojump/files/autojump-22.2.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.2.4-fix-autojump.fish-bugs.patch b/app-shells/autojump/files/autojump-22.2.4-fix-autojump.fish-bugs.patch deleted file mode 100644 index 6048ca989376..000000000000 --- a/app-shells/autojump/files/autojump-22.2.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