summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-04-09 11:50:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-04-17 12:43:00 +0200
commit08d54a13dae623d073c3199e96c5393a3102f076 (patch)
tree163ae140bf2820a036b3dd78d0fe370cf6a3e52e /kde-apps/marble
parentkde-frameworks/kfilemetadata: Drop slot 4 (diff)
downloadgentoo-08d54a13dae623d073c3199e96c5393a3102f076.tar.gz
gentoo-08d54a13dae623d073c3199e96c5393a3102f076.tar.bz2
gentoo-08d54a13dae623d073c3199e96c5393a3102f076.zip
kde-apps: Remove KDE Applications 16.08.3
Some exceptions with reverse-dependencies remain. Closes: https://github.com/gentoo/gentoo/pull/4433
Diffstat (limited to 'kde-apps/marble')
-rw-r--r--kde-apps/marble/Manifest1
-rw-r--r--kde-apps/marble/files/marble-16.08.3-deps.patch42
-rw-r--r--kde-apps/marble/marble-16.08.3-r1.ebuild85
3 files changed, 0 insertions, 128 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index e225872e94c1..3563a4ed5f4d 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,2 +1 @@
-DIST marble-16.08.3.tar.xz 23144576 SHA256 1c2d3263a55cde6511b703548399f48a1d9d0c33cb57283cc304d07189e8aa53 SHA512 ff1f2957266a54a0d315305478fdd0dc51e0a398746050efbb3ecc2db5698996693bd6c4d810f0dcf73348e4d2c1535c83a56bfffa3db7ccc015fea6c917e458 WHIRLPOOL a33b509310c5ffd96d1ca022ea348519d5d5a5d98098a3140fcd358cb362cc7cfdf97ad8809d30c844bb5321b1e707f8fff961aa250f0e16699c611566f0a50b
DIST marble-16.12.3.tar.xz 24403808 SHA256 522006e0042fb4bf405a7bc90e015fa6e8fb863652ea81b64f53061c6b9ebe21 SHA512 58329b78f84640920bcaccede596728030027b26093dd979c347f440cd2908902c989bba09eced8811bc2f13febb8e41154570986aa323cfdbf73035654ce5f4 WHIRLPOOL 3b01e745cb66e6baf288355231ecc7376f6f3e0b75252090045817f53931e5a68c70d63230c41bafa955042890475bf8167db0bc7f66840d4b90992025eda9d2
diff --git a/kde-apps/marble/files/marble-16.08.3-deps.patch b/kde-apps/marble/files/marble-16.08.3-deps.patch
deleted file mode 100644
index 98d5225357e5..000000000000
--- a/kde-apps/marble/files/marble-16.08.3-deps.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 670a24a87adab6d7b76de60ce67c8eef8433c24c
-Author: Friedrich W. H. Kossebau <kossebau@kde.org>
-Date: Sat Dec 3 20:33:14 2016 +0100
-
- Remove dep on Qt5::Location, not used
-
-diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt
---- a/src/plugins/positionprovider/CMakeLists.txt
-+++ b/src/plugins/positionprovider/CMakeLists.txt
-@@ -8,17 +8,13 @@ ENDIF(LIBGPS_FOUND)
- ADD_SUBDIRECTORY( gpsd )
- ENDIF(LIBGPS_FOUND)
-
--macro_optional_find_package(Qt5Location ${REQUIRED_QT_VERSION})
- macro_optional_find_package(Qt5Positioning ${REQUIRED_QT_VERSION})
- marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" )
- marble_set_package_properties( Qt5Positioning PROPERTIES URL "http://qt.digia.com/" )
--marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "Required for QtLocation to work" )
--marble_set_package_properties( Qt5Location PROPERTIES DESCRIPTION "geographical support for position and map use" )
--marble_set_package_properties( Qt5Location PROPERTIES URL "http://qt.digia.com/" )
--marble_set_package_properties( Qt5Location PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning and QtLocation" )
--IF(Qt5Location_FOUND)
-+marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" )
-+if(Qt5Positioning_FOUND)
- ADD_SUBDIRECTORY( qtpositioning )
--ENDIF(Qt5Location_FOUND)
-+endif()
-
-
- macro_optional_find_package(libwlocate)
-diff --git a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
-index 9079443..e0179bf 100644
---- a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
-+++ b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
-@@ -9,6 +9,6 @@ SET( qtpositioning_SRCS
- QtPositioningPositionProviderPlugin.cpp
- )
-
--SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Location Qt5::Positioning )
-+SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Positioning )
-
- MARBLE_ADD_PLUGIN( QtPositioningPositionProviderPlugin ${qtpositioning_SRCS} )
diff --git a/kde-apps/marble/marble-16.08.3-r1.ebuild b/kde-apps/marble/marble-16.08.3-r1.ebuild
deleted file mode 100644
index 5383309da0ae..000000000000
--- a/kde-apps/marble/marble-16.08.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-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 ~arm x86 ~amd64-linux ~x86-linux"
-
-IUSE="aprs +dbus designer gps +kde 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 qtscript)
- $(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 )
-"
-
-# bug 588320
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" ) # from 16.12 branch
-
-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_Phonon=$(usex phonon)
- -DWITH_libshp=$(usex shapefile)
- $(cmake-utils_use_find_package webkit Qt5WebKit)
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
- -DWITH_libwlocate=OFF
- )
- kde5_src_configure
-}