From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- kde-apps/marble/Manifest | 6 +- kde-apps/marble/marble-19.04.3.ebuild | 87 ----------------------------- kde-apps/marble/marble-19.08.3-r1.ebuild | 2 +- kde-apps/marble/marble-19.12.0.ebuild | 96 ++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 91 deletions(-) delete mode 100644 kde-apps/marble/marble-19.04.3.ebuild create mode 100644 kde-apps/marble/marble-19.12.0.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 86c29312b243..93933c78c544 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ -DIST marble-19.04.3.tar.xz 52188608 BLAKE2B 446078cdcff447e6e15b5be62a6169ba1a227fe189d4ff61cccc9b29a6fbf2fe500a57774f117759dd9a5371329e510fe862e68ce110e5c567108af30104d082 SHA512 4839ff6466accc920507ba032e7dea45a4fd22b6b93ca2f8d15526f0c8490f86271af0f109232f6f87dd00e090295b4ff17ec17b4592b90f13f26ce08fb2f4f4 DIST marble-19.08.3.tar.xz 52406676 BLAKE2B c4836b451d0a13cf5de9f736063c7df9e093fa7f6f949aad35fb8f70f80a23c320d34beca5499f9c3bd2e4d43ab26149d6706b998a02bd20ec6088da4ddd0b56 SHA512 7c17b3015ed16d169f7bc2c2c633527a33818495b4894a571b0880011539f9c73eb787ff9705641ff1e4a58ec28418e6a495d6b216bd4807e407eb345cd4dc46 -EBUILD marble-19.04.3.ebuild 2326 BLAKE2B a80c94ee3d720d4ea6847420428d38ba3da4945d0a3a6fb4ff2de40b4dd2fe0cbcb97fd1c38f43a37e063449f450d42b3f045c5645c60899d11e0752b21af73b SHA512 13e84eaefe0a1e918ceb0c7ed8a7af6f3521d49c655ea6844bd9f5c2685e83f5dc8e5f93dd18985fbf8c9eb8310971d9b1167bb3ac484659959c01b575afd1b9 -EBUILD marble-19.08.3-r1.ebuild 2683 BLAKE2B 1178336b2abd0cd969b20be93b0b7829cd99ba3a7cda81408ff9556cfe5e4f5fe427bca7f46364500f99a9df9ad1a8f9d25a4c2a1709aad8f491cdddf4c040cd SHA512 fb7312a34bb984adc5db3b45bd947d5a8489f0508219a81a0bb1c6134a70548f0ea8904e465c75646c13dc37d01680a02b1cbd8d86c4cd163978d52e5e6b6ad6 +DIST marble-19.12.0.tar.xz 52194536 BLAKE2B f472d9a0708a9cfcf7f494d51d7b2571f0f4f24da119b87f9cf9960098eb00b3b546bf70858b405098facb7cea8b3d24dd15d138b024446119da5815bd4ad5c5 SHA512 755bae04f95cd28b5e0f8eb9f2819cf1a45cab88fce1da1cc190668669d95d786d6c8ec284bcc1f00522822d308db7820b12d1781436536b4179b14d0249f159 +EBUILD marble-19.08.3-r1.ebuild 2680 BLAKE2B ff456d10f0e876e985ad521779850f02e2dae2ca9142d63f69e0d57aba8c79f470135af1cb10abadb52665cba20573d0e6726dded6f4ddf0f68e48cf96933c20 SHA512 0a2963def2e2db2f07e98b6688ea001b53630aa88d0d7f4c601b50f2f4ae7600b0f84215373aa9279485b8cb4ad278c8d4b83d04ac7a09bfc71cb6ee15e43217 +EBUILD marble-19.12.0.ebuild 2659 BLAKE2B cfcf53176fc7dc2bf050e199d3836163354672d6c056d6017cb39cbf7607c4d6203e02bf10cac288787c84353f97d9757a454cd868349dafeb7e2cb5a0a2ddf9 SHA512 5711e06294989f5ee59492b319cf52054d707fdff4d33810ff74687dca80b6c61e2c3b22c5d316d25e08fd961342b49472a871fd133f4a05391d18aca24e7200 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 diff --git a/kde-apps/marble/marble-19.04.3.ebuild b/kde-apps/marble/marble-19.04.3.ebuild deleted file mode 100644 index 5701197f67d2..000000000000 --- a/kde-apps/marble/marble-19.04.3.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.08.3-r1.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild index bc9f779ba6e1..4932a8f01b41 100644 --- a/kde-apps/marble/marble-19.08.3-r1.ebuild +++ b/kde-apps/marble/marble-19.08.3-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation diff --git a/kde-apps/marble/marble-19.12.0.ebuild b/kde-apps/marble/marble-19.12.0.ebuild new file mode 100644 index 000000000000..da6668a7e817 --- /dev/null +++ b/kde-apps/marble/marble-19.12.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2019 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-utils_src_configure + fi +} -- cgit v1.2.3