From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-20.12.3.ebuild | 98 ----------------------------------- kde-apps/marble/marble-21.08.0.ebuild | 98 +++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 kde-apps/marble/marble-20.12.3.ebuild create mode 100644 kde-apps/marble/marble-21.08.0.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 1c86c2eba4e4..306a811ca6cc 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ -DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a DIST marble-21.04.3.tar.xz 52386284 BLAKE2B a23a326e7c181046f03c896fb49d2d39156bce060cdf643d92e98a1d2fc44000a7e1367dbe1e00a939cf78a9d1b07d47152735f3e528126dbda85594f1e5b5b9 SHA512 db926120fd275e0803cf176137c32463de784dd54f16b1d2d7e20e6ae750e6d6b373ef2fd51d1e31a0bee219d8e7c278ede8e83bdbe753edd32d138098855b8c -EBUILD marble-20.12.3.ebuild 2697 BLAKE2B 59bac185fead02c46f56d402b2283cb0e32afba0add2c78f9836949490093d662093c98b5b42cae28567ee2fe09a0d24a8c2e1cc928827c250b606eccd41f01e SHA512 2cb9e241a4ffb1402a6dd7a5046e2a636bc5b29489e24439c72be94e03b4959fe4482e211ecc5267a6bfab581664760132fdca544c570e67ba13da6b5f2690ce +DIST marble-21.08.0.tar.xz 52396820 BLAKE2B 3c91da5f57f7c81fb9f003bf3fe145a7bcbca32128d959cefa4e20bb1a17d6850c4243917b9002748dbf5b30f94983d93fc68fd5c2884db73593d76b74273659 SHA512 dd9735a3eefee4c3ff7508524308ddc67152b38c656e858506e48e45e0033678d789bcbe36fc2cca928265843cf3d9c062139402dff72abd21497fd593378979 EBUILD marble-21.04.3.ebuild 2697 BLAKE2B 08ed258df751ba31addf57b0afd7f9aa80c52feda743a7087da62fc32b2901522f0acde5b845f4134f6dc21facd506a032b82493c650e6344ccef4ebab302abe SHA512 fb56f8344acf6b5c5c34dda2473fe3ce5a0ed8e8e6f9de9a7baf159266fd04b6cf794310770f9c7ed3b8d1ea60fb196465d0ba4307c868ad04897abd44c70195 +EBUILD marble-21.08.0.ebuild 2700 BLAKE2B 93ab512c4d4bb8b46af6536a49e21f8ca204d5c8e3fbde86898221788c968c7b2cbeafc4283926a74ccdb9836b94d58f3f1aba470d10281ebefa26b64a15c5b2 SHA512 4b3b0ac9dc64ee22257591392657ad7cfb93e3be7f5258d177c50610feab0d352663c1c8ff90c6a2f0845bb2ce9435fe421bae54cc24c7a0518052d05864f715 MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703 diff --git a/kde-apps/marble/marble-20.12.3.ebuild b/kde-apps/marble/marble-20.12.3.ebuild deleted file mode 100644 index 5cedda6983ac..000000000000 --- a/kde-apps/marble/marble-20.12.3.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 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.75.0 -QTMIN=5.15.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 +geolocation gps +kde nls +pbf phonon 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 - ) - pbf? ( dev-libs/protobuf:= ) - phonon? ( >=media-libs/phonon-4.11.0 ) - 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" - - use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt -} - -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) - $(cmake_use_find_package pbf Protobuf) - -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-21.08.0.ebuild b/kde-apps/marble/marble-21.08.0.ebuild new file mode 100644 index 000000000000..2996c5c387be --- /dev/null +++ b/kde-apps/marble/marble-21.08.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 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.84.0 +QTMIN=5.15.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 +geolocation gps +kde nls +pbf phonon 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 + ) + pbf? ( dev-libs/protobuf:= ) + phonon? ( >=media-libs/phonon-4.11.0 ) + 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" + + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt +} + +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) + $(cmake_use_find_package pbf Protobuf) + -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