commit:     f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec  8 09:19:40 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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 <johu <AT> 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)

Reply via email to