[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: a83a448397f9b0434ba5e91aa0622e6cf35c2a6c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 21 14:10:13 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 7 23:12:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83a4483
kde-apps/marble: Add missing IUSE dbus cmake arg
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-24.08.1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/marble/marble-24.08.1-r1.ebuild
b/kde-apps/marble/marble-24.08.1-r1.ebuild
index 54290d912c2d..952e3eea95cb 100644
--- a/kde-apps/marble/marble-24.08.1-r1.ebuild
+++ b/kde-apps/marble/marble-24.08.1-r1.ebuild
@@ -78,6 +78,7 @@ src_configure() {
$(cmake_use_find_package aprs Perl)
$(cmake_use_find_package geolocation Qt5Positioning)
-DBUILD_MARBLE_TESTS=$(usex test)
+ -DBUILD_WITH_DBUS=$(usex dbus)
-DWITH_DESIGNER_PLUGIN=$(usex designer)
-DWITH_libgps=$(usex gps)
-DWITH_KF5=$(usex kde)
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: c8a753f118e8136a45ac1221a1259489ce058c36
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 7 20:04:52 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 7 23:05:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a753f1
kde-apps/marble: drop 24.05.2, 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-24.05.2.ebuild | 97 ---
kde-apps/marble/marble-24.08.1.ebuild | 97 ---
2 files changed, 194 deletions(-)
diff --git a/kde-apps/marble/marble-24.05.2.ebuild
b/kde-apps/marble/marble-24.05.2.ebuild
deleted file mode 100644
index 79a139f5a628..
--- a/kde-apps/marble/marble-24.05.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-libs/zlib
- aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- kde? (
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- pbf? ( dev-libs/protobuf:= )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
- aprs? ( dev-lang/perl )
-"
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- use kde && cmake_run_in src/apps cmake_comment_add_subdirectory
marble-qt
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- $(cmake_use_find_package pbf Protobuf)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- if use kde; then
- ecm_src_configure
- else
- cmake_src_configure
- fi
-}
diff --git a/kde-apps/marble/marble-24.08.1.ebuild
b/kde-apps/marble/marble-24.08.1.ebuild
deleted file mode 100644
index a3ccf1d674e0..
--- a/kde-apps/marble/marble-24.08.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~riscv x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new pa
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: eb24d293b0b36ee4889b5f435e821b44a898e83f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 7 20:04:24 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 7 23:05:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb24d293
kde-apps/marble: Drop build of plasma widget and plasmarunner
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-24.05.2-r1.ebuild | 98
kde-apps/marble/marble-24.08.1-r1.ebuild | 98
2 files changed, 196 insertions(+)
diff --git a/kde-apps/marble/marble-24.05.2-r1.ebuild
b/kde-apps/marble/marble-24.05.2-r1.ebuild
new file mode 100644
index ..7bf8c1c79161
--- /dev/null
+++ b/kde-apps/marble/marble-24.05.2-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/$(ver_cut 1-2)"
+KEYWORDS="amd64 arm64 ~riscv x86"
+IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
+
+# bug 588320
+RESTRICT="test"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ sys-libs/zlib
+ aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+ dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+ designer? ( >=dev-qt/designer-${QTMIN}:5 )
+ geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ kde? (
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ )
+ pbf? ( dev-libs/protobuf:= )
+ phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+ shapefile? ( sci-libs/shapelib:= )
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ aprs? ( dev-lang/perl )
+"
+
+src_prepare() {
+ ecm_src_prepare
+
+ rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
+
+ cmake_run_in src cmake_comment_add_subdirectory plasma
+ cmake_run_in src cmake_comment_add_subdirectory plasmarunner
+ use kde && cmake_run_in src/apps cmake_comment_add_subdirectory
marble-qt
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package aprs Perl)
+ $(cmake_use_find_package geolocation Qt5Positioning)
+ -DBUILD_MARBLE_TESTS=$(usex test)
+ -DWITH_DESIGNER_PLUGIN=$(usex designer)
+ -DWITH_libgps=$(usex gps)
+ -DWITH_KF5=$(usex kde)
+ $(cmake_use_find_package pbf Protobuf)
+ -DWITH_Phonon4Qt5=$(usex phonon)
+ -DWITH_libshp=$(usex shapefile)
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ -DWITH_libwlocate=OFF
+ # bug 608890
+ -DKDE_INSTALL_CONFDIR="/etc/xdg"
+ )
+ if use kde; then
+ ecm_src_configure
+ else
+ cmake_src_configure
+ fi
+}
diff --git a/kde-apps/marble/marble-24.08.1-r1.ebuild
b/kde-apps/marble/marble-24.08.1-r1.ebuild
new file mode 100644
index ..54290d912c2d
--- /dev/null
+++ b/kde-apps/marble/marble-24.08.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="forceoptional"
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm gear.kde.org
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
+IUSE="aprs +dbus des
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 313c52b0f7ed796e7187d9f3ff1a126dc3a38384 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 5 07:06:48 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Oct 5 07:06:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313c52b0 kde-apps/marble: Stabilize 24.08.1 x86, #940669 Signed-off-by: Michał Górny gentoo.org> kde-apps/marble/marble-24.08.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.08.1.ebuild b/kde-apps/marble/marble-24.08.1.ebuild index bd380ef3e0df..a3ccf1d674e0 100644 --- a/kde-apps/marble/marble-24.08.1.ebuild +++ b/kde-apps/marble/marble-24.08.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 40352b6c7614c2221c34cc8c16041de6a74e8175
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 1 15:01:01 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 1 15:29:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40352b6c
kde-apps/marble: drop 24.05.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/Manifest | 1 -
kde-apps/marble/marble-24.05.1.ebuild | 97 ---
2 files changed, 98 deletions(-)
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index b770ad95cabd..f79268312c93 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1 @@
-DIST marble-24.05.1.tar.xz 52452536 BLAKE2B
a3d47e49f8554fbd93717e1c100d3f4e290090bd38db61c1c8d6aafddbd5c13f414a1f82f26a638ac1370a1f016bf85e0ebc72590782e37d3fa0e500316979e7
SHA512
1bf89508e8ad76a13c0f0d153f1678c8ac71ffe43ee321802b3bd836bdd9392c088ee130318ebcb1f21c9b93629a0cc638dd3673c88870c2f21816a312f3e379
DIST marble-24.05.2.tar.xz 52448744 BLAKE2B
eb61c35c215caaf3a1f63c020efc2f8a597fa47a908d08a8981e9887d521f157cabb8f8f61a8519124fcbdd878745eadb14a07ed63576ba7ad908f31568a9187
SHA512
41e76b1f977efeb0e46876792a7bd374bc150cbefdc53619d88f64a80cb39d6d7761803519172062fd6517657623383ca598c8a292f54a8d85270cc172d91699
diff --git a/kde-apps/marble/marble-24.05.1.ebuild
b/kde-apps/marble/marble-24.05.1.ebuild
deleted file mode 100644
index 79a139f5a628..
--- a/kde-apps/marble/marble-24.05.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-libs/zlib
- aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- kde? (
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- pbf? ( dev-libs/protobuf:= )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
- aprs? ( dev-lang/perl )
-"
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- use kde && cmake_run_in src/apps cmake_comment_add_subdirectory
marble-qt
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- $(cmake_use_find_package pbf Protobuf)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- if use kde; then
- ecm_src_configure
- else
- cmake_src_configure
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 1e791c3846776010ecce78a3e72af40e0330167e Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jul 14 05:58:54 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jul 14 05:58:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e791c38 kde-apps/marble: Stabilize 24.05.2 x86, #935994 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.05.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.05.2.ebuild b/kde-apps/marble/marble-24.05.2.ebuild index e31c4930cc3f..79a139f5a628 100644 --- a/kde-apps/marble/marble-24.05.2.ebuild +++ b/kde-apps/marble/marble-24.05.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="amd64 arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 742d4632aaf7d7ead564513904c1d48e95eb50e9 Author: Sam James gentoo org> AuthorDate: Sat Jul 13 22:43:30 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jul 13 22:43:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742d4632 kde-apps/marble: Stabilize 24.05.2 arm64, #935994 Signed-off-by: Sam James gentoo.org> kde-apps/marble/marble-24.05.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.05.2.ebuild b/kde-apps/marble/marble-24.05.2.ebuild index 95c45cf5d931..fc0231f553de 100644 --- a/kde-apps/marble/marble-24.05.2.ebuild +++ b/kde-apps/marble/marble-24.05.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 arm64 ~riscv ~x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 946ba08894cf02f40ab632700862fd828d05e5f6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 17 18:13:35 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 17 18:49:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=946ba088
kde-apps/marble: drop 24.02.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/Manifest | 1 -
kde-apps/marble/marble-24.02.2.ebuild | 97 ---
2 files changed, 98 deletions(-)
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index c2f28d58d5d1..3fc41899f2db 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1 @@
-DIST marble-24.02.2.tar.xz 53830364 BLAKE2B
fea466ca56003560b0e24be0cd16245d61be0e18461552122255e786e086f891e5636e6ef0dd0cd3d0c225c483f7ee33a5d614f94c2dacb41d7271d51e7db028
SHA512
3efee57d8270e4643e38c10565a73a32840d2284b9e773d115dcb826f7c95d62884a251b5eaaf5abbe5a494668d6cdde2c8bdafedce0e666035dfbe46399d5b0
DIST marble-24.05.1.tar.xz 52452536 BLAKE2B
a3d47e49f8554fbd93717e1c100d3f4e290090bd38db61c1c8d6aafddbd5c13f414a1f82f26a638ac1370a1f016bf85e0ebc72590782e37d3fa0e500316979e7
SHA512
1bf89508e8ad76a13c0f0d153f1678c8ac71ffe43ee321802b3bd836bdd9392c088ee130318ebcb1f21c9b93629a0cc638dd3673c88870c2f21816a312f3e379
diff --git a/kde-apps/marble/marble-24.02.2.ebuild
b/kde-apps/marble/marble-24.02.2.ebuild
deleted file mode 100644
index 79a139f5a628..
--- a/kde-apps/marble/marble-24.02.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-libs/zlib
- aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- kde? (
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- pbf? ( dev-libs/protobuf:= )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
- aprs? ( dev-lang/perl )
-"
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- use kde && cmake_run_in src/apps cmake_comment_add_subdirectory
marble-qt
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- $(cmake_use_find_package pbf Protobuf)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- if use kde; then
- ecm_src_configure
- else
- cmake_src_configure
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 51c279d1bc8e85ae8a53dd3fc2f52a15bd485523 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jun 17 05:52:26 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jun 17 05:52:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c279d1 kde-apps/marble: Stabilize 24.05.1 amd64, #934201 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.05.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.05.1.ebuild b/kde-apps/marble/marble-24.05.1.ebuild index c235e3496907..79a139f5a628 100644 --- a/kde-apps/marble/marble-24.05.1.ebuild +++ b/kde-apps/marble/marble-24.05.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 73a9e1f2a482a9632f759955eab3a3c95c522acb Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jun 17 05:18:40 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jun 17 05:18:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a9e1f2 kde-apps/marble: Stabilize 24.05.1 x86, #934201 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.05.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.05.1.ebuild b/kde-apps/marble/marble-24.05.1.ebuild index 95c45cf5d931..8fa44ef4b96a 100644 --- a/kde-apps/marble/marble-24.05.1.ebuild +++ b/kde-apps/marble/marble-24.05.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 5d3c6fc2ede9120cfad498373c35c50dc8cdfda9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 23 19:17:28 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 25 20:40:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3c6fc2
kde-apps/marble: drop 23.08.5
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/Manifest | 1 -
kde-apps/marble/marble-23.08.5.ebuild | 97 ---
2 files changed, 98 deletions(-)
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index ea3843f3b461..f632d4ca60d8 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1 @@
-DIST marble-23.08.5.tar.xz 53786140 BLAKE2B
c3df435cbe59d9af7668570746b504d17710db4fb9b263349a3c4fcb74ad2b6620f78a9ea81b6d31a59942b1024392aac4a1cfb858f1743b787f73488c87463a
SHA512
fd5c10733c83cc7a605ab1d84a07eba2449969095b22e96d3a81ceac0da2892630710bd816b7e9dd95a15c706761e1293966e3e7a65fa3f2bd7583a687a4802e
DIST marble-24.02.2.tar.xz 53830364 BLAKE2B
fea466ca56003560b0e24be0cd16245d61be0e18461552122255e786e086f891e5636e6ef0dd0cd3d0c225c483f7ee33a5d614f94c2dacb41d7271d51e7db028
SHA512
3efee57d8270e4643e38c10565a73a32840d2284b9e773d115dcb826f7c95d62884a251b5eaaf5abbe5a494668d6cdde2c8bdafedce0e666035dfbe46399d5b0
diff --git a/kde-apps/marble/marble-23.08.5.ebuild
b/kde-apps/marble/marble-23.08.5.ebuild
deleted file mode 100644
index 933bdd2a0903..
--- a/kde-apps/marble/marble-23.08.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-libs/zlib
- aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- kde? (
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- pbf? ( dev-libs/protobuf:= )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
- aprs? ( dev-lang/perl )
-"
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- use kde && cmake_run_in src/apps cmake_comment_add_subdirectory
marble-qt
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- $(cmake_use_find_package pbf Protobuf)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- if use kde; then
- ecm_src_configure
- else
- cmake_src_configure
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: fe724235d69d674819cf4de079be2bf372ccce5d Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 06:32:04 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 06:32:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe724235 kde-apps/marble: Stabilize 24.02.2 amd64, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.02.2.ebuild b/kde-apps/marble/marble-24.02.2.ebuild index c235e3496907..79a139f5a628 100644 --- a/kde-apps/marble/marble-24.02.2.ebuild +++ b/kde-apps/marble/marble-24.02.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 172c0fe18e193e718a821575b681a3c49c11aec6 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 06:24:32 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 06:24:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=172c0fe1 kde-apps/marble: Stabilize 24.02.2 x86, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.02.2.ebuild b/kde-apps/marble/marble-24.02.2.ebuild index fc0231f553de..c235e3496907 100644 --- a/kde-apps/marble/marble-24.02.2.ebuild +++ b/kde-apps/marble/marble-24.02.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm64 ~riscv ~x86" +KEYWORDS="~amd64 arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 3a9724b62e77dabe5afa06619bf1d614e2ab3eb2 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 05:25:50 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 05:26:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9724b6 kde-apps/marble: Stabilize 24.02.2 arm64, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/marble/marble-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.02.2.ebuild b/kde-apps/marble/marble-24.02.2.ebuild index 95c45cf5d931..fc0231f553de 100644 --- a/kde-apps/marble/marble-24.02.2.ebuild +++ b/kde-apps/marble/marble-24.02.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/"; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 arm64 ~riscv ~x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
commit: 384f80153eacb97f62b8374dad7b201adc1dbcad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 21 19:22:15 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 21 19:35:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384f8015
kde-apps/marble: Fix build against >=dev-libs/protobuf-23.3
Bug: https://bugs.gentoo.org/909081
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../marble-23.04.3-cxx17-for-protobuf-23.patch | 29 ++
kde-apps/marble/marble-23.04.3.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
new file mode 100644
index ..b03f800bf19d
--- /dev/null
+++ b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
@@ -0,0 +1,29 @@
+From dea7bb66fb0b89990c2ca69606d51f02af6c4cf1 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Tue, 11 Jul 2023 23:31:01 +0200
+Subject: [PATCH] Require C++17
+
+Newer protobuf will fail to compile without C++17
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c6d0e47ac0..b779501047 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -32,9 +32,9 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990")
+ endif()
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}"
STREQUAL "Clang")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ endif()
+ # Default to hidden visibility for symbols
+ set(CMAKE_C_VISIBILITY_PRESET hidden)
+--
+GitLab
+
diff --git a/kde-apps/marble/marble-23.04.3.ebuild
b/kde-apps/marble/marble-23.04.3.ebuild
index a79dff3c4856..3aeec198fe42 100644
--- a/kde-apps/marble/marble-23.04.3.ebuild
+++ b/kde-apps/marble/marble-23.04.3.ebuild
@@ -64,6 +64,8 @@ BDEPEND="
aprs? ( dev-lang/perl )
"
+PATCHES=( "${FILESDIR}/${P}-cxx17-for-protobuf-23.patch" ) # bug 909081, in
23.08.0
+
src_prepare() {
ecm_src_prepare
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
commit: 2760960ec94bb177c1941861a0a18a446620fcf2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 2 13:10:49 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 2 13:13:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2760960e
kde-apps/marble: Fix build with gpsd-3.23.1
STATUS_NO_FIX was renamed to STATUS_UNK.
See also:
https://invent.kde.org/education/marble/-/merge_requests/57
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../marble/files/marble-21.08.1-gpsd-3.23.1.patch | 32 ++
kde-apps/marble/marble-21.08.1.ebuild | 3 ++
2 files changed, 35 insertions(+)
diff --git a/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
new file mode 100644
index 000..ee01af9e438
--- /dev/null
+++ b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
@@ -0,0 +1,32 @@
+From 2732740676c236b832dead0b74511043db64787e Mon Sep 17 00:00:00 2001
+From: ivan tkachenko
+Date: Wed, 29 Sep 2021 00:55:23 +0300
+Subject: [PATCH] Fix build with gpsd 3.23.1
+
+STATUS_NO_FIX was renamed to STATUS_UNK.
+
+https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
+
+Co-Authored-By: Vlad Zahorodnii
+---
+ .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+index 6aaf3a34c..30b955cd1 100644
+--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -74,7 +74,9 @@ void GpsdPositionProviderPlugin::update( gps_data_t data )
+ {
+ PositionProviderStatus oldStatus = m_status;
+ GeoDataCoordinates oldPosition = m_position;
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
++#if defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without
bumping API version
++if ( data.fix.status == STATUS_UNK || std::isnan( data.fix.longitude ) ||
std::isnan( data.fix.latitude ) )
++#elif defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
+ if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude )
|| std::isnan( data.fix.latitude ) )
+ #else
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) ||
std::isnan( data.fix.latitude ) )
+--
+GitLab
+
diff --git a/kde-apps/marble/marble-21.08.1.ebuild
b/kde-apps/marble/marble-21.08.1.ebuild
index 0e56f3ae9a6..4bcdb54ca1c 100644
--- a/kde-apps/marble/marble-21.08.1.ebuild
+++ b/kde-apps/marble/marble-21.08.1.ebuild
@@ -65,6 +65,9 @@ RDEPEND="${DEPEND}"
# bug 588320
RESTRICT="test"
+# Upstream pending: https://invent.kde.org/education/marble/-/merge_requests/57
+PATCHES=( "${FILESDIR}/${P}-gpsd-3.23.1.patch" )
+
src_prepare() {
ecm_src_prepare
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
commit: 9a4b8baa6cad9a48f162dfb82fe01baa66c20718
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 27 18:38:03 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 27 18:39:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4b8baa
kde-apps/marble: Fix build w/ IUSE=gps and >=sci-libs/gpsd-3.21
Upstream commit 7039b70f0255376e5d67dad603f5d67f8c3c07db
Thanks-to: hrz.tu-chemnitz.de>
Closes: https://bugs.gentoo.org/744823
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../marble/files/marble-20.04.3-gpsd-3.21.patch| 29 ++
kde-apps/marble/marble-20.04.3.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
new file mode 100644
index 000..acde5d8b661
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
@@ -0,0 +1,29 @@
+From 7039b70f0255376e5d67dad603f5d67f8c3c07db Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Wed, 5 Aug 2020 14:20:37 +0200
+Subject: [PATCH] Fix build with gpsd 3.21
+
+Adapt to API changes
+---
+ .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+index 3a787eb1f..02dc4a355 100644
+--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data )
+ {
+ PositionProviderStatus oldStatus = m_status;
+ GeoDataCoordinates oldPosition = m_position;
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
++if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude )
|| std::isnan( data.fix.latitude ) )
++#else
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) ||
std::isnan( data.fix.latitude ) )
++#endif
+ m_status = PositionProviderStatusAcquiring;
+ else {
+ m_status = PositionProviderStatusAvailable;
+--
+GitLab
+
diff --git a/kde-apps/marble/marble-20.04.3.ebuild
b/kde-apps/marble/marble-20.04.3.ebuild
index f6ee6bf963a..72acb503e88 100644
--- a/kde-apps/marble/marble-20.04.3.ebuild
+++ b/kde-apps/marble/marble-20.04.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}"
# bug 588320
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-gpsd-3.21.patch" ) # bug 744823
+
src_prepare() {
ecm_src_prepare
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
commit: 09a05accbcf6dd2dee97f50fa05559aeebe6dd68
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 15 10:10:58 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 10:18:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a05acc
kde-apps/marble: Add missing DEPEND
Filed upstream: https://invent.kde.org/education/marble/-/merge_requests/1
Reported-by: Jérôme Borme laposte.net>
Closes: https://bugs.gentoo.org/728234
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../marble/files/marble-20.04.2-missing-dep.patch | 43 +
kde-apps/marble/marble-20.04.2-r1.ebuild | 101 +
2 files changed, 144 insertions(+)
diff --git a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
new file mode 100644
index 000..f4f71bdf1cc
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
@@ -0,0 +1,43 @@
+From c062504a2864680fee9c81ea46e7613315de038a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 15 Jun 2020 11:24:32 +0200
+Subject: [PATCH] Add missing Qt5WebChannel dependency
+
+QWebChannel header is used in src/lib/marble/MarbleLegendBrowser.cpp
+since commit b42ee5c8 but apparently not always implicitly included.
+
+Downstream report: https://bugs.gentoo.org/728234
+
+Signed-off-by: Andreas Sturmlechner
+---
+ CMakeLists.txt| 1 +
+ src/lib/marble/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 631a5b7d7..a3b2139dc 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -126,6 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
+
+set ( MARBLE_NO_WEBKITWIDGETS TRUE )
+ else()
++find_package(Qt5WebChannel ${REQUIRED_QT_VERSION})
+ find_package(Qt5WebEngine ${REQUIRED_QT_VERSION})
+ find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION})
+
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index e02c7d160..7d27be94b 100644
+--- a/src/lib/marble/CMakeLists.txt
b/src/lib/marble/CMakeLists.txt
+@@ -395,6 +395,7 @@ target_link_libraries(marblewidget
+ if (NOT MARBLE_NO_WEBKITWIDGETS)
+ target_link_libraries(marblewidget
+ LINK_PUBLIC
++Qt5::WebChannel
+ Qt5::WebEngineWidgets
+ Qt5::WebEngine
+ )
+--
+2.27.0
+
diff --git a/kde-apps/marble/marble-20.04.2-r1.ebuild
b/kde-apps/marble/marble-20.04.2-r1.ebuild
new file mode 100644
index 000..1e9c7aff9db
--- /dev/null
+++ b/kde-apps/marble/marble-20.04.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="forceoptional"
+KFMIN=5.70.0
+QTMIN=5.14.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile
+webengine"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+BDEPEND="
+ aprs? ( dev-lang/perl )
+ nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ sys-libs/zlib
+ aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+ dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+ designer? ( >=dev-qt/designer-${QTMIN}:5 )
+ geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
+ gps? ( sci-geosciences/gpsd )
+ kde? (
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ shapefile? ( sci-libs/shapelib:= )
+ webengine? (
+ >=dev-qt/qtwebchannel-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ )
+"
+RDEPEND="${DEPEND}"
+
+# bug 588320
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" )
+
+src_prepa
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 5ab00b1ffceb479bc60da71eea113f708cb17d7e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 15 10:18:10 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 15 10:18:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab00b1f
kde-apps/marble: Drop 20.04.2 (r0)
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-20.04.2.ebuild | 96 ---
1 file changed, 96 deletions(-)
diff --git a/kde-apps/marble/marble-20.04.2.ebuild
b/kde-apps/marble/marble-20.04.2.ebuild
deleted file mode 100644
index af208f35b7c..000
--- a/kde-apps/marble/marble-20.04.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile
+webengine"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-BDEPEND="
- aprs? ( dev-lang/perl )
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-libs/zlib
- aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- kde? (
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- phonon? ( media-libs/phonon[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- if use kde; then
- sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
- -i src/apps/CMakeLists.txt || die "Failed to disable
marble-qt"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- if use kde; then
- ecm_src_configure
- else
- cmake_src_configure
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 12a9a882c06dede0d61db3e26a99f54ede253227
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 13 00:45:43 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 13 02:01:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a9a882
kde-apps/marble: Add missing subslot
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/{marble-19.08.3.ebuild => marble-19.08.3-r1.ebuild} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kde-apps/marble/marble-19.08.3.ebuild
b/kde-apps/marble/marble-19.08.3-r1.ebuild
similarity index 98%
rename from kde-apps/marble/marble-19.08.3.ebuild
rename to kde-apps/marble/marble-19.08.3-r1.ebuild
index 659c5c944e9..bc9f779ba6e 100644
--- a/kde-apps/marble/marble-19.08.3.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -4,18 +4,17 @@
EAPI=7
ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-KDE_SUBSLOT="true"
ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
KFMIN=5.60.0
QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
HOMEPAGE="https://marble.kde.org/";
LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="5/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile
+webengine"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 25ec2df626f800e58ece4100c3ef504c6de25421
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 17 21:56:32 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 17 23:01:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ec2df6
kde-apps/marble: Drop 19.08.0 (r0)
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-19.08.0.ebuild | 87 ---
1 file changed, 87 deletions(-)
diff --git a/kde-apps/marble/marble-19.08.0.ebuild
b/kde-apps/marble/marble-19.08.0.ebuild
deleted file mode 100644
index 97e8b9a372c..000
--- a/kde-apps/marble/marble-19.08.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile
+webengine"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-BDEPEND="
- aprs? ( dev-lang/perl )
- nls? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- aprs? ( $(add_qt_dep qtserialport) )
- dbus? ( $(add_qt_dep qtdbus) )
- designer? ( $(add_qt_dep designer) )
- geolocation? ( $(add_qt_dep qtpositioning) )
- gps? ( sci-geosciences/gpsd )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwallet)
- )
- phonon? ( media-libs/phonon[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
- if use kde; then
- sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
- -i src/apps/CMakeLists.txt \
- || die "Failed to disable marble-qt"
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package aprs Perl)
- $(cmake-utils_use_find_package geolocation Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake-utils_use_find_package webengine Qt5WebEngine)
- $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- kde5_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 54ef89a7864c92023b776ad2a6f4d2c7fe294971
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 17 19:03:27 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 17 23:01:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ef89a7
kde-apps/marble: Fix DEPENDs, src_configure() with USE !kde
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/marble/marble-19.08.0-r1.ebuild | 93
1 file changed, 93 insertions(+)
diff --git a/kde-apps/marble/marble-19.08.0-r1.ebuild
b/kde-apps/marble/marble-19.08.0-r1.ebuild
new file mode 100644
index 000..7253e190f87
--- /dev/null
+++ b/kde-apps/marble/marble-19.08.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+KDE_SUBSLOT="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile
+webengine"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+BDEPEND="
+ aprs? ( dev-lang/perl )
+ nls? ( $(add_qt_dep linguist-tools) )
+"
+DEPEND="
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ sys-libs/zlib
+ aprs? ( $(add_qt_dep qtserialport) )
+ dbus? ( $(add_qt_dep qtdbus) )
+ designer? ( $(add_qt_dep designer) )
+ geolocation? ( $(add_qt_dep qtpositioning) )
+ gps? ( sci-geosciences/gpsd )
+ kde? (
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ shapefile? ( sci-libs/shapelib:= )
+ webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+RDEPEND="${DEPEND}"
+
+# bug 588320
+RESTRICT+=" test"
+
+src_prepare() {
+ kde5_src_prepare
+
+ rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
+
+ if use kde; then
+ sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
+ -i src/apps/CMakeLists.txt || die "Failed to disable
marble-qt"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package aprs Perl)
+ $(cmake-utils_use_find_package geolocation Qt5Positioning)
+ -DBUILD_MARBLE_TESTS=$(usex test)
+ -DWITH_DESIGNER_PLUGIN=$(usex designer)
+ -DWITH_libgps=$(usex gps)
+ -DWITH_KF5=$(usex kde)
+ -DWITH_Phonon4Qt5=$(usex phonon)
+ -DWITH_libshp=$(usex shapefile)
+ $(cmake-utils_use_find_package webengine Qt5WebEngine)
+ $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+ -DWITH_libwlocate=OFF
+ # bug 608890
+ -DKDE_INSTALL_CONFDIR="/etc/xdg"
+ )
+ if use kde; then
+ kde5_src_configure
+ else
+ cmake-utils_src_configure
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: cd55c9ec2b68f42b6e6ebc2becd75451aded80db Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jul 28 02:42:50 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jul 28 02:42:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd55c9ec kde-apps/marble: x86 stable wrt bug #688912 Package-Manager: Portage-2.3.66, Repoman-2.3.16 RepoMan-Options: --include-arches="x86" Signed-off-by: Mikle Kolyada gentoo.org> kde-apps/marble/marble-19.04.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-19.04.3.ebuild b/kde-apps/marble/marble-19.04.3.ebuild index 66d9944be8b..48e396017b3 100644 --- a/kde-apps/marble/marble-19.04.3.ebuild +++ b/kde-apps/marble/marble-19.04.3.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: e314f36ab9c8b659c988c3271c8b26c914e87878 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jul 28 02:29:45 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jul 28 02:29:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e314f36a kde-apps/marble: amd64 stable wrt bug #688912 Package-Manager: Portage-2.3.66, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Mikle Kolyada gentoo.org> kde-apps/marble/marble-19.04.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-19.04.3.ebuild b/kde-apps/marble/marble-19.04.3.ebuild index 97e8b9a372c..66d9944be8b 100644 --- a/kde-apps/marble/marble-19.04.3.ebuild +++ b/kde-apps/marble/marble-19.04.3.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 01280c00f911ab284d758b9c12c62b17c76cc800 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Mar 21 11:28:36 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Mar 21 11:33:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01280c00 kde-apps/marble: x86 stable wrt bug #679994 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="x86" kde-apps/marble/marble-18.12.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-18.12.3.ebuild b/kde-apps/marble/marble-18.12.3.ebuild index 66d9944be8b..48e396017b3 100644 --- a/kde-apps/marble/marble-18.12.3.ebuild +++ b/kde-apps/marble/marble-18.12.3.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 7363d8d86a73070b813434c017f49aa47e51edb1 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Mar 21 11:07:14 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Mar 21 11:13:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7363d8d8 kde-apps/marble: amd64 stable wrt bug #679994 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" kde-apps/marble/marble-18.12.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-18.12.3.ebuild b/kde-apps/marble/marble-18.12.3.ebuild index 97e8b9a372c..66d9944be8b 100644 --- a/kde-apps/marble/marble-18.12.3.ebuild +++ b/kde-apps/marble/marble-18.12.3.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 8b897dcf477b355836c07b690206df312f873f5e Author: Roy Bamford gentoo org> AuthorDate: Sat Feb 23 20:01:11 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 24 21:36:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b897dcf kde-apps/marble: added ~arm64 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Roy Bamford gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-18.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-18.12.2.ebuild b/kde-apps/marble/marble-18.12.2.ebuild index 2b79d10aad2..97e8b9a372c 100644 --- a/kde-apps/marble/marble-18.12.2.ebuild +++ b/kde-apps/marble/marble-18.12.2.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: e4fae6049fb0224f2b60dc53a3e4edcc59a46a86 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 14 16:30:35 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 14 18:36:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fae604 kde-apps/marble: Set KDE_HANDBOOK to optional Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-18.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-18.12.2.ebuild b/kde-apps/marble/marble-18.12.2.ebuild index 42758843a96..2b79d10aad2 100644 --- a/kde-apps/marble/marble-18.12.2.ebuild +++ b/kde-apps/marble/marble-18.12.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt KDE_SUBSLOT="true" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: a1160f8ae9c8eca3e826ec7c06e10152f60faab8 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jul 29 12:31:18 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 29 12:55:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1160f8a kde-apps/marble: x86 stable (bug #661810) Package-Manager: Portage-2.3.43, Repoman-2.3.10 kde-apps/marble/marble-18.04.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-18.04.3.ebuild b/kde-apps/marble/marble-18.04.3.ebuild index 8dc55170309..a962ad299e6 100644 --- a/kde-apps/marble/marble-18.04.3.ebuild +++ b/kde-apps/marble/marble-18.04.3.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 42dc03847f03c2c83ffdf4adad927daf25f0f997
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 22 14:25:14 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 22 14:32:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42dc0384
kde-apps/marble: Add USE=nls and missing DEPEND
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/marble/marble-17.04.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kde-apps/marble/marble-17.04.0.ebuild
b/kde-apps/marble/marble-17.04.0.ebuild
index a4c24ad25c6..edf87fd2745 100644
--- a/kde-apps/marble/marble-17.04.0.ebuild
+++ b/kde-apps/marble/marble-17.04.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more
about Earth"
HOMEPAGE="https://marble.kde.org/";
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
+IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit"
# FIXME (new package): libwlocate, WLAN-based geolocation
RDEPEND="
@@ -50,6 +50,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
aprs? ( dev-lang/perl )
+ nls? ( $(add_qt_dep linguist-tools) )
"
# bug 588320
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 11fcc1fe61cfc7fe2b71127b161eedaf554ea717 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Apr 16 20:55:18 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Apr 16 20:58:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11fcc1fe kde-apps/marble: amd64 stable wrt bug #612776 Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> kde-apps/marble/marble-16.12.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-16.12.3-r1.ebuild b/kde-apps/marble/marble-16.12.3-r1.ebuild index a4c24ad25c6..c70a32fb99d 100644 --- a/kde-apps/marble/marble-16.12.3-r1.ebuild +++ b/kde-apps/marble/marble-16.12.3-r1.ebuild @@ -11,7 +11,7 @@ inherit kde5 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 75f5cbc39d12aad97f5857023ce91e34c22d06cb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 1 18:11:20 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 1 18:15:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f5cbc3
kde-apps/marble: Drop 16.12.3 (r0)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/marble/marble-16.12.3.ebuild | 83 ---
1 file changed, 83 deletions(-)
diff --git a/kde-apps/marble/marble-16.12.3.ebuild
b/kde-apps/marble/marble-16.12.3.ebuild
deleted file mode 100644
index b1bccd1a828..000
--- a/kde-apps/marble/marble-16.12.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- aprs? ( $(add_qt_dep qtserialport) )
- dbus? ( $(add_qt_dep qtdbus) )
- designer? ( $(add_qt_dep designer) )
- gps? ( sci-geosciences/gpsd )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwallet)
- )
- phonon? ( media-libs/phonon[qt5] )
- positioning? ( $(add_qt_dep qtpositioning) )
- shapefile? ( sci-libs/shapelib:= )
- webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
- aprs? ( dev-lang/perl )
-"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
- if use kde; then
- sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
- -i src/apps/CMakeLists.txt \
- || die "Failed to disable marble-qt"
- fi
-
- kde5_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package aprs Perl)
- $(cmake-utils_use_find_package positioning Qt5Positioning)
- -DBUILD_MARBLE_TESTS=$(usex test)
- -DWITH_DESIGNER_PLUGIN=$(usex designer)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- -DWITH_Phonon4Qt5=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake-utils_use_find_package webkit Qt5WebKit)
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
- -DWITH_libwlocate=OFF
- )
- kde5_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: f7ebc8dc9c3c2a37bf421767e673c85b0c152273
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Mar 25 01:58:58 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Mar 25 01:59:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ebc8dc
kde-apps/marble: fix configuratoin installation path
Gentoo-bug: 608890
Package-Manager: Portage-2.3.5, Repoman-2.3.2
kde-apps/marble/marble-16.12.3-r1.ebuild | 85
1 file changed, 85 insertions(+)
diff --git a/kde-apps/marble/marble-16.12.3-r1.ebuild
b/kde-apps/marble/marble-16.12.3-r1.ebuild
new file mode 100644
index 000..a4c24ad25c6
--- /dev/null
+++ b/kde-apps/marble/marble-16.12.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SUBSLOT="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+RDEPEND="
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ aprs? ( $(add_qt_dep qtserialport) )
+ dbus? ( $(add_qt_dep qtdbus) )
+ designer? ( $(add_qt_dep designer) )
+ gps? ( sci-geosciences/gpsd )
+ kde? (
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ )
+ phonon? ( media-libs/phonon[qt5] )
+ positioning? ( $(add_qt_dep qtpositioning) )
+ shapefile? ( sci-libs/shapelib:= )
+ webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${RDEPEND}
+ aprs? ( dev-lang/perl )
+"
+
+# bug 588320
+RESTRICT+=" test"
+
+src_prepare() {
+ if use kde; then
+ sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
+ -i src/apps/CMakeLists.txt \
+ || die "Failed to disable marble-qt"
+ fi
+
+ kde5_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package aprs Perl)
+ $(cmake-utils_use_find_package positioning Qt5Positioning)
+ -DBUILD_MARBLE_TESTS=$(usex test)
+ -DWITH_DESIGNER_PLUGIN=$(usex designer)
+ -DWITH_libgps=$(usex gps)
+ -DWITH_KF5=$(usex kde)
+ -DWITH_Phonon4Qt5=$(usex phonon)
+ -DWITH_libshp=$(usex shapefile)
+ $(cmake-utils_use_find_package webkit Qt5WebKit)
+ $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+ -DWITH_libwlocate=OFF
+ # bug 608890
+ -DKDE_INSTALL_CONFDIR="/etc/xdg"
+ )
+ kde5_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 6e0ca8901f16cd2a1ce5bcdd76a2fd3715ede6e9
Author: Johannes Huber gentoo org>
AuthorDate: Sat Feb 25 22:03:39 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Feb 25 22:05:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0ca890
kde-apps/marble: Drop slot 4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/marble/Manifest | 1 -
kde-apps/marble/marble-4.14.3.ebuild | 92
kde-apps/marble/metadata.xml | 2 -
3 files changed, 95 deletions(-)
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 544be3d991..fabf07fa94 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,2 @@
DIST marble-16.08.3.tar.xz 23144576 SHA256
1c2d3263a55cde6511b703548399f48a1d9d0c33cb57283cc304d07189e8aa53 SHA512
ff1f2957266a54a0d315305478fdd0dc51e0a398746050efbb3ecc2db5698996693bd6c4d810f0dcf73348e4d2c1535c83a56bfffa3db7ccc015fea6c917e458
WHIRLPOOL
a33b509310c5ffd96d1ca022ea348519d5d5a5d98098a3140fcd358cb362cc7cfdf97ad8809d30c844bb5321b1e707f8fff961aa250f0e16699c611566f0a50b
DIST marble-16.12.2.tar.xz 24401768 SHA256
e0c55d8c944ee6b53279307edd0087d607df4eb94404e8eb852f3940a150f35c SHA512
b181f02b20b000ff009b91aa191cfdf2c98d9255de4eb31cb369c61330fe53f1816fb33159a7fcfa36183e6f4ba5487c236762086a6847826d83e2657be3517c
WHIRLPOOL
1cd6d09e22534744c264d861304571d222f480f5ad72b49c8d1e441a751ca167ceee679cab54d13b0f9db46f9ec68a472d852d8b62fd325c83ccd31e52433fa0
-DIST marble-4.14.3.tar.xz 19709200 SHA256
4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0 SHA512
eac20e22d4540e45cd6bb24440166eff88db90d400a7c6cd09f20bc0c49b39814aed0c1ae5f3fa2c591ea9a3a83b9bc16294e9706a38e640db35106dbcbdc1c8
WHIRLPOOL
58f053e419707e1b98f1e77f35da52e2838a54985f22a9827dbbb9191ba019137f842834ba92ff74afa0ad745bb525d6bc8ed30200ddaa6ee329292691a636b7
diff --git a/kde-apps/marble/marble-4.14.3.ebuild
b/kde-apps/marble/marble-4.14.3.ebuild
deleted file mode 100644
index 8c4c316c56..00
--- a/kde-apps/marble/marble-4.14.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-PYTHON_COMPAT=( python2_7 )
-WEBKIT_REQUIRED="always"
-inherit kde4-base python-single-r1
-
-DESCRIPTION="Generic geographical map widget"
-HOMEPAGE="https://marble.kde.org/";
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde phonon plasma python shapefile test zip"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# tests fail / segfault. Last checked for 4.9.0
-RESTRICT="test"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtdeclarative:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- dev-qt/qtsvg:4
- dev-qt/qtwebkit:4
- designer-plugin? ( dev-qt/designer:4 )
- gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
- kde? ( media-libs/phonon[qt4] )
- phonon? ( media-libs/phonon[qt4] )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
- kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) )
- )
- shapefile? ( sci-libs/shapelib:= )
- zip? ( dev-libs/quazip[qt4] )
-"
-DEPEND="
- ${RDEPEND}
- test? ( dev-qt/qttest:4 )
-"
-# the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 429346
-
-REQUIRED_USE="
- plasma? ( kde )
- python? ( kde )
-"
-
-pkg_setup() {
- kde4-base_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
- $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
- $(cmake-utils_use_with python PythonLibrary)
- $(cmake-utils_use_with python PyQt4)
- $(cmake-utils_use_with python SIP)
- $(cmake-utils_use_with gps libgps)
- $(cmake-utils_use !kde QTONLY)
- $(cmake-utils_use_with phonon)
- $(cmake-utils_use_with plasma)
- $(cmake-utils_use_with shapefile libshp)
- $(cmake-utils_use_with zip quazip)
- -DBUILD_MARBLE_TESTS=OFF
- -DWITH_liblocation=0
- -DWITH_QextSerialPort=OFF
- )
-
- kde4-base_src_configure
-}
-
-src_test() {
- if use kde; then
- elog "Marble tests can only be run in the qt-only version"
- else
- local mycmakeargs=(
- -DBUILD_MARBLE_TESTS=ON
- )
- kde4-base_src_test
- fi
-}
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 593f051156..e6bb9652ae 100644
--- a/
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: bffcbe638a81f0c5a2024b9dd012b5d9c044fea2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 21 13:45:04 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 21 16:12:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffcbe63
kde-apps/marble: Add subslot operator for shapelib RDEPEND
Package-Manager: portage-2.3.0
kde-apps/marble/marble-16.08.3-r1.ebuild | 4 ++--
kde-apps/marble/marble-16.12.1.ebuild| 2 +-
kde-apps/marble/marble-4.14.3.ebuild | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kde-apps/marble/marble-16.08.3-r1.ebuild
b/kde-apps/marble/marble-16.08.3-r1.ebuild
index 7fe3be1..52d1d7d 100644
--- a/kde-apps/marble/marble-16.08.3-r1.ebuild
+++ b/kde-apps/marble/marble-16.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -46,7 +46,7 @@ RDEPEND="
)
phonon? ( media-libs/phonon[qt5] )
positioning? ( $(add_qt_dep qtpositioning) )
- shapefile? ( sci-libs/shapelib )
+ shapefile? ( sci-libs/shapelib:= )
webkit? ( $(add_qt_dep qtwebkit) )
"
DEPEND="${RDEPEND}
diff --git a/kde-apps/marble/marble-16.12.1.ebuild
b/kde-apps/marble/marble-16.12.1.ebuild
index 9f4d9cc..c074c52 100644
--- a/kde-apps/marble/marble-16.12.1.ebuild
+++ b/kde-apps/marble/marble-16.12.1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
)
phonon? ( media-libs/phonon[qt5] )
positioning? ( $(add_qt_dep qtpositioning) )
- shapefile? ( sci-libs/shapelib )
+ shapefile? ( sci-libs/shapelib:= )
webkit? ( $(add_qt_dep qtwebkit) )
"
DEPEND="${RDEPEND}
diff --git a/kde-apps/marble/marble-4.14.3.ebuild
b/kde-apps/marble/marble-4.14.3.ebuild
index 07b77da..8c4c316 100644
--- a/kde-apps/marble/marble-4.14.3.ebuild
+++ b/kde-apps/marble/marble-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -39,7 +39,7 @@ RDEPEND="
>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) )
)
- shapefile? ( sci-libs/shapelib )
+ shapefile? ( sci-libs/shapelib:= )
zip? ( dev-libs/quazip[qt4] )
"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/files/, kde-apps/marble/
commit: 88cea0f2fe2bf1d1a5fe8dc97f5838921cb197eb
Author: Andreas Sturmlechner gmail com>
AuthorDate: Wed Dec 7 15:13:58 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Dec 7 18:32:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88cea0f2
kde-apps/marble: Drop unused DEPEND
Upstream commit 670a24a87adab6d7b76de60ce67c8eef8433c24c
Package-Manager: portage-2.3.0
Signed-off-by: Johannes Huber gentoo.org>
kde-apps/marble/files/marble-16.08.3-deps.patch | 42
kde-apps/marble/marble-16.08.3-r1.ebuild| 86 +
2 files changed, 128 insertions(+)
diff --git a/kde-apps/marble/files/marble-16.08.3-deps.patch
b/kde-apps/marble/files/marble-16.08.3-deps.patch
new file mode 100644
index ..98d5225
--- /dev/null
+++ b/kde-apps/marble/files/marble-16.08.3-deps.patch
@@ -0,0 +1,42 @@
+commit 670a24a87adab6d7b76de60ce67c8eef8433c24c
+Author: Friedrich W. H. Kossebau
+Date: Sat Dec 3 20:33:14 2016 +0100
+
+Remove dep on Qt5::Location, not used
+
+diff --git a/src/plugins/positionprovider/CMakeLists.txt
b/src/plugins/positionprovider/CMakeLists.txt
+--- a/src/plugins/positionprovider/CMakeLists.txt
b/src/plugins/positionprovider/CMakeLists.txt
+@@ -8,17 +8,13 @@ ENDIF(LIBGPS_FOUND)
+ ADD_SUBDIRECTORY( gpsd )
+ ENDIF(LIBGPS_FOUND)
+
+-macro_optional_find_package(Qt5Location ${REQUIRED_QT_VERSION})
+ macro_optional_find_package(Qt5Positioning ${REQUIRED_QT_VERSION})
+ marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a
collection of APIs and frameworks" )
+ marble_set_package_properties( Qt5Positioning PROPERTIES URL
"http://qt.digia.com/"; )
+-marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL
PURPOSE "Required for QtLocation to work" )
+-marble_set_package_properties( Qt5Location PROPERTIES DESCRIPTION
"geographical support for position and map use" )
+-marble_set_package_properties( Qt5Location PROPERTIES URL
"http://qt.digia.com/"; )
+-marble_set_package_properties( Qt5Location PROPERTIES TYPE OPTIONAL PURPOSE
"position information via Qt5Positioning and QtLocation" )
+-IF(Qt5Location_FOUND)
++marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL
PURPOSE "position information via Qt5Positioning" )
++if(Qt5Positioning_FOUND)
+ADD_SUBDIRECTORY( qtpositioning )
+-ENDIF(Qt5Location_FOUND)
++endif()
+
+
+ macro_optional_find_package(libwlocate)
+diff --git a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
+index 9079443..e0179bf 100644
+--- a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
+@@ -9,6 +9,6 @@ SET( qtpositioning_SRCS
+ QtPositioningPositionProviderPlugin.cpp
+ )
+
+-SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Location Qt5::Positioning )
++SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Positioning )
+
+ MARBLE_ADD_PLUGIN( QtPositioningPositionProviderPlugin ${qtpositioning_SRCS} )
diff --git a/kde-apps/marble/marble-16.08.3-r1.ebuild
b/kde-apps/marble/marble-16.08.3-r1.ebuild
new file mode 100644
index ..f9856ac
--- /dev/null
+++ b/kde-apps/marble/marble-16.08.3-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/";
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+RDEPEND="
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ aprs? ( $(add_qt_dep qtserialport) )
+ dbus? ( $(add_qt_dep qtdbus) )
+ designer? ( $(add_qt_dep designer) )
+ gps? ( sci-geosciences/gpsd )
+ kde? (
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ )
+ phonon? ( media-libs/phonon[qt5] )
+ positioning? ( $(add_qt_dep qtpositioning) )
+ shapefile? ( sci-libs/shapeli
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: e85aebaa5655e892e1f2ec7791f1172d87ef7c67
Author: Andreas Sturmlechner gmail com>
AuthorDate: Wed Dec 7 15:24:04 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Dec 7 18:32:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85aebaa
kde-apps/marble: Drop old
Package-Manager: portage-2.3.0
Closes: #3049
Signed-off-by: Johannes Huber gentoo.org>
kde-apps/marble/marble-16.08.3.ebuild | 88 ---
1 file changed, 88 deletions(-)
diff --git a/kde-apps/marble/marble-16.08.3.ebuild
b/kde-apps/marble/marble-16.08.3.ebuild
deleted file mode 100644
index 9bd4a9b..
--- a/kde-apps/marble/marble-16.08.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/";
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- aprs? ( $(add_qt_dep qtserialport) )
- dbus? ( $(add_qt_dep qtdbus) )
- designer? ( $(add_qt_dep designer) )
- gps? ( sci-geosciences/gpsd )
- kde? (
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwallet)
- )
- phonon? ( media-libs/phonon[qt5] )
- positioning? (
- $(add_qt_dep qtlocation)
- $(add_qt_dep qtpositioning)
- )
- shapefile? ( sci-libs/shapelib )
- webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
- aprs? ( dev-lang/perl )
-"
-
-# bug 588320
-RESTRICT=test
-
-src_prepare() {
- if use kde; then
- sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
- -i src/apps/CMakeLists.txt \
- || die "Failed to disable marble-qt"
- fi
-
- kde5_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)
- -DWITH_libgps=$(usex gps)
- -DWITH_KF5=$(usex kde)
- -DWITH_Phonon=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake-utils_use_find_package webkit Qt5WebKit)
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
- -DWITH_libwlocate=OFF
- )
- kde5_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: f2e22053c73d76bdf5a90d7731a7104c31c2adb0
Author: Michael Palimaka gentoo org>
AuthorDate: Sat Oct 29 10:21:30 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Oct 29 10:21:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e22053
kde-apps/marble: add dev-libs/quazip USE dependency
Package-Manager: portage-2.3.2
kde-apps/marble/marble-4.14.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/marble/marble-4.14.3.ebuild
b/kde-apps/marble/marble-4.14.3.ebuild
index 1484f09..089db03 100644
--- a/kde-apps/marble/marble-4.14.3.ebuild
+++ b/kde-apps/marble/marble-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,7 +40,7 @@ RDEPEND="
kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
)
shapefile? ( sci-libs/shapelib )
- zip? ( dev-libs/quazip )
+ zip? ( dev-libs/quazip[qt4] )
"
DEPEND="
${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: a5ee6d86aad1acac56b6a109c45f3e3c9eefed25
Author: Johannes Huber gentoo org>
AuthorDate: Sat Jul 9 18:24:42 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Jul 9 18:26:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ee6d86
kde-apps/marble: Restrict tests
Add virtual x for tests.
Gentoo-bug: 588320
Package-Manager: portage-2.3.0
kde-apps/marble/marble-16.04.2.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/kde-apps/marble/marble-16.04.2.ebuild
b/kde-apps/marble/marble-16.04.2.ebuild
index 50c47c0..271846e 100644
--- a/kde-apps/marble/marble-16.04.2.ebuild
+++ b/kde-apps/marble/marble-16.04.2.ebuild
@@ -6,6 +6,7 @@ EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Generic geographical map widget"
@@ -52,6 +53,9 @@ DEPEND="${RDEPEND}
aprs? ( dev-lang/perl )
"
+# bug 588320
+RESTRICT=test
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package aprs Perl)
[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/
commit: 87b4f579747de179bcd9e8a2e100a6914122badd Author: Mikle Kolyada gentoo org> AuthorDate: Tue May 24 19:20:03 2016 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue May 24 19:25:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b4f579 kde-apps/marble: amd64 stable wrt bug #579992 Package-Manager: portage-2.2.28 kde-apps/marble/marble-15.12.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-15.12.3.ebuild b/kde-apps/marble/marble-15.12.3.ebuild index 019ccc4..a1875b9 100644 --- a/kde-apps/marble/marble-15.12.3.ebuild +++ b/kde-apps/marble/marble-15.12.3.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Generic geographical map widget" HOMEPAGE="https://marble.kde.org/"; -KEYWORDS=" ~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="aprs designer-plugin gps +kde phonon shapefile"
