diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-05 13:22:08 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-05 13:22:08 +0100 |
| commit | 333496a37c2c53ebcef2b8284bab47d0dedd5fbc (patch) | |
| tree | 226abd81db716a976f1add2fa876e836eb11f02c | |
| parent | 3eec5ffd223798919c6f093bce0bd587991c6cde (diff) | |
| download | kde-333496a37c2c53ebcef2b8284bab47d0dedd5fbc.tar.gz kde-333496a37c2c53ebcef2b8284bab47d0dedd5fbc.tar.bz2 kde-333496a37c2c53ebcef2b8284bab47d0dedd5fbc.zip | |
kde-apps/konqueror: Drop USE webengine from stable branch
Drop a hack to disable QtWebEngine dependency. On master it is already gone,
QtWebKit is deprecated anyway, kwebkitpart is practically unmaintained.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-apps/konqueror/konqueror-19.12.49.9999.ebuild | 24 | ||||
| -rw-r--r-- | kde-apps/konqueror/metadata.xml | 1 |
2 files changed, 8 insertions, 17 deletions
diff --git a/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild index 7501ed4f81d..41c2577e7de 100644 --- a/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild +++ b/kde-apps/konqueror/konqueror-19.12.49.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.63.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 } diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml index 462e8ca3746..a198affb542 100644 --- a/kde-apps/konqueror/metadata.xml +++ b/kde-apps/konqueror/metadata.xml @@ -8,6 +8,5 @@ <use> <flag name="activities">Enable kactivities support</flag> <flag name="speech">Build text-to-speech plugin</flag> - <flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag> </use> </pkgmetadata> |