From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- app-shells/autojump/Manifest | 4 +- app-shells/autojump/autojump-22.5.3-r1.ebuild | 12 ++-- app-shells/autojump/autojump-22.5.3.ebuild | 77 ---------------------- .../files/22.5.3-Use-mock-from-unittest.patch | 27 ++++++++ 4 files changed, 37 insertions(+), 83 deletions(-) delete mode 100644 app-shells/autojump/autojump-22.5.3.ebuild create mode 100644 app-shells/autojump/files/22.5.3-Use-mock-from-unittest.patch (limited to 'app-shells/autojump') diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest index d60c801536e8..08ac217c1d25 100644 --- a/app-shells/autojump/Manifest +++ b/app-shells/autojump/Manifest @@ -1,4 +1,4 @@ +AUX 22.5.3-Use-mock-from-unittest.patch 689 BLAKE2B b0d518d66efb7511b8bbd8d31f5ce00c7561e90e259289a4dff051665c19bc9f3537cb04ed77e89d18c9b3fd6edcb6e0b912f0b9dfc9db1fc491b11a21957828 SHA512 a15cf9369527535dd475db53aa014108af2fe6cc72b04b166589c2c9d7464dd2eb999998aa8d55fc306bd6432b3926dc11caf00009b7b45562221957dc748dcd DIST autojump-22.5.3.tar.gz 55429 BLAKE2B 3a2773669f81d1a54c01cce9fe75bc01609265998b035b4ba1aa064f1132acf852b59eb04ebfa744e628152f0ab478cbef24e5aff326bf84cec6e2c9348e8360 SHA512 d1dd3cbb67fda4e0a17ec5028b947faf46be8a95a6cd8418127b927f42bc95b71538a06658b38b479c77d147a6cd5e8cef77639ef538c7d449414c469c13f140 -EBUILD autojump-22.5.3-r1.ebuild 1988 BLAKE2B ad3da431a16500cc35717b1037f8f2f7a0729481d0ea48333331ffbef8493e35497b43a09b336872c50762b79db4a05b291c3e755fbfe024ca2872de2f4dfa43 SHA512 c940e91bbd0b18cf83f24f007c0534d8dcae11acde74e339ddfd1c176acd5610f63d3efde7078b3477bb423a3da3dc5e3b1e5514a3309a857fd10845ce1e2f38 -EBUILD autojump-22.5.3.ebuild 1920 BLAKE2B 5ce4f10233f3c6e54124724ebc8ea3bb4ac41d377c870081ab68a614bdf10c7f81160e6eee1b62a0ec5198df4049f32112f31ed01fcd89c7637048829f1a1427 SHA512 beb84dfaa1c1dab86555fbb8421b0c12c38bb00124291dc4d10db14ade392440a65e5a45793ffb520d5ebca21d3dd58dc11a168a14c0cabfdcf849cddf77031b +EBUILD autojump-22.5.3-r1.ebuild 2029 BLAKE2B 80760df8de8c6791e7bf678cdde30f55cc03d1b0352c5b13119f60e56691f4a412495766f06129bed58a7a437ead0efaec9c90ae52f1aed0cb76d024c9655cd0 SHA512 3df977555288100c30f7a808743758d9882dab22634468fe78cbffb865f083a8f689008f2f420e810b4b50175b67cfb45c761f30689075ef1943ce3b6b73f6c7 MISC metadata.xml 491 BLAKE2B 775beb745c9218ed955dca11149ccb5b17c3efacc8f916ca15a65f67632e01feac271d5a36c39316de8024f352427b658cf35e54f5d03682d681920b730af4bb SHA512 d26e3c132c90c94bae47c1f7a4af71eaf873a12546d429632736885c515764aa612fb8155003643678d2156b42e94a692b0e3174d2b4825b559426c29eaa863c diff --git a/app-shells/autojump/autojump-22.5.3-r1.ebuild b/app-shells/autojump/autojump-22.5.3-r1.ebuild index 9e398fa63288..6c1430f5a0b7 100644 --- a/app-shells/autojump/autojump-22.5.3-r1.ebuild +++ b/app-shells/autojump/autojump-22.5.3-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 bash-completion-r1 vcs-snapshot prefix +inherit distutils-r1 vcs-snapshot prefix DESCRIPTION="change directory command that learns" HOMEPAGE="https://github.com/wting/autojump" @@ -29,8 +29,12 @@ DEPEND="${PYTHON_DEPS} distutils_enable_tests pytest +PATCHES=( + "${FILESDIR}"/${PV}-Use-mock-from-unittest.patch +) + src_prepare() { - eapply_user + default sed -e "s:/usr/local/share:/usr/share:" \ -i bin/autojump.sh || die diff --git a/app-shells/autojump/autojump-22.5.3.ebuild b/app-shells/autojump/autojump-22.5.3.ebuild deleted file mode 100644 index deb81c56b6b3..000000000000 --- a/app-shells/autojump/autojump-22.5.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit bash-completion-r1 python-r1 vcs-snapshot prefix - -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:/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 - - hprefixify -q '"' -w '/usr\/share/' bin/autojump.sh -} - -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/files/22.5.3-Use-mock-from-unittest.patch b/app-shells/autojump/files/22.5.3-Use-mock-from-unittest.patch new file mode 100644 index 000000000000..942d19c838e0 --- /dev/null +++ b/app-shells/autojump/files/22.5.3-Use-mock-from-unittest.patch @@ -0,0 +1,27 @@ +https://github.com/wting/autojump/pull/648 + +From b935baa9ab73305e0c8e3d733f40cc8567740020 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Thu, 27 Jan 2022 12:11:33 -0800 +Subject: [PATCH] Use mock from unittest + +--- + tests/unit/autojump_utils_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/autojump_utils_test.py b/tests/unit/autojump_utils_test.py +index 07f67b3..386b4cd 100644 +--- a/tests/unit/autojump_utils_test.py ++++ b/tests/unit/autojump_utils_test.py +@@ -3,7 +3,7 @@ + import os + import sys + +-import mock ++from unittest import mock + import pytest + + sys.path.append(os.path.join(os.getcwd(), 'bin')) # noqa +-- +2.34.1 + -- cgit v1.2.3