From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- kde-apps/marble/Manifest | 9 +- .../marble/files/marble-20.04.2-missing-dep.patch | 43 --------- kde-apps/marble/marble-19.12.3.ebuild | 96 -------------------- kde-apps/marble/marble-20.04.2-r1.ebuild | 101 --------------------- kde-apps/marble/marble-20.04.3.ebuild | 99 ++++++++++++++++++++ kde-apps/marble/marble-20.08.0.ebuild | 99 ++++++++++++++++++++ 6 files changed, 202 insertions(+), 245 deletions(-) delete mode 100644 kde-apps/marble/files/marble-20.04.2-missing-dep.patch delete mode 100644 kde-apps/marble/marble-19.12.3.ebuild delete mode 100644 kde-apps/marble/marble-20.04.2-r1.ebuild create mode 100644 kde-apps/marble/marble-20.04.3.ebuild create mode 100644 kde-apps/marble/marble-20.08.0.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 6f929a52d5ab..beb5f7cb7982 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,6 +1,5 @@ -AUX marble-20.04.2-missing-dep.patch 1418 BLAKE2B bcca0c09e82d43aaad47935e41115d46c3d03254f6b252f1ef39be8d1b92d8b162da69741bfab0681eb0411543bbb55674482463e59a16d4d03cc33731b64677 SHA512 3afb8de9ccbef619512628bc12a73cbc5d0a2050c6db09a3177c1880734b033ad3b42fc4c4ce6f0f54a782fdbc71717d23c80b91f39732093f597b5dd88fd18c -DIST marble-19.12.3.tar.xz 52306988 BLAKE2B 728b731b066c8fbec442059dbbe5697d610218b7733f365a655462f05d49f84497c6e7c4425929d2972201680d6b705f6a77652953cba937f55218d430a5bc1f SHA512 e6b693b15be53f590bbfbd97648113bad696339544350640699e890bc4f891c4a06215ee09f21cf4968dc8d2cb104c06f43380470145397fc5abc7daa0e02639 -DIST marble-20.04.2.tar.xz 52206460 BLAKE2B ad7f9a30a8c75b4978fa5f015c9bc38a6bd16c95f4f92a9fb73f5f0126cf11a4b985aafd249052aa141365c498549db2265f50a894b4b8a95944394340cbcf75 SHA512 44a0a6ad7aa77452482d86ffc88083ed1adc187b1ecb34dd5d5c211e6a692019cfa06579647a7943c423fdc911300e0efb8352de95da84ce9c27aeb4f1365b55 -EBUILD marble-19.12.3.ebuild 2650 BLAKE2B 74ea18fbbc9a91e4ace3fc87be077d3b76e8e3086df78878e978dfdaf947b1b189593d0c147fd60fdda7e36a85cd5f255c69122dd77ee8071c0453a428072b77 SHA512 cfaa829d737ed2a6bac80cf46b650bf253735bfecda213249fc239a11d0fdeb9759fcbdc452f49bf769a41961d6efb0486723c4f817d74810dace0e83e5808eb -EBUILD marble-20.04.2-r1.ebuild 2741 BLAKE2B 4329de8269d99c2679f884c617bead47f6ab5f1462bc4834a55e9c556c13b1d492a4d94041c0d92da1366fefb98d8eaf90d94f76dd1f094ed4820012dac57ce4 SHA512 1cd23a12aa0849ba464a846f6cc399e6c8bf2513fba2bd347bf33b961bbd3d2ec2fb6a0881aa57fc82f92c6e0ce2fe1290234b89ec9187720aff528709a2b2b4 +DIST marble-20.04.3.tar.xz 52200548 BLAKE2B 83388e292487dbbe10bde4f4d67337b8d8606df26fda3621640cf49a1a930b6cdb9357a96568fc33597f0ee2627a22a2f2920a7dad45bab1502e5a8869934de1 SHA512 5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd +DIST marble-20.08.0.tar.xz 52192524 BLAKE2B 4f5466b0d6ead3ab554aeee47852113355467a6b026bcc7b9e7f8759f064dda3003694580d3b15856964f4a29df09265be5467852d3f475ac83ddc25d751d430 SHA512 e7ef24184418cba674c37baf656562cac9fa8bb9afe623e9dd9cfabe7defdcdd2316c18e61eb2f89d0d43d4020b1005f28207db8b7b97b9ca207b985f0554fcf +EBUILD marble-20.04.3.ebuild 2688 BLAKE2B df187b207a1c62a2e479bab9cadb4a8841fc7860e212766831b121c8cf5a18d23e6dc2fd92cedc2ffbd339f31d5e308610b19e4975af6518b42b4d992e1bb25c SHA512 df2f3f8474b33830496f4244d414b8074929d9cbeb52430f500c1114be240d17b95025f3a8d0e4e5c85d4d709620b016c9b419faf740bc596045bd2ec4ca3c27 +EBUILD marble-20.08.0.ebuild 2691 BLAKE2B ca944be552eb107b8471526077505201d63ed580f6c201f9fc4033880f857c2f1ea35be8e3408d555f49a0e06dad0534bd31573f2fa2022f187d028c4baa485c SHA512 77676ba6a90cddb1e4e4c12c36934ad63cbd8127f48e9687d0f4adc8ccad3d9b8ce8cdd71305d4bd3935506fe4a20752c5d960a0e9e896337b657600a750aef9 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 diff --git a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch deleted file mode 100644 index f4f71bdf1ccb..000000000000 --- a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c062504a2864680fee9c81ea46e7613315de038a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 15 Jun 2020 11:24:32 +0200 -Subject: [PATCH] Add missing Qt5WebChannel dependency - -QWebChannel header is used in src/lib/marble/MarbleLegendBrowser.cpp -since commit b42ee5c8 but apparently not always implicitly included. - -Downstream report: https://bugs.gentoo.org/728234 - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 1 + - src/lib/marble/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 631a5b7d7..a3b2139dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,6 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android) - - set ( MARBLE_NO_WEBKITWIDGETS TRUE ) - else() -+ find_package(Qt5WebChannel ${REQUIRED_QT_VERSION}) - find_package(Qt5WebEngine ${REQUIRED_QT_VERSION}) - find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION}) - -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index e02c7d160..7d27be94b 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -395,6 +395,7 @@ target_link_libraries(marblewidget - if (NOT MARBLE_NO_WEBKITWIDGETS) - target_link_libraries(marblewidget - LINK_PUBLIC -+ Qt5::WebChannel - Qt5::WebEngineWidgets - Qt5::WebEngine - ) --- -2.27.0 - diff --git a/kde-apps/marble/marble-19.12.3.ebuild b/kde-apps/marble/marble-19.12.3.ebuild deleted file mode 100644 index 556f60c367e0..000000000000 --- a/kde-apps/marble/marble-19.12.3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="forceoptional" -KFMIN=5.63.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/$(ver_cut 1-2)" -KEYWORDS="amd64 arm64 x86" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" - -# FIXME (new package): libwlocate, WLAN-based geolocation -BDEPEND=" - aprs? ( dev-lang/perl ) - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - designer? ( >=dev-qt/designer-${QTMIN}:5 ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - phonon? ( media-libs/phonon[qt5(+)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) -" -RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT+=" test" - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_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_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi -} diff --git a/kde-apps/marble/marble-20.04.2-r1.ebuild b/kde-apps/marble/marble-20.04.2-r1.ebuild deleted file mode 100644 index 1e9c7aff9dbe..000000000000 --- a/kde-apps/marble/marble-20.04.2-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="forceoptional" -KFMIN=5.70.0 -QTMIN=5.14.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" - -# FIXME (new package): libwlocate, WLAN-based geolocation -BDEPEND=" - aprs? ( dev-lang/perl ) - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - designer? ( >=dev-qt/designer-${QTMIN}:5 ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - phonon? ( media-libs/phonon[qt5(+)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - ) -" -RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-missing-dep.patch" ) - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_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_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi -} diff --git a/kde-apps/marble/marble-20.04.3.ebuild b/kde-apps/marble/marble-20.04.3.ebuild new file mode 100644 index 000000000000..f6ee6bf963a8 --- /dev/null +++ b/kde-apps/marble/marble-20.04.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt +ECM_TEST="forceoptional" +KFMIN=5.70.0 +QTMIN=5.14.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" +HOMEPAGE="https://marble.kde.org/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5/$(ver_cut 1-2)" +KEYWORDS="amd64 arm64 x86" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" + +# FIXME (new package): libwlocate, WLAN-based geolocation +BDEPEND=" + aprs? ( dev-lang/perl ) + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + sys-libs/zlib + aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) + designer? ( >=dev-qt/designer-${QTMIN}:5 ) + geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + kde? ( + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + ) + phonon? ( media-libs/phonon[qt5(+)] ) + shapefile? ( sci-libs/shapelib:= ) + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + ) +" +RDEPEND="${DEPEND}" + +# bug 588320 +RESTRICT+=" test" + +src_prepare() { + ecm_src_prepare + + rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" + + if use kde; then + sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package aprs Perl) + $(cmake_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_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DWITH_libwlocate=OFF + # bug 608890 + -DKDE_INSTALL_CONFDIR="/etc/xdg" + ) + if use kde; then + ecm_src_configure + else + cmake_src_configure + fi +} diff --git a/kde-apps/marble/marble-20.08.0.ebuild b/kde-apps/marble/marble-20.08.0.ebuild new file mode 100644 index 000000000000..27ea2b8a1a8b --- /dev/null +++ b/kde-apps/marble/marble-20.08.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt +ECM_TEST="forceoptional" +KFMIN=5.72.0 +QTMIN=5.14.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" +HOMEPAGE="https://marble.kde.org/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" + +# FIXME (new package): libwlocate, WLAN-based geolocation +BDEPEND=" + aprs? ( dev-lang/perl ) + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + sys-libs/zlib + aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) + dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) + designer? ( >=dev-qt/designer-${QTMIN}:5 ) + geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + kde? ( + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + ) + phonon? ( media-libs/phonon[qt5(+)] ) + shapefile? ( sci-libs/shapelib:= ) + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + ) +" +RDEPEND="${DEPEND}" + +# bug 588320 +RESTRICT+=" test" + +src_prepare() { + ecm_src_prepare + + rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" + + if use kde; then + sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package aprs Perl) + $(cmake_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_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DWITH_libwlocate=OFF + # bug 608890 + -DKDE_INSTALL_CONFDIR="/etc/xdg" + ) + if use kde; then + ecm_src_configure + else + cmake_src_configure + fi +} -- cgit v1.2.3