summaryrefslogtreecommitdiff
path: root/kde-apps/marble
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-04-05 21:17:31 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-04-05 21:17:31 +0100
commitdc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
treec85d72f6f31f21f178069c9d41d41a7c1ff4b362 /kde-apps/marble
parent0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
gentoo resync : 05.04.2019
Diffstat (limited to 'kde-apps/marble')
-rw-r--r--kde-apps/marble/Manifest4
-rw-r--r--kde-apps/marble/marble-18.08.3.ebuild86
-rw-r--r--kde-apps/marble/marble-18.12.3.ebuild2
3 files changed, 2 insertions, 90 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 255999eae786..230db25c1e35 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-18.08.3.tar.xz 52419996 BLAKE2B 3b591f4feb4614dccc477bc22b67b4e00ba4a499f63d4cf74d38f98f23094018578793fe93f6e393003ad3bd9ac8ba934b665522e8fe75bf9e48ee92c8bcc238 SHA512 c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9
DIST marble-18.12.3.tar.xz 52419848 BLAKE2B fb8732807ef71201e41d8548feb65aa874cd06256e522dd0eb41460190e401f86842aaadd747123fac48050545dd79cc4a80cbdb20a35852d5560f20b332312f SHA512 af6147a288021a3056892bae8d9c83b6ecfc581c7237d3fa04a579e4461779a5dacb0e22b21f0e8af5032f75d827a56d197369c85193f0188140ac361777a851
-EBUILD marble-18.08.3.ebuild 2243 BLAKE2B 4ef171f5aa0fb4b1d28ab9fe80d2ad1763680501255569898e235ed777216e5f8e5240d7d09d24953622644e00edd85069bebb8a5a5844b514e9dc6b0c6c6760 SHA512 8944e1a251ed5f80c14c45a4bd11fa3c8d5c4b9003798222231ae9cd63509b9d7b8bd9f7d1063673fcda1c5a686be4c090f3507d8dac88ad4eb6fd098c6c8a16
-EBUILD marble-18.12.3.ebuild 2329 BLAKE2B 5dbe9dd58fb727489908c7b0120e9d29281f421053cf3e15247c0d150c2470340e21620c8ec04c18bba230f9581f5cb6eab6287db825962fabbf1f8401930be9 SHA512 502d157a94648d8bf255c1b33055a2653fe284696efeb137fadaeb3520525df81e48f4043c3405dc6273a98686f2c4110bcec0d816f7357b5353364d38bfd573
+EBUILD marble-18.12.3.ebuild 2327 BLAKE2B 57e8b49ed6a9688fc87b60f5d07bc92c99d8c8e5252eb3edb346595be6d28d1b923bd116e2037938297850b52d18df229a5fa270a7c2380dd5fcc59543a741e5 SHA512 cbd6c98ca61dbf6288eafbaec5bd3b87725d92834e81e9e7cfbf1a5accd9d39a752326676810a1a7a7681c8b7d1bc5d3ef28d2c18eb0c948a70fbfa900d97797
MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.08.3.ebuild b/kde-apps/marble/marble-18.08.3.ebuild
deleted file mode 100644
index 68e525d428ca..000000000000
--- a/kde-apps/marble/marble-18.08.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 x86"
-
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation 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) )
- 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:= )
- webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
- aprs? ( dev-lang/perl )
- nls? ( $(add_qt_dep linguist-tools) )
-"
-
-# 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 webkit Qt5WebKit)
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
- -DWITH_libwlocate=OFF
- # bug 608890
- -DKDE_INSTALL_CONFDIR="/etc/xdg"
- )
- kde5_src_configure
-}
diff --git a/kde-apps/marble/marble-18.12.3.ebuild b/kde-apps/marble/marble-18.12.3.ebuild
index 97e8b9a372c9..48e396017b3a 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