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 743471395E2 for ; Fri, 9 Dec 2016 09:47:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E038E0DA4; Fri, 9 Dec 2016 09:47:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65466E0DA4 for ; Fri, 9 Dec 2016 09:47: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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BD51340F1A for ; Fri, 9 Dec 2016 09:47:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB038498 for ; Fri, 9 Dec 2016 09:47:23 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1481276802.f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/marble/marble-16.12.49.9999.ebuild kde-apps/marble/marble-9999.ebuild X-VCS-Directories: kde-apps/marble/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1 X-VCS-Branch: master Date: Fri, 9 Dec 2016 09:47:23 +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: 84e3c1ed-9001-4482-9cd9-2c03958d07b3 X-Archives-Hash: 352c8feb2530d53c9fbf824aee55e381 commit: f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Dec 8 09:19:40 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Dec 9 09:46:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f73cc3fb kde-apps/marble: Drop unused DEPEND Upstream commit 670a24a87adab6d7b76de60ce67c8eef8433c24c Closes: https://github.com/gentoo/kde/pull/842 Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber gentoo.org> kde-apps/marble/marble-16.12.49.9999.ebuild | 8 ++------ kde-apps/marble/marble-9999.ebuild | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/kde-apps/marble/marble-16.12.49.9999.ebuild b/kde-apps/marble/marble-16.12.49.9999.ebuild index c772895..4d30c4c 100644 --- a/kde-apps/marble/marble-16.12.49.9999.ebuild +++ b/kde-apps/marble/marble-16.12.49.9999.ebuild @@ -45,10 +45,7 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) - positioning? ( - $(add_qt_dep qtlocation) - $(add_qt_dep qtpositioning) - ) + positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -57,7 +54,7 @@ DEPEND="${RDEPEND} " # bug 588320 -RESTRICT=test +RESTRICT+=" test" src_prepare() { if use kde; then @@ -72,7 +69,6 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Location) $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer) diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index c772895..4d30c4c 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -45,10 +45,7 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) - positioning? ( - $(add_qt_dep qtlocation) - $(add_qt_dep qtpositioning) - ) + positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -57,7 +54,7 @@ DEPEND="${RDEPEND} " # bug 588320 -RESTRICT=test +RESTRICT+=" test" src_prepare() { if use kde; then @@ -72,7 +69,6 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Location) $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer)