gentoo resync : 01.12.2017

4 files changed, 3 insertions, 92 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 732c2812f94e..22ca27d24806 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,3 @@
-DIST marble-17.04.3.tar.xz 52304300 SHA256 83d63f3a6cd25231ba7a6245f6ef33d28abfb869bacd70a2576c46a6f9b39056 SHA512 855dc84ce0518e2dced7d3a288ffd5b74453118ca88b6995f4de431d5074a613254582e4a397a47eadd04bc7e9d200f598736a497f4529d114088f9db93fd198 WHIRLPOOL 5e6f5ef7661bd7b4b29cb2ad50e5ababc19da57fe5d0ed7fd38ee79f04360dadffe75ca87da509379d5b5e7f70f970adcb013c80472dec0da01f30f5b67302d3
 DIST marble-17.08.3.tar.xz 52280688 SHA256 c27f8b33ad0f1cc36c5af4f23352f02ab8de4a18e8a448f8ef80b41756f2bf62 SHA512 9991dc9137e63462ae7d6086063d07d6012a22c4dfa137209517010db1f71ea5c7a494600d251f63b73a54943fbcfa237f1fdc749442dadd399a5717162f5e1d WHIRLPOOL d05610bd58e4a242fa5327504646a1f291aa80569e4dc9f4d5d14de79de15f78b3963834398349fa9d5bb63324aecbcc4db296290b2893673ccb2bd498b82117
-EBUILD marble-17.04.3.ebuild 2246 BLAKE2B eb4f60426de2f9a7fc40cdab67659ba693fd394d44c3fec692a80e770e628fe0d824058b62b2363e0f5f212038955a1f23822b740c643f84355c25dd3659f476 SHA512 d5f63193f935673d855ee1eaff1e326f517e92d313e02ac7f93ec3e42337ca053eb5823c1aa668c0a35e961c0450a9a450a967daf2606d17049ab9c201baa8c7
-EBUILD marble-17.08.3.ebuild 2248 BLAKE2B 9d72cb86f1924c74ac9d78193f619f488babfe5f8712f1543a88017ca6d8f635eaec5d4ea93ea87024204f22ae723d136bf19a50a9f2deff7e67465eae692bd0 SHA512 d5d90f9125e0016ee7c95e47226bc6c124e9b32bea89c7b9d503bfe638f625abd26f64d26e6448f4be4fef3c367dcbad6245569da0dd970c72b67111bb56d749
-MISC metadata.xml 686 BLAKE2B 1545381ee8e768186e4a1e01383388abd4e72f185c84784ca0ecdbc1f881b52e37d0889542ca1276024541196bd43e34cb6ded27aef1066f59a48eadf2bf07e0 SHA512 c9444f2d64c2ad203260f4948463f9462d2f69b3ef09d2eae5464a3bd118f19d8fdd73a1c91a9bc072ee0b7e6304872e610d73bcaa8bd50d4b6a1ea18b844cc1
+EBUILD marble-17.08.3.ebuild 2246 BLAKE2B db0c96ada76ee661bd3f127188e9ea89a2a5c672f234b02eecf94da24442f1105ae7cee6aa6403566cea8add3f0d4e40e9fda89a4d4ace5b753636213b6fb0f2 SHA512 7317d5a669c65df1c9acaa2a7219ef53c6299854f7376989626f5efe48a6fea3e700173e69a24f64df946ca05069d6a538307a1548d81eaa5c85e2c408e84f11
+MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-17.04.3.ebuild b/kde-apps/marble/marble-17.04.3.ebuild
deleted file mode 100644
index 390c20c63807..000000000000
--- a/kde-apps/marble/marble-17.04.3.ebuild
+++ /dev/null
@@ -1,86 +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 x86"
-
-IUSE="aprs +dbus designer gps +kde nls 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 )
-	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 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
-}
diff --git a/kde-apps/marble/marble-17.08.3.ebuild b/kde-apps/marble/marble-17.08.3.ebuild
index 10601eab2609..80ec4adb17a8 100644
--- a/kde-apps/marble/marble-17.08.3.ebuild
+++ b/kde-apps/marble/marble-17.08.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"
 
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index e6bb9652ae54..052f511a6982 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="aprs">Enable support for APRS data sources</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
-		<flag name="positioning">Enable position information via <pkg>dev-qt/qtpositioning</pkg> and <pkg>dev-qt/qtlocation</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 	</use>
 </pkgmetadata>