commit: 98e81e7861e498580203c1cad322d63ce98f65c4
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 7 00:28:12 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 06:25:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e81e78
app-shells/bash-completion: sync live
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-shells/bash-completion/bash-completion-9999.ebuild | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild
b/app-shells/bash-completion/bash-completion-9999.ebuild
index 322f3a72d214..61c35185dad9 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
@@ -38,6 +37,10 @@ PDEPEND="
>=app-shells/gentoo-bashcomp-20140911
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
strip_completions() {
# Remove unwanted completions.
local strip_completions=(
@@ -72,7 +75,6 @@ strip_completions() {
python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
}
@@ -96,7 +98,7 @@ src_prepare() {
eapply
"${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
fi
- eapply_user
+ default
eautoreconf
}
@@ -123,7 +125,7 @@ src_test() {
# used in pytest tests
local -x NETWORK=none
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
+ local -x PYTEST_PLUGINS=xdist.plugin
emake -C completions check
epytest
}