commit: 442d20e0e8736be338aa4d5077297b302c5be780 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 13:43:33 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 4 13:46:22 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=442d20e0
kde-apps/konqueror: Drop USE webengine, no longer optional Drop minimum versions for kde-apps/kfind and kde-plasma/kde-cli-tools, they are simple runtime binary dependencies. Upstream commit 64f94b6b78312506f34a302e3e4b79d4a97f88eb Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/konqueror/konqueror-9999.ebuild | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild index 4760b6fdae..8a62475f7c 100644 --- a/kde-apps/konqueror/konqueror-9999.ebuild +++ b/kde-apps/konqueror/konqueror-9999.ebuild @@ -5,9 +5,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support ECM_TEST="true" -PVCUT=$(ver_cut 1-3) KFMIN=5.64.0 -PLASMA_MINIMAL=5.16.5 QTMIN=5.12.3 VIRTUALX_REQUIRED="test" inherit flag-o-matic ecm kde.org @@ -18,12 +16,17 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="activities speech tidy +webengine X" +IUSE="activities speech tidy X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT+=" test" COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 @@ -49,33 +52,22 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) tidy? ( app-text/tidy-html5 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) " DEPEND="${COMMON_DEPEND} activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) " RDEPEND="${COMMON_DEPEND} - >=kde-apps/kfind-${PVCUT}:5 - >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5 - !webengine? ( kde-misc/kwebkitpart:5 ) + kde-apps/kfind:5 + kde-plasma/kde-cli-tools:5 " src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc - if ! use webengine; then - ecm_punt_bogus_dep Qt5 WebEngineWidgets - cmake_comment_add_subdirectory webenginepart - fi - ecm_src_prepare }
