[gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/

[Johannes Huber]

commit:     6e0ca8901f16cd2a1ce5bcdd76a2fd3715ede6e9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 22:03:39 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 22:05:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0ca890

kde-apps/marble: Drop slot 4

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/marble/Manifest             |  1 -
 kde-apps/marble/marble-4.14.3.ebuild | 92 ------------------------------------
 kde-apps/marble/metadata.xml         |  2 -
 3 files changed, 95 deletions(-)

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 544be3d991..fabf07fa94 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,2 @@
 DIST marble-16.08.3.tar.xz 23144576 SHA256 1c2d3263a55cde6511b703548399f48a1d9d0c33cb57283cc304d07189e8aa53 SHA512 ff1f2957266a54a0d315305478fdd0dc51e0a398746050efbb3ecc2db5698996693bd6c4d810f0dcf73348e4d2c1535c83a56bfffa3db7ccc015fea6c917e458 WHIRLPOOL a33b509310c5ffd96d1ca022ea348519d5d5a5d98098a3140fcd358cb362cc7cfdf97ad8809d30c844bb5321b1e707f8fff961aa250f0e16699c611566f0a50b
 DIST marble-16.12.2.tar.xz 24401768 SHA256 e0c55d8c944ee6b53279307edd0087d607df4eb94404e8eb852f3940a150f35c SHA512 b181f02b20b000ff009b91aa191cfdf2c98d9255de4eb31cb369c61330fe53f1816fb33159a7fcfa36183e6f4ba5487c236762086a6847826d83e2657be3517c WHIRLPOOL 1cd6d09e22534744c264d861304571d222f480f5ad72b49c8d1e441a751ca167ceee679cab54d13b0f9db46f9ec68a472d852d8b62fd325c83ccd31e52433fa0
-DIST marble-4.14.3.tar.xz 19709200 SHA256 4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0 SHA512 eac20e22d4540e45cd6bb24440166eff88db90d400a7c6cd09f20bc0c49b39814aed0c1ae5f3fa2c591ea9a3a83b9bc16294e9706a38e640db35106dbcbdc1c8 WHIRLPOOL 58f053e419707e1b98f1e77f35da52e2838a54985f22a9827dbbb9191ba019137f842834ba92ff74afa0ad745bb525d6bc8ed30200ddaa6ee329292691a636b7

diff --git a/kde-apps/marble/marble-4.14.3.ebuild b/kde-apps/marble/marble-4.14.3.ebuild
deleted file mode 100644
index 8c4c316c56..0000000000
--- a/kde-apps/marble/marble-4.14.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-PYTHON_COMPAT=( python2_7 )
-WEBKIT_REQUIRED="always"
-inherit kde4-base python-single-r1
-
-DESCRIPTION="Generic geographical map widget"
-HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde phonon plasma python shapefile test zip"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# tests fail / segfault. Last checked for 4.9.0
-RESTRICT="test"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtdeclarative:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
-	designer-plugin? ( dev-qt/designer:4 )
-	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
-	kde? ( media-libs/phonon[qt4] )
-	phonon? ( media-libs/phonon[qt4] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
-		kde? ( $(add_kdeapps_dep pykde4 "${PYTHON_USEDEP}" ) )
-	)
-	shapefile? ( sci-libs/shapelib:= )
-	zip? ( dev-libs/quazip[qt4] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-qt/qttest:4 )
-"
-# the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 429346
-
-REQUIRED_USE="
-	plasma? ( kde )
-	python? ( kde )
-"
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use !kde QTONLY)
-		$(cmake-utils_use_with phonon)
-		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with shapefile libshp)
-		$(cmake-utils_use_with zip quazip)
-		-DBUILD_MARBLE_TESTS=OFF
-		-DWITH_liblocation=0
-		-DWITH_QextSerialPort=OFF
-	)
-
-	kde4-base_src_configure
-}
-
-src_test() {
-	if use kde; then
-		elog "Marble tests can only be run in the qt-only version"
-	else
-		local mycmakeargs=(
-			-DBUILD_MARBLE_TESTS=ON
-		)
-		kde4-base_src_test
-	fi
-}

diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 593f051156..e6bb9652ae 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -8,10 +8,8 @@
 	<use>
 		<flag name="aprs">Enable support for APRS data sources</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="designer-plugin">Enable designer plugin</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>
-		<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 	</use>
 </pkgmetadata>