summaryrefslogtreecommitdiff
path: root/kde-apps/marble
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /kde-apps/marble
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'kde-apps/marble')
-rw-r--r--kde-apps/marble/Manifest6
-rw-r--r--kde-apps/marble/marble-20.12.3.ebuild2
-rw-r--r--kde-apps/marble/marble-21.04.0.ebuild (renamed from kde-apps/marble/marble-20.08.3.ebuild)12
3 files changed, 11 insertions, 9 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index b83a19a3468e..df22ab34a2d1 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-20.08.3.tar.xz 52191936 BLAKE2B a7990d76d6df1333b5beac62d82e4e10ad55fa2513f579d4d169bd24e54e8d2f4132847d9544dcbeb1205b4bedcd193792332434c64c97cf9eb1180f6bad9b05 SHA512 0bffe97a14fe74300eef8c94a3d14217abba6602fef86e07c799d52970e37047576defd4baeaebe9171ff3915f35c0a64ca2e46d233fde834c8bd5dc3f15ebce
DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a
-EBUILD marble-20.08.3.ebuild 2621 BLAKE2B 712cb3696459b0e58b6d28fc8048ec3b3b848284ef1057d831af3e2e82b2b52505fba68b35dda3a2ad8baa9c82103cc21534d109131e78c3172a00a96b5e3f40 SHA512 ade08fba6df6222d95cb99694085dd20084c71a4f66c6b2174a1f1f23a4e1bc93ce82bf48c78ff11d875ea3cb9c39d451fbd242a1de6cc6201696b6c2dbd7f61
-EBUILD marble-20.12.3.ebuild 2700 BLAKE2B c8045629292170bb265a024e6463307568a42c9ba2d0124b50b893feb7aefb2caa3aab2bafb53f0a182825bb10f29720231e44e21593809fb0936913aefce2ec SHA512 003af6b8444574e363c4d52204bad4beabadad639e92be929a1e813f6dcb9cc21371800113a8ab8f59d9829b217480d0c1e566ff6b680866e03a8782cb445555
+DIST marble-21.04.0.tar.xz 52373900 BLAKE2B 813e7a3677c7d721b5ed6e037a0245237969aec77d0292bef8dfae5fa04b7aedc35a2a0f69a06a02a7e252efc4ca9e7f5a0b27ac69a7b99b31be696126a7d2a4 SHA512 ef012f9f831bfe7da73d10a33bdaf9a6bf07e6d7b10ff25ead944cadbc1535be558f945fa065f1f4d8d5210c19fb4d4cb5b5be9e95f493c5992709fbc6e81f69
+EBUILD marble-20.12.3.ebuild 2697 BLAKE2B 59bac185fead02c46f56d402b2283cb0e32afba0add2c78f9836949490093d662093c98b5b42cae28567ee2fe09a0d24a8c2e1cc928827c250b606eccd41f01e SHA512 2cb9e241a4ffb1402a6dd7a5046e2a636bc5b29489e24439c72be94e03b4959fe4482e211ecc5267a6bfab581664760132fdca544c570e67ba13da6b5f2690ce
+EBUILD marble-21.04.0.ebuild 2700 BLAKE2B e89142db07919d788491301bb8865447766583abab248af0eeb16b679351bed32b0997b9c02341f899d15bef560996e8e35a9e3a56427a9ea88acaf44bf4568f SHA512 34aed2b6f84f2be67e5f290bd4bcd4f469ec51ff509676e93f6d598801f9782c68fa66b389433dd9743e7913d5ae24c9bd04920ccfc497cc0c676ea0ec820a15
MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703
diff --git a/kde-apps/marble/marble-20.12.3.ebuild b/kde-apps/marble/marble-20.12.3.ebuild
index d85bf874ae19..5cedda6983ac 100644
--- a/kde-apps/marble/marble-20.12.3.ebuild
+++ b/kde-apps/marble/marble-20.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
# FIXME (new package): libwlocate, WLAN-based geolocation
diff --git a/kde-apps/marble/marble-20.08.3.ebuild b/kde-apps/marble/marble-21.04.0.ebuild
index f1581b300d5c..898a19e57325 100644
--- a/kde-apps/marble/marble-20.08.3.ebuild
+++ b/kde-apps/marble/marble-21.04.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,8 +15,8 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
# FIXME (new package): libwlocate, WLAN-based geolocation
BDEPEND="
@@ -52,6 +52,7 @@ DEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
)
+ pbf? ( dev-libs/protobuf:= )
phonon? ( >=media-libs/phonon-4.11.0 )
shapefile? ( sci-libs/shapelib:= )
webengine? (
@@ -80,6 +81,7 @@ src_configure() {
-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)