From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- kde-apps/marble/Manifest | 6 +-- kde-apps/marble/marble-21.08.3.ebuild | 98 ----------------------------------- kde-apps/marble/marble-21.12.3.ebuild | 2 +- kde-apps/marble/marble-22.04.0.ebuild | 98 +++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 kde-apps/marble/marble-21.08.3.ebuild create mode 100644 kde-apps/marble/marble-22.04.0.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index aebf1cddea65..81b045053ae4 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ -DIST marble-21.08.3.tar.xz 52421300 BLAKE2B 00745e94306c44baae71598a9920c6e416b796bdae2388987406a2c963359c85210742f0a86bad69a8c5b50b1c1e07f642facc93dc32406e62dcb0a8564bd3da SHA512 e989d1a6dec23c3a7d80e3a389c18283d5a0940e084f89f3f5ad4df3ef6a5fc7c3d7f479af91ed75853fd38c97cb4849d1626c261d8b9d954f9ad2e73954d693 DIST marble-21.12.3.tar.xz 53653508 BLAKE2B b7b8b61d9aaad81ee7c7981ae83acdbc6834a18dd1adc6e871724ecdcb5f1b49e8b1d66cb73487aaaa85846f1ca0a20f261c682d7fd02b937af57d41eb1ae378 SHA512 35e6ba79e8b324717e2b929743a7df1b43f0a9f32c704f8fd6ed834327e3b9b4281531ea9c7d8ff315544222b775e67fedb63d4bcd2cd81fa4ec4c8531016cde -EBUILD marble-21.08.3.ebuild 2702 BLAKE2B a5294e90c490cb138842105da2438fd6d3ab4fdfec3b13b40c4a1980474198a682a625923938cf6af34c2bc58c699dbfc69053f29a1cc8a1a2c2e353ca65f713 SHA512 5f32e633574cd573be7606f10502c71e0bd27f4d698c32ab23424450300af2eae94cfb011da85b5cce06dd2d21b6aa8d1d78d2541b080d5b56e431f146703125 -EBUILD marble-21.12.3.ebuild 2703 BLAKE2B 684a61b18b2f2473f042369a20a04cb73007f5ad6e43552919c1b481316f41ec804a94422e7e11e14a2029b3980582712275ec5cd19deb8f803766a181fe73a8 SHA512 4d2df65bd25b46036281bd07bd7f84abeeb4494e6df9803b83e40277a77d1959f2568db7a02278fb86bf21e5c9ae23cec11c2e8781a3764ac2f26f487ff5b36e +DIST marble-22.04.0.tar.xz 53675488 BLAKE2B 6c6a81bc5330250de48d28919053e30474c0476ca0db743ec4e460d4ba1b94d48cf0fd62dcd25cdb7b1291ecb275fc2878a93b802c289fd0549c205335c4255b SHA512 7e379ae58b3729c38217ea5f1133d726b22005b5b314bfd9477791913ce8f6ad62316074cdd0ded0a340c53b43c08782b124c9881348ce296520e006468cc43e +EBUILD marble-21.12.3.ebuild 2702 BLAKE2B c10ff9fea6aff24ebfed0b942b2ad942467b182656420b63ba5f4bc34e40206c6a887a4ee9a610b4ee37a272f3d3761cc73465400212213ef455a677a60eebb5 SHA512 6c8299421581258a49e884bed28c8c15b0c4c223c3cf4a22a6804f36e6fcf0e01e4487545b2c42525f8f068627f1f166404d1bbe87e983ead74685c3e9c66f98 +EBUILD marble-22.04.0.ebuild 2705 BLAKE2B e35d68a362e1eed94e15c7b2acbe4a994b9087df1ea03a16af0c5915aa809456da6027cc7d52d416e828dc219155e745a292dd6e4cd9b4d5e579673e60125b34 SHA512 4ac73ac7138884f7e356969024e9a36cae891189b96328a3496aca2c34497bb9275d05f9a8462dbc91552b30be8605859cc12618a2eaa8c64f6bd079a18d903d MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f diff --git a/kde-apps/marble/marble-21.08.3.ebuild b/kde-apps/marble/marble-21.08.3.ebuild deleted file mode 100644 index 6d3f891af293..000000000000 --- a/kde-apps/marble/marble-21.08.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=8 - -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 ~riscv 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.12.3.ebuild b/kde-apps/marble/marble-21.12.3.ebuild index f87828fbe293..221373e5eb96 100644 --- a/kde-apps/marble/marble-21.12.3.ebuild +++ b/kde-apps/marble/marble-21.12.3.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm64 ~riscv x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation diff --git a/kde-apps/marble/marble-22.04.0.ebuild b/kde-apps/marble/marble-22.04.0.ebuild new file mode 100644 index 000000000000..e00e3e299a30 --- /dev/null +++ b/kde-apps/marble/marble-22.04.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt +ECM_TEST="forceoptional" +KFMIN=5.92.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 ~riscv ~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