commit: b05e64d1c324a4a4763196c29fef2a7a214fdb73 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Nov 17 09:33:39 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 17 13:03:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b05e64d1
x11-misc/xkeyboard-config: add missing test dependencies * New revision due to plenty dropped keywords * pytest-xdist is used if available, make it requirement so that everybody benefits. * Disabled timeout for pytest tests. Observed it already take 40s with xdist and a 12 thread cpu, so you can't trust it to not fail due to high load congestion. Closes: https://bugs.gentoo.org/917479 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/33864 Signed-off-by: Sam James <sam <AT> gentoo.org> ...9999.ebuild => xkeyboard-config-2.40-r1.ebuild} | 24 +++++++++++++++++++--- .../xkeyboard-config/xkeyboard-config-9999.ebuild | 22 ++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild similarity index 57% copy from x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild copy to x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild index 4fcf0d647513..a290e8aa2752 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" @@ -23,19 +23,37 @@ IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" - ${PYTHON_DEPS} dev-lang/perl dev-libs/libxslt sys-devel/gettext test? ( + ${PYTHON_DEPS} + x11-apps/xkbcomp + x11-libs/libxkbcommon $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') ) " +python_check_deps() { + use test || return 0 + python_has_version "dev-python/pycountry[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die } src_configure() { diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 4fcf0d647513..4456bf37dfdd 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -23,19 +23,37 @@ IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" - ${PYTHON_DEPS} dev-lang/perl dev-libs/libxslt sys-devel/gettext test? ( + ${PYTHON_DEPS} + x11-apps/xkbcomp + x11-libs/libxkbcommon $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') ) " +python_check_deps() { + use test || return 0 + python_has_version "dev-python/pycountry[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die } src_configure() {
