summaryrefslogtreecommitdiff
path: root/kde-apps/marble
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
commitb24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /kde-apps/marble
parent121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
gentoo resync : 02.08.2019
Diffstat (limited to 'kde-apps/marble')
-rw-r--r--kde-apps/marble/Manifest4
-rw-r--r--kde-apps/marble/marble-18.12.3.ebuild87
-rw-r--r--kde-apps/marble/marble-19.04.3.ebuild2
3 files changed, 2 insertions, 91 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 2dd43056f59c..a5c5290c5aca 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-18.12.3.tar.xz 52419848 BLAKE2B fb8732807ef71201e41d8548feb65aa874cd06256e522dd0eb41460190e401f86842aaadd747123fac48050545dd79cc4a80cbdb20a35852d5560f20b332312f SHA512 af6147a288021a3056892bae8d9c83b6ecfc581c7237d3fa04a579e4461779a5dacb0e22b21f0e8af5032f75d827a56d197369c85193f0188140ac361777a851
DIST marble-19.04.3.tar.xz 52188608 BLAKE2B 446078cdcff447e6e15b5be62a6169ba1a227fe189d4ff61cccc9b29a6fbf2fe500a57774f117759dd9a5371329e510fe862e68ce110e5c567108af30104d082 SHA512 4839ff6466accc920507ba032e7dea45a4fd22b6b93ca2f8d15526f0c8490f86271af0f109232f6f87dd00e090295b4ff17ec17b4592b90f13f26ce08fb2f4f4
-EBUILD marble-18.12.3.ebuild 2327 BLAKE2B 57e8b49ed6a9688fc87b60f5d07bc92c99d8c8e5252eb3edb346595be6d28d1b923bd116e2037938297850b52d18df229a5fa270a7c2380dd5fcc59543a741e5 SHA512 cbd6c98ca61dbf6288eafbaec5bd3b87725d92834e81e9e7cfbf1a5accd9d39a752326676810a1a7a7681c8b7d1bc5d3ef28d2c18eb0c948a70fbfa900d97797
-EBUILD marble-19.04.3.ebuild 2329 BLAKE2B 5dbe9dd58fb727489908c7b0120e9d29281f421053cf3e15247c0d150c2470340e21620c8ec04c18bba230f9581f5cb6eab6287db825962fabbf1f8401930be9 SHA512 502d157a94648d8bf255c1b33055a2653fe284696efeb137fadaeb3520525df81e48f4043c3405dc6273a98686f2c4110bcec0d816f7357b5353364d38bfd573
+EBUILD marble-19.04.3.ebuild 2326 BLAKE2B a80c94ee3d720d4ea6847420428d38ba3da4945d0a3a6fb4ff2de40b4dd2fe0cbcb97fd1c38f43a37e063449f450d42b3f045c5645c60899d11e0752b21af73b SHA512 13e84eaefe0a1e918ceb0c7ed8a7af6f3521d49c655ea6844bd9f5c2685e83f5dc8e5f93dd18985fbf8c9eb8310971d9b1167bb3ac484659959c01b575afd1b9
MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.12.3.ebuild b/kde-apps/marble/marble-18.12.3.ebuild
deleted file mode 100644
index 48e396017b3a..000000000000
--- a/kde-apps/marble/marble-18.12.3.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
-}
diff --git a/kde-apps/marble/marble-19.04.3.ebuild b/kde-apps/marble/marble-19.04.3.ebuild
index 97e8b9a372c9..5701197f67d2 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