gentoo resync : 15.12.2017

2 files changed, 89 insertions, 1 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 22ca27d24806..582fbeee1243 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,5 @@
-DIST marble-17.08.3.tar.xz 52280688 SHA256 c27f8b33ad0f1cc36c5af4f23352f02ab8de4a18e8a448f8ef80b41756f2bf62 SHA512 9991dc9137e63462ae7d6086063d07d6012a22c4dfa137209517010db1f71ea5c7a494600d251f63b73a54943fbcfa237f1fdc749442dadd399a5717162f5e1d WHIRLPOOL d05610bd58e4a242fa5327504646a1f291aa80569e4dc9f4d5d14de79de15f78b3963834398349fa9d5bb63324aecbcc4db296290b2893673ccb2bd498b82117
+DIST marble-17.08.3.tar.xz 52280688 BLAKE2B 915e7358d1dcbe25cf480a6c4e602a4bbdb866cab1391469823c9e910ba8165ab408e0d159a804230ca55e7bc7e42caa890a8c01d0d2182a9dbd41b94d430ee3 SHA512 9991dc9137e63462ae7d6086063d07d6012a22c4dfa137209517010db1f71ea5c7a494600d251f63b73a54943fbcfa237f1fdc749442dadd399a5717162f5e1d
+DIST marble-17.12.0.tar.xz 52352880 BLAKE2B b95bd0949cd5170f94ba3aae3adbf7b439e14b912de107a1f4ce8fb70dbcec7e4a472262aaa237f254b3edf86a18a2d02b0eebfac0528bc78d002cba03750d6f SHA512 f899387d5e5ab72e8b76970fca19e73cdb7101c756b03f7aa8253a270f130c38eac8b4e4d145869d16cf7fc25c954be0403b4f3df2751f1a73da1bd9d2de0473
 EBUILD marble-17.08.3.ebuild 2246 BLAKE2B db0c96ada76ee661bd3f127188e9ea89a2a5c672f234b02eecf94da24442f1105ae7cee6aa6403566cea8add3f0d4e40e9fda89a4d4ace5b753636213b6fb0f2 SHA512 7317d5a669c65df1c9acaa2a7219ef53c6299854f7376989626f5efe48a6fea3e700173e69a24f64df946ca05069d6a538307a1548d81eaa5c85e2c408e84f11
+EBUILD marble-17.12.0.ebuild 2248 BLAKE2B 9d72cb86f1924c74ac9d78193f619f488babfe5f8712f1543a88017ca6d8f635eaec5d4ea93ea87024204f22ae723d136bf19a50a9f2deff7e67465eae692bd0 SHA512 d5d90f9125e0016ee7c95e47226bc6c124e9b32bea89c7b9d503bfe638f625abd26f64d26e6448f4be4fef3c367dcbad6245569da0dd970c72b67111bb56d749
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-17.12.0.ebuild b/kde-apps/marble/marble-17.12.0.ebuild
new file mode 100644
index 000000000000..10601eab2609
--- /dev/null
+++ b/kde-apps/marble/marble-17.12.0.ebuild
@@ -0,0 +1,86 @@
+# 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 +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
+}