gentoo resync : 12.10.2017

2 files changed, 88 insertions, 2 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index f1295d6eae60..37510fbbd088 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,7 +1,7 @@
 DIST marble-17.04.3.tar.xz 52304300 SHA256 83d63f3a6cd25231ba7a6245f6ef33d28abfb869bacd70a2576c46a6f9b39056 SHA512 855dc84ce0518e2dced7d3a288ffd5b74453118ca88b6995f4de431d5074a613254582e4a397a47eadd04bc7e9d200f598736a497f4529d114088f9db93fd198 WHIRLPOOL 5e6f5ef7661bd7b4b29cb2ad50e5ababc19da57fe5d0ed7fd38ee79f04360dadffe75ca87da509379d5b5e7f70f970adcb013c80472dec0da01f30f5b67302d3
-DIST marble-17.08.1.tar.xz 52275472 SHA256 a8285ec2b1fb055f47bb7ddb86114077760887353d1a4f98b2500235ea199fca SHA512 5d3a81e227490dc5a4bc24010460f1fd9f4367b8ed8b6fdbcd1bed1b5cc421a009e3c29a563847488019578aa921fb3eaa82c9e3bb913901ddda1e8cedb7530b WHIRLPOOL 923ec5b693210b208520a6fc931113b004224831dd1d3891690d4d34542095977ff960e3aae471b4675afbe1caad76f8757a9b76152a1ed73bbbd3c409e0ef88
+DIST marble-17.08.2.tar.xz 52275600 SHA256 d5a55226e08e0e4780632d39aaa6f197b4499940f23a073ab55353f75cad70fb SHA512 48575edc7a2c8cc74cbe7c38152afbf5e83fc0602365d51468d9c94a944ba5dacec4f1c0ce4eae9af1d07c38c1d8c37666508ece814a0150c09a52350cadde13 WHIRLPOOL 08316b380cb2bbe7340208b36609d4d2a748af1bc4c98fd46f7b2efbf236961ab8abd7ef8809e642e96f1205168649e1082afc5637e160cb02a33d58fc07953a
 EBUILD marble-17.04.3.ebuild 2246 SHA256 5db6f6ab4a1e368f8b5ec6506545c7e9e01a3a356ab48d9d159d354560ec4af1 SHA512 d5f63193f935673d855ee1eaff1e326f517e92d313e02ac7f93ec3e42337ca053eb5823c1aa668c0a35e961c0450a9a450a967daf2606d17049ab9c201baa8c7 WHIRLPOOL 628e13b45ae34bc446479f7f230d91684effd28b588eaedb004874e2a5666ada5f210569b408bf1b243b7b0ae8d1cd7825ed6e08fac9a2c316076c48f47a0a10
-EBUILD marble-17.08.1.ebuild 2248 SHA256 0f1c924e14b52ccbb71b7878474fa30d8acb9733bf0266a0406e993afd7e8537 SHA512 c216c773c42d7f5db87dc1515f97bc0f4a8067c668f8e1163882492e58bf2780e7b1cf1dc2c2ff46052c4e8f39bc0318c64a11aca2ca8e98cd7e44957750e5a4 WHIRLPOOL 0e9dd714d4732d6f027fd6caae68e6485a8802f4b908f8152a04acff87c79fb9ab862de7370de79dab9f8e0af7dc44cecbce28aed64e13d8f3310a1bcaabc231
+EBUILD marble-17.08.2.ebuild 2248 SHA256 222cfeed8e8a9d52bbdba23329afc29c6dd3a708e2aa8ad354eec71a052e40f9 SHA512 d5d90f9125e0016ee7c95e47226bc6c124e9b32bea89c7b9d503bfe638f625abd26f64d26e6448f4be4fef3c367dcbad6245569da0dd970c72b67111bb56d749 WHIRLPOOL b38ed264c1642504dbd890bdbde916ba01bd2b0e497ee5f23dff7acada90bef669925d2b1f1edcac2379b439e89e830fe4b7abcfc550df03c75cd7a312eb3e2a
 MISC ChangeLog 7769 SHA256 a5d6bb597242020b59f4d5a10a0695af5b3440f17ad34f1d63137f264a805b84 SHA512 7fd489fbc4e95e835834f886b1aca13f40e1b625571e38cce56fee384d806d6cc1d2893c0f2142d955f99ccdef2c4df96ebfd2d21efbd5f1118088b401e94d76 WHIRLPOOL f1fe7596f1004ca534b91959b5f6dfe421e8f21090f6122eeefa9f321a55760cdf27c46a90c4faba0cfbde5bd45b661040b02ce280d43b587baa5641f16016c5
 MISC ChangeLog-2015 32828 SHA256 8f7cb4c3e17b3385eb5e10164d824f4038055532ad8274fc0ef9d3ca6bec90e4 SHA512 0411443567b12a4f707908670b5a5ebdbaeeb98af31ce356009c84eaa9bc14cb8126ecd980cdb4263ab7ce767c8b053188cad87bb584a935764618553e6c57c1 WHIRLPOOL 8de26901940b46d8f2afb7eccf4cca36a1e17baa406df84bf2738983c7dda1f3c3c4aefba9417191435818c142583158f37a892ccd7d436fa5b67f90c42a0671
 MISC metadata.xml 686 SHA256 8e89448f39a4bdfca2ba2becd298717396aadde5396aa167e457bc971227a400 SHA512 c9444f2d64c2ad203260f4948463f9462d2f69b3ef09d2eae5464a3bd118f19d8fdd73a1c91a9bc072ee0b7e6304872e610d73bcaa8bd50d4b6a1ea18b844cc1 WHIRLPOOL 66acdae7f9e7fdbc4927a99750a8699af23177b84892546ce3b0cde0c899f15e990e42bef058eada6eff30dcf6db50eeb9a91e9792ed755449f700e48c6aa517
diff --git a/kde-apps/marble/marble-17.08.2.ebuild b/kde-apps/marble/marble-17.08.2.ebuild
new file mode 100644
index 000000000000..10601eab2609
--- /dev/null
+++ b/kde-apps/marble/marble-17.08.2.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
+}