From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D59311382C5 for ; Thu, 3 May 2018 11:40:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 075DBE0ACA; Thu, 3 May 2018 11:40:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0305E0ACA for ; Thu, 3 May 2018 11:40:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D84AA335C7E for ; Thu, 3 May 2018 11:40:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B1C639 for ; Thu, 3 May 2018 11:40:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1525344185.0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/konqueror/konqueror-18.04.49.9999.ebuild kde-apps/konqueror/konqueror-9999.ebuild kde-apps/konqueror/metadata.xml X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15 X-VCS-Branch: master Date: Thu, 3 May 2018 11:40:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 30a022c8-c966-4304-9258-ffbe2e3361fb X-Archives-Hash: e6c5fd226f0194f40b09cc944df92f1a commit: 0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 3 10:43:05 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 3 10:43:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a0962fb kde-apps/konqueror: Add USE=webengine Package-Manager: Portage-2.3.33, Repoman-2.3.9 kde-apps/konqueror/konqueror-18.04.49.9999.ebuild | 14 ++++++++++---- kde-apps/konqueror/konqueror-9999.ebuild | 14 ++++++++++---- kde-apps/konqueror/metadata.xml | 1 + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild index 49e5bd7b70..ad0cc0383f 100644 --- a/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild +++ b/kde-apps/konqueror/konqueror-18.04.49.9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" https://konqueror.org/ " KEYWORDS="" -IUSE="activities speech tidy X" +IUSE="activities speech tidy +webengine X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT+=" test" @@ -46,28 +46,34 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) - $(add_qt_dep qtwebengine 'widgets') $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) sys-libs/zlib speech? ( $(add_qt_dep qtspeech) ) tidy? ( app-text/htmltidy ) + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) X? ( $(add_qt_dep qtx11extras) ) " DEPEND="${COMMON_DEPEND} activities? ( $(add_frameworks_dep kactivities) ) " RDEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kfind) - $(add_plasma_dep kde-cli-tools) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 + $(add_kdeapps_dep kfind) + $(add_plasma_dep kde-cli-tools) + !webengine? ( kde-misc/kwebkitpart:5 ) " src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc + if ! use webengine; then + punt_bogus_dep Qt5 WebEngineWidgets + cmake_comment_add_subdirectory webenginepartexit + fi + kde5_src_prepare } diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild index 49e5bd7b70..ad0cc0383f 100644 --- a/kde-apps/konqueror/konqueror-9999.ebuild +++ b/kde-apps/konqueror/konqueror-9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" https://konqueror.org/ " KEYWORDS="" -IUSE="activities speech tidy X" +IUSE="activities speech tidy +webengine X" # 4 of 4 tests fail. Last checked for 4.0.3 RESTRICT+=" test" @@ -46,28 +46,34 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) - $(add_qt_dep qtwebengine 'widgets') $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) sys-libs/zlib speech? ( $(add_qt_dep qtspeech) ) tidy? ( app-text/htmltidy ) + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) X? ( $(add_qt_dep qtx11extras) ) " DEPEND="${COMMON_DEPEND} activities? ( $(add_frameworks_dep kactivities) ) " RDEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kfind) - $(add_plasma_dep kde-cli-tools) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 + $(add_kdeapps_dep kfind) + $(add_plasma_dep kde-cli-tools) + !webengine? ( kde-misc/kwebkitpart:5 ) " src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc + if ! use webengine; then + punt_bogus_dep Qt5 WebEngineWidgets + cmake_comment_add_subdirectory webenginepartexit + fi + kde5_src_prepare } diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml index a198affb54..462e8ca374 100644 --- a/kde-apps/konqueror/metadata.xml +++ b/kde-apps/konqueror/metadata.xml @@ -8,5 +8,6 @@ Enable kactivities support Build text-to-speech plugin + Enable dev-qt/qtwebengine as web browser engine (fallback is kde-misc/kwebkitpart)