summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-12-08 10:19:40 +0100
committerJohannes Huber <johu@gentoo.org>2016-12-09 10:46:42 +0100
commitf73cc3fbb4a8ab377a1170b3c37b38ae315da2b1 (patch)
treeabb1491ffc430f2c5f9031ee4256e0db9727b76f
parentc09568d0b46b8b21997290914927cacd2aa0936e (diff)
downloadkde-f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1.tar.gz
kde-f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1.tar.bz2
kde-f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1.zip
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@gentoo.org>
-rw-r--r--kde-apps/marble/marble-16.12.49.9999.ebuild8
-rw-r--r--kde-apps/marble/marble-9999.ebuild8
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 c7728955cb6..4d30c4c71af 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 c7728955cb6..4d30c4c71af 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)