From 85b4dac8f08d6690d531e17fafe23f30ecb4064f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:24:29 +0100 Subject: gentoo resync : 14.07.2018 --- kde-apps/marble/Manifest | 4 +- kde-apps/marble/marble-18.04.2.ebuild | 86 ----------------------------------- kde-apps/marble/marble-18.04.3.ebuild | 86 +++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 kde-apps/marble/marble-18.04.2.ebuild create mode 100644 kde-apps/marble/marble-18.04.3.ebuild (limited to 'kde-apps/marble') diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 8842ce589349..fba0bca1369d 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,5 @@ DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064 -DIST marble-18.04.2.tar.xz 52434940 BLAKE2B dd2881da211d4111ecbc0950b9bc7220dc25da5f8a94c2bac42b92230498885526882df8dc2bc93cedab4420351ca2a73f295a142ec7d02db68d1ef28235b2fb SHA512 617941338c25b73e33fd9fdb943078544851d0e214c5cb4da6d32ba34630c0eb96165e37f3b14fe163be31720572411feba6bf6a6f24b15b469707e361b5d435 +DIST marble-18.04.3.tar.xz 52432816 BLAKE2B 103aadfd9e9e940b6c090f124f29464925c2e5f6adefbeac476ea5f8fc5c5eacf9af4171959f6a17d6d7fd5d287b2db8b246a08d0af045c5529f8eb92b566744 SHA512 26a29e6648516e99c6ae33a6253fa4922271a412eba14212af24cf33dcab8845533eb4c1a8fea11b61f20c0a5c34007ed9e0db8edb3590b01a01404ac4493704 EBUILD marble-17.12.3.ebuild 2246 BLAKE2B 3419d417193227f60d58e636982adef8c5cf42dc0ca0f136a3f349dc4b5f1211709f32eedd042faca10d333e905e879b6bfcaa562f2b97626711aced0007ecf3 SHA512 51b20869705dfcfc4a304da541c3a79eb7e3ae354f103080aded77d0929ca4e8541e3441c85f904be32409438411c4c532ef85ec6088bc3d49672851709a9644 -EBUILD marble-18.04.2.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60 +EBUILD marble-18.04.3.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef diff --git a/kde-apps/marble/marble-18.04.2.ebuild b/kde-apps/marble/marble-18.04.2.ebuild deleted file mode 100644 index 428bed2765e2..000000000000 --- a/kde-apps/marble/marble-18.04.2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -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 ~x86" - -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" - -# FIXME (new package): libwlocate, WLAN-based geolocation -RDEPEND=" - $(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:= ) - webkit? ( $(add_qt_dep qtwebkit) ) -" -DEPEND="${RDEPEND} - aprs? ( dev-lang/perl ) - nls? ( $(add_qt_dep linguist-tools) ) -" - -# 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 webkit Qt5WebKit) - $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - kde5_src_configure -} diff --git a/kde-apps/marble/marble-18.04.3.ebuild b/kde-apps/marble/marble-18.04.3.ebuild new file mode 100644 index 000000000000..428bed2765e2 --- /dev/null +++ b/kde-apps/marble/marble-18.04.3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +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 ~x86" + +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" + +# FIXME (new package): libwlocate, WLAN-based geolocation +RDEPEND=" + $(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:= ) + webkit? ( $(add_qt_dep qtwebkit) ) +" +DEPEND="${RDEPEND} + aprs? ( dev-lang/perl ) + nls? ( $(add_qt_dep linguist-tools) ) +" + +# 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 webkit Qt5WebKit) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) + -DWITH_libwlocate=OFF + # bug 608890 + -DKDE_INSTALL_CONFDIR="/etc/xdg" + ) + kde5_src_configure +} -- cgit v1.2.3