From ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:00:32 +0100 Subject: gentoo resync : 13.10.2019 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-19.08.1.ebuild | 93 ----------------------------------- kde-apps/marble/marble-19.08.2.ebuild | 93 +++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 kde-apps/marble/marble-19.08.1.ebuild create mode 100644 kde-apps/marble/marble-19.08.2.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 332d57717ccb..ddb262395fa5 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.1.tar.xz 52300764 BLAKE2B 85697883f4b4f35e21b94c98889362aa3eb1cf392497d0e5eb82cfa93c61e9dd2e8b70f3e0e467d3b3b94da9e102a2a2416bbcdb519fc8da284dba16ab3f6db5 SHA512 4488ae8a99d999dd17ba6d73cb88b84dab509e70a027b87c22948602fb9b04bacedaa448ea1bd1234a076373bd3fa5ea65d5e738e7febecf7aa75f6c7a0c6890 +DIST marble-19.08.2.tar.xz 52327484 BLAKE2B 7f5f352fcec6467b6712526a7fa1af137f020b32c22e291d5a1145ea91cf54c0490cffcbcf28322fe158c5e0b2f996ecbcb116f122aa56d8812df709aa87283c SHA512 d18cfa59be6b360271afc711f61925a09dc4a304eaf41abbaeb6c7c6dc5aedff35eab658c47abba6fa5919940b6a7236292d38cc2e6eafe792c4188f090c1c61 EBUILD marble-19.04.3.ebuild 2326 BLAKE2B a80c94ee3d720d4ea6847420428d38ba3da4945d0a3a6fb4ff2de40b4dd2fe0cbcb97fd1c38f43a37e063449f450d42b3f045c5645c60899d11e0752b21af73b SHA512 13e84eaefe0a1e918ceb0c7ed8a7af6f3521d49c655ea6844bd9f5c2685e83f5dc8e5f93dd18985fbf8c9eb8310971d9b1167bb3ac484659959c01b575afd1b9 -EBUILD marble-19.08.1.ebuild 2462 BLAKE2B b9db98e0496295a579e548e5cb99ae832644b55f3da91b21c94be9524532e99fc29be9ce1908c2678a37d85c59f36eff1403d251d1172b385e83c8db01519036 SHA512 c9e2a5630a314482c472d409d4cb09c0e97b8bbc9194a127dca4ccd22cda89c1de9898be0c0bf5d4ef61bb4a0e2f81693727478b6f1d332bd42c9c46b50ff5e2 +EBUILD marble-19.08.2.ebuild 2462 BLAKE2B b9db98e0496295a579e548e5cb99ae832644b55f3da91b21c94be9524532e99fc29be9ce1908c2678a37d85c59f36eff1403d251d1172b385e83c8db01519036 SHA512 c9e2a5630a314482c472d409d4cb09c0e97b8bbc9194a127dca4ccd22cda89c1de9898be0c0bf5d4ef61bb4a0e2f81693727478b6f1d332bd42c9c46b50ff5e2 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 diff --git a/kde-apps/marble/marble-19.08.1.ebuild b/kde-apps/marble/marble-19.08.1.ebuild deleted file mode 100644 index 7253e190f875..000000000000 --- a/kde-apps/marble/marble-19.08.1.ebuild +++ /dev/null @@ -1,93 +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) - sys-libs/zlib - 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() { - kde5_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-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" - ) - if use kde; then - kde5_src_configure - else - cmake-utils_src_configure - fi -} diff --git a/kde-apps/marble/marble-19.08.2.ebuild b/kde-apps/marble/marble-19.08.2.ebuild new file mode 100644 index 000000000000..7253e190f875 --- /dev/null +++ b/kde-apps/marble/marble-19.08.2.ebuild @@ -0,0 +1,93 @@ +# 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) + sys-libs/zlib + 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() { + kde5_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-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" + ) + if use kde; then + kde5_src_configure + else + cmake-utils_src_configure + fi +} -- cgit v1.2.3