From 6d691ad5b6239929063441bbd14c489e92e7396e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Mar 2021 09:25:57 +0000 Subject: gentoo resync : 05.03.2021 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-20.12.2.ebuild | 98 ----------------------------------- kde-apps/marble/marble-20.12.3.ebuild | 98 +++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 kde-apps/marble/marble-20.12.2.ebuild create mode 100644 kde-apps/marble/marble-20.12.3.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 651bc316084d..b83a19a3468e 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ DIST marble-20.08.3.tar.xz 52191936 BLAKE2B a7990d76d6df1333b5beac62d82e4e10ad55fa2513f579d4d169bd24e54e8d2f4132847d9544dcbeb1205b4bedcd193792332434c64c97cf9eb1180f6bad9b05 SHA512 0bffe97a14fe74300eef8c94a3d14217abba6602fef86e07c799d52970e37047576defd4baeaebe9171ff3915f35c0a64ca2e46d233fde834c8bd5dc3f15ebce -DIST marble-20.12.2.tar.xz 52239212 BLAKE2B b13ba6a2d4c3cbf11338471b271d327795ab7e759178ae7da815270f71d0b5416b217d4b5521e960e2ad25e424315bfa78b22ef1e8eee830e1f2259a3a231964 SHA512 cb4b86bf9082be1fe097e24e13a8965af709eec5f5de3c844330af3137fe4be12b79729ffb621b08c8ab6e202739c3409d7bbd635a7cc0d4bf509d9a3b5a82af +DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a EBUILD marble-20.08.3.ebuild 2621 BLAKE2B 712cb3696459b0e58b6d28fc8048ec3b3b848284ef1057d831af3e2e82b2b52505fba68b35dda3a2ad8baa9c82103cc21534d109131e78c3172a00a96b5e3f40 SHA512 ade08fba6df6222d95cb99694085dd20084c71a4f66c6b2174a1f1f23a4e1bc93ce82bf48c78ff11d875ea3cb9c39d451fbd242a1de6cc6201696b6c2dbd7f61 -EBUILD marble-20.12.2.ebuild 2700 BLAKE2B c8045629292170bb265a024e6463307568a42c9ba2d0124b50b893feb7aefb2caa3aab2bafb53f0a182825bb10f29720231e44e21593809fb0936913aefce2ec SHA512 003af6b8444574e363c4d52204bad4beabadad639e92be929a1e813f6dcb9cc21371800113a8ab8f59d9829b217480d0c1e566ff6b680866e03a8782cb445555 +EBUILD marble-20.12.3.ebuild 2700 BLAKE2B c8045629292170bb265a024e6463307568a42c9ba2d0124b50b893feb7aefb2caa3aab2bafb53f0a182825bb10f29720231e44e21593809fb0936913aefce2ec SHA512 003af6b8444574e363c4d52204bad4beabadad639e92be929a1e813f6dcb9cc21371800113a8ab8f59d9829b217480d0c1e566ff6b680866e03a8782cb445555 MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703 diff --git a/kde-apps/marble/marble-20.12.2.ebuild b/kde-apps/marble/marble-20.12.2.ebuild deleted file mode 100644 index d85bf874ae19..000000000000 --- a/kde-apps/marble/marble-20.12.2.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-20.12.3.ebuild b/kde-apps/marble/marble-20.12.3.ebuild new file mode 100644 index 000000000000..d85bf874ae19 --- /dev/null +++ b/kde-apps/marble/marble-20.12.3.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.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 +} -- cgit v1.2.3