From 82e55d83028f8d2c25d1ad14dd72c12ea6b979c8 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 14 May 2021 21:01:18 +0200 Subject: kde-frameworks/extra-cmake-modules: Fix IUSE=doc w/ dev-python/sphinx-4 See also: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/121 Closes: https://bugs.gentoo.org/789096 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner --- .../extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild') diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild index 6bd09789c613..41f98627db4f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild @@ -16,10 +16,16 @@ IUSE="doc test" RESTRICT+=" !test? ( test )" +RDEPEND=" + app-arch/libarchive[bzip2] +" BDEPEND=" doc? ( ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}] + ') >=dev-qt/qthelp-${QTMIN}:5 ) test? ( @@ -27,18 +33,17 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch" + "${FILESDIR}/${P}-sphinx-4.patch" # bug 789096, pending upstream MR 121 ) python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]" } pkg_setup() { -- cgit v1.2.3