diff options
| -rw-r--r-- | kde-apps/marble/marble-16.12.49.9999.ebuild | 8 | ||||
| -rw-r--r-- | 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 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) |