From 740ff43c09d393bced580ff6e5b2f6167615af9c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 16 Jul 2024 11:18:23 +0000 Subject: [PATCH] app-portage/gentoolkit: Sync with Gentoo It's from Gentoo commit 72af038ad346aab4904a9107bc0bb5ee14b6b12d. --- .../app-portage/gentoolkit/gentoolkit-0.6.7.ebuild | 5 +++-- .../app-portage/gentoolkit/gentoolkit-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild index d00878e10f..a463fae5ad 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit meson python-r1 tmpfiles @@ -83,7 +83,8 @@ src_compile() { } src_test() { - python_foreach_impl meson_src_test --no-rebuild --verbose + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + python_foreach_impl epytest } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index d00878e10f..a463fae5ad 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit meson python-r1 tmpfiles @@ -83,7 +83,8 @@ src_compile() { } src_test() { - python_foreach_impl meson_src_test --no-rebuild --verbose + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + python_foreach_impl epytest } src_install() {