From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-19.04.1.ebuild | 87 ----------------------------------- kde-apps/marble/marble-19.04.2.ebuild | 87 +++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 kde-apps/marble/marble-19.04.1.ebuild create mode 100644 kde-apps/marble/marble-19.04.2.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 684913b79376..413ff37bf4c5 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ DIST marble-18.12.3.tar.xz 52419848 BLAKE2B fb8732807ef71201e41d8548feb65aa874cd06256e522dd0eb41460190e401f86842aaadd747123fac48050545dd79cc4a80cbdb20a35852d5560f20b332312f SHA512 af6147a288021a3056892bae8d9c83b6ecfc581c7237d3fa04a579e4461779a5dacb0e22b21f0e8af5032f75d827a56d197369c85193f0188140ac361777a851 -DIST marble-19.04.1.tar.xz 52186700 BLAKE2B d5af932265277a1342b82f4e5b77b6a4641c57c3f46291482e9701f836155df669e8f2d87accbaf19bf1f3558de8a2bc09db88d5eea2d377ee2911728c1e5451 SHA512 f1a0bbd99b17053e4a3d4555ff38ab74b9f6425e38383a55d529772cb9cf78981af0b560ded3e36731ded686165b6b8e09cf7d8e98c6e5f3c04a9a89294cee36 +DIST marble-19.04.2.tar.xz 52173972 BLAKE2B 5b460c902b17bf8d152891e74a1ff7bcc6cb6a3a744f09aa05c0933f55cabee2a71e64c98bb0f1e28aa032ddef22d5d8413c29e6ca1a817528d1af002d408aa7 SHA512 7673c8f361001bd3f1dc32ea6fce62a399ad5d2ae454e562758eb5fc154a3fc46c7743cff5bbc72f77fb13adcbd1766f1a61777a4514702324193cfda88d988e EBUILD marble-18.12.3.ebuild 2327 BLAKE2B 57e8b49ed6a9688fc87b60f5d07bc92c99d8c8e5252eb3edb346595be6d28d1b923bd116e2037938297850b52d18df229a5fa270a7c2380dd5fcc59543a741e5 SHA512 cbd6c98ca61dbf6288eafbaec5bd3b87725d92834e81e9e7cfbf1a5accd9d39a752326676810a1a7a7681c8b7d1bc5d3ef28d2c18eb0c948a70fbfa900d97797 -EBUILD marble-19.04.1.ebuild 2329 BLAKE2B 5dbe9dd58fb727489908c7b0120e9d29281f421053cf3e15247c0d150c2470340e21620c8ec04c18bba230f9581f5cb6eab6287db825962fabbf1f8401930be9 SHA512 502d157a94648d8bf255c1b33055a2653fe284696efeb137fadaeb3520525df81e48f4043c3405dc6273a98686f2c4110bcec0d816f7357b5353364d38bfd573 +EBUILD marble-19.04.2.ebuild 2329 BLAKE2B 5dbe9dd58fb727489908c7b0120e9d29281f421053cf3e15247c0d150c2470340e21620c8ec04c18bba230f9581f5cb6eab6287db825962fabbf1f8401930be9 SHA512 502d157a94648d8bf255c1b33055a2653fe284696efeb137fadaeb3520525df81e48f4043c3405dc6273a98686f2c4110bcec0d816f7357b5353364d38bfd573 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 diff --git a/kde-apps/marble/marble-19.04.1.ebuild b/kde-apps/marble/marble-19.04.1.ebuild deleted file mode 100644 index 97e8b9a372c9..000000000000 --- a/kde-apps/marble/marble-19.04.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -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 ~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? ( $(add_qt_dep linguist-tools) ) -" -DEPEND=" - $(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:= ) - webengine? ( $(add_qt_dep qtwebengine 'widgets') ) -" -RDEPEND="${DEPEND}" - -# 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 webengine Qt5WebEngine) - $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - kde5_src_configure -} diff --git a/kde-apps/marble/marble-19.04.2.ebuild b/kde-apps/marble/marble-19.04.2.ebuild new file mode 100644 index 000000000000..97e8b9a372c9 --- /dev/null +++ b/kde-apps/marble/marble-19.04.2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt +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 ~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? ( $(add_qt_dep linguist-tools) ) +" +DEPEND=" + $(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:= ) + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) +" +RDEPEND="${DEPEND}" + +# 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 webengine Qt5WebEngine) + $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets) + -DWITH_libwlocate=OFF + # bug 608890 + -DKDE_INSTALL_CONFDIR="/etc/xdg" + ) + kde5_src_configure +} -- cgit v1.2.3