| 1 |
commit: b1aab568194c845bf87bd6dc8323e67b8867e2e2 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 30 09:17:49 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 30 09:18:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1aab568 |
| 7 |
|
| 8 |
kde-apps/marble: Rename USE=positioning -> geolocation |
| 9 |
|
| 10 |
Gentoo-bug: 631750 |
| 11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 12 |
|
| 13 |
kde-apps/marble/marble-17.08.49.9999.ebuild | 6 +++--- |
| 14 |
kde-apps/marble/marble-9999.ebuild | 6 +++--- |
| 15 |
kde-apps/marble/metadata.xml | 2 +- |
| 16 |
3 files changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-apps/marble/marble-17.08.49.9999.ebuild b/kde-apps/marble/marble-17.08.49.9999.ebuild |
| 19 |
index 5b31a6ced7..0314306b6b 100644 |
| 20 |
--- a/kde-apps/marble/marble-17.08.49.9999.ebuild |
| 21 |
+++ b/kde-apps/marble/marble-17.08.49.9999.ebuild |
| 22 |
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" |
| 23 |
HOMEPAGE="https://marble.kde.org/" |
| 24 |
KEYWORDS="" |
| 25 |
|
| 26 |
-IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" |
| 27 |
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" |
| 28 |
|
| 29 |
# FIXME (new package): libwlocate, WLAN-based geolocation |
| 30 |
RDEPEND=" |
| 31 |
@@ -29,6 +29,7 @@ RDEPEND=" |
| 32 |
aprs? ( $(add_qt_dep qtserialport) ) |
| 33 |
dbus? ( $(add_qt_dep qtdbus) ) |
| 34 |
designer? ( $(add_qt_dep designer) ) |
| 35 |
+ geolocation? ( $(add_qt_dep qtpositioning) ) |
| 36 |
gps? ( sci-geosciences/gpsd ) |
| 37 |
kde? ( |
| 38 |
$(add_frameworks_dep kconfig) |
| 39 |
@@ -44,7 +45,6 @@ RDEPEND=" |
| 40 |
$(add_frameworks_dep kwallet) |
| 41 |
) |
| 42 |
phonon? ( media-libs/phonon[qt5(+)] ) |
| 43 |
- positioning? ( $(add_qt_dep qtpositioning) ) |
| 44 |
shapefile? ( sci-libs/shapelib:= ) |
| 45 |
webkit? ( $(add_qt_dep qtwebkit) ) |
| 46 |
" |
| 47 |
@@ -69,7 +69,7 @@ src_prepare() { |
| 48 |
src_configure() { |
| 49 |
local mycmakeargs=( |
| 50 |
$(cmake-utils_use_find_package aprs Perl) |
| 51 |
- $(cmake-utils_use_find_package positioning Qt5Positioning) |
| 52 |
+ $(cmake-utils_use_find_package geolocation Qt5Positioning) |
| 53 |
-DBUILD_MARBLE_TESTS=$(usex test) |
| 54 |
-DWITH_DESIGNER_PLUGIN=$(usex designer) |
| 55 |
-DWITH_libgps=$(usex gps) |
| 56 |
|
| 57 |
diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild |
| 58 |
index 5b31a6ced7..0314306b6b 100644 |
| 59 |
--- a/kde-apps/marble/marble-9999.ebuild |
| 60 |
+++ b/kde-apps/marble/marble-9999.ebuild |
| 61 |
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" |
| 62 |
HOMEPAGE="https://marble.kde.org/" |
| 63 |
KEYWORDS="" |
| 64 |
|
| 65 |
-IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" |
| 66 |
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" |
| 67 |
|
| 68 |
# FIXME (new package): libwlocate, WLAN-based geolocation |
| 69 |
RDEPEND=" |
| 70 |
@@ -29,6 +29,7 @@ RDEPEND=" |
| 71 |
aprs? ( $(add_qt_dep qtserialport) ) |
| 72 |
dbus? ( $(add_qt_dep qtdbus) ) |
| 73 |
designer? ( $(add_qt_dep designer) ) |
| 74 |
+ geolocation? ( $(add_qt_dep qtpositioning) ) |
| 75 |
gps? ( sci-geosciences/gpsd ) |
| 76 |
kde? ( |
| 77 |
$(add_frameworks_dep kconfig) |
| 78 |
@@ -44,7 +45,6 @@ RDEPEND=" |
| 79 |
$(add_frameworks_dep kwallet) |
| 80 |
) |
| 81 |
phonon? ( media-libs/phonon[qt5(+)] ) |
| 82 |
- positioning? ( $(add_qt_dep qtpositioning) ) |
| 83 |
shapefile? ( sci-libs/shapelib:= ) |
| 84 |
webkit? ( $(add_qt_dep qtwebkit) ) |
| 85 |
" |
| 86 |
@@ -69,7 +69,7 @@ src_prepare() { |
| 87 |
src_configure() { |
| 88 |
local mycmakeargs=( |
| 89 |
$(cmake-utils_use_find_package aprs Perl) |
| 90 |
- $(cmake-utils_use_find_package positioning Qt5Positioning) |
| 91 |
+ $(cmake-utils_use_find_package geolocation Qt5Positioning) |
| 92 |
-DBUILD_MARBLE_TESTS=$(usex test) |
| 93 |
-DWITH_DESIGNER_PLUGIN=$(usex designer) |
| 94 |
-DWITH_libgps=$(usex gps) |
| 95 |
|
| 96 |
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml |
| 97 |
index e6bb9652ae..88bdb56140 100644 |
| 98 |
--- a/kde-apps/marble/metadata.xml |
| 99 |
+++ b/kde-apps/marble/metadata.xml |
| 100 |
@@ -8,8 +8,8 @@ |
| 101 |
<use> |
| 102 |
<flag name="aprs">Enable support for APRS data sources</flag> |
| 103 |
<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag> |
| 104 |
+ <flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag> |
| 105 |
<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag> |
| 106 |
- <flag name="positioning">Enable position information via <pkg>dev-qt/qtpositioning</pkg> and <pkg>dev-qt/qtlocation</pkg></flag> |
| 107 |
<flag name="shapefile">Enable support for ESRI shapefiles</flag> |
| 108 |
</use> |
| 109 |
</pkgmetadata> |
Archives