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 A4592138347 for ; Tue, 7 Jan 2020 19:42:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 889FBE08A8; Tue, 7 Jan 2020 19:42:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5AE1CE089F for ; Tue, 7 Jan 2020 19:42:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 675FB34DEA4 for ; Tue, 7 Jan 2020 19:42:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2AB991 for ; Tue, 7 Jan 2020 19:42:10 +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: <1578424357.1daa6fea2756974c1ad28974241e0bf73871f0ca.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-19.12.1.ebuild X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1daa6fea2756974c1ad28974241e0bf73871f0ca X-VCS-Branch: master Date: Tue, 7 Jan 2020 19:42:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8e54e3f2-3393-4b55-9d74-53a257977e4d X-Archives-Hash: 4ad2d0ef47aafa146cf9de35dabf5459 commit: 1daa6fea2756974c1ad28974241e0bf73871f0ca Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 7 19:12:37 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 7 19:12:37 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1daa6fea kde-apps/konqueror: Rollover recent stable branch changes to 19.12.1 Bump was based on old checkout. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/konqueror/konqueror-19.12.1.ebuild | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/kde-apps/konqueror/konqueror-19.12.1.ebuild b/kde-apps/konqueror/konqueror-19.12.1.ebuild index b1965f2279..41c2577e7d 100644 --- a/kde-apps/konqueror/konqueror-19.12.1.ebuild +++ b/kde-apps/konqueror/konqueror-19.12.1.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 @@ -17,13 +15,18 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="activities speech tidy +webengine X" +KEYWORDS="" +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 }