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 32380138335 for ; Thu, 18 Oct 2018 21:00:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15B6FE0A89; Thu, 18 Oct 2018 21:00:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 DEC6CE0A89 for ; Thu, 18 Oct 2018 21:00:42 +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 3D470335CEC for ; Thu, 18 Oct 2018 21:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B358443 for ; Thu, 18 Oct 2018 21:00:38 +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: <1539800190.a7f1ecabc48b0e804dea71df917cea23c6469c57.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/marble/marble-9999.ebuild kde-apps/marble/metadata.xml X-VCS-Directories: kde-apps/marble/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a7f1ecabc48b0e804dea71df917cea23c6469c57 X-VCS-Branch: master Date: Thu, 18 Oct 2018 21:00:38 +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: e6f22772-8466-4023-9391-039b28e71962 X-Archives-Hash: 7bc21341eb2f8ef070e289044bc67dc7 commit: a7f1ecabc48b0e804dea71df917cea23c6469c57 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 17 18:16:28 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 17 18:16:30 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f1ecab kde-apps/marble: Drop USE webkit, add USE webengine Upstream commit b42ee5c83d77761ef7d8bf8635662159bc2884bb Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/marble/marble-9999.ebuild | 10 +++++----- kde-apps/marble/metadata.xml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index 2ec8a2e844..8f136a3b97 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/" KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -46,7 +46,7 @@ RDEPEND=" ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) - webkit? ( $(add_qt_dep qtwebkit) ) + webengine? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) @@ -76,8 +76,8 @@ src_configure() { -DWITH_KF5=$(usex kde) -DWITH_Phonon4Qt5=$(usex phonon) -DWITH_libshp=$(usex shapefile) - $(cmake-utils_use_find_package webkit Qt5WebKit) - $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) + $(cmake-utils_use_find_package webkit Qt5WebEngine) + $(cmake-utils_use_find_package webkit Qt5WebEngineWidgets) -DWITH_libwlocate=OFF # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 88bdb56140..565eba0753 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -11,5 +11,6 @@ Enable position information via dev-qt/qtpositioning Enable sound support via media-libs/phonon Enable support for ESRI shapefiles + Use dev-qt/qtwebengine for embedded web browser