[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 0de4c2f73363704cc46736174b53c00722a1c80d Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 26 18:44:38 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 26 19:58:40 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0de4c2f7 kde-apps/marble: Re-add 24.02.0:5 KEYWORDS Only Qt6 revdeps will need to undergo re-keywording. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-24.02.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-24.02.0.ebuild b/kde-apps/marble/marble-24.02.0.ebuild index 8561046e8b..0290d2f3c1 100644 --- a/kde-apps/marble/marble-24.02.0.ebuild +++ b/kde-apps/marble/marble-24.02.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" # bug 588320
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 3945df6be6f6ccf76fd9c55c3c379d258297458a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 5 13:51:07 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 5 13:51:07 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3945df6b kde-apps/marble: Drop IUSE nls Not optional by some kde-frameworks dependency anyway. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-23.04.49..ebuild | 16 kde-apps/marble/marble-.ebuild | 16 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kde-apps/marble/marble-23.04.49..ebuild b/kde-apps/marble/marble-23.04.49..ebuild index 7ce7dabb7d..c564290974 100644 --- a/kde-apps/marble/marble-23.04.49..ebuild +++ b/kde-apps/marble/marble-23.04.49..ebuild @@ -15,13 +15,12 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" KEYWORDS="" -IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" +IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" + +# bug 588320 +RESTRICT="test" # 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 @@ -60,9 +59,10 @@ DEPEND=" ) " RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT="test" +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 + aprs? ( dev-lang/perl ) +" src_prepare() { ecm_src_prepare diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 7ce7dabb7d..c564290974 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -15,13 +15,12 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" KEYWORDS="" -IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" +IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" + +# bug 588320 +RESTRICT="test" # 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 @@ -60,9 +59,10 @@ DEPEND=" ) " RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT="test" +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 + aprs? ( dev-lang/perl ) +" src_prepare() { ecm_src_prepare
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 1ae4c48cad11c1b9a77b10fa9eb3696cd64dd0b3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 23 23:36:58 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 23 23:36:58 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ae4c48c kde-apps/marble: Add IUSE=pbf Upstream commit 955c2548d691755f9e46e2762d89375675444228 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-20.11.80.ebuild | 4 +++- kde-apps/marble/marble-20.12.49..ebuild | 4 +++- kde-apps/marble/marble-.ebuild | 4 +++- kde-apps/marble/metadata.xml| 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/kde-apps/marble/marble-20.11.80.ebuild b/kde-apps/marble/marble-20.11.80.ebuild index 70c1fd50d8..585d209b95 100644 --- a/kde-apps/marble/marble-20.11.80.ebuild +++ b/kde-apps/marble/marble-20.11.80.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" +IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation BDEPEND=" @@ -52,6 +52,7 @@ DEPEND=" >=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? ( @@ -80,6 +81,7 @@ src_configure() { -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) diff --git a/kde-apps/marble/marble-20.12.49..ebuild b/kde-apps/marble/marble-20.12.49..ebuild index ade641c3cc..c5e6880425 100644 --- a/kde-apps/marble/marble-20.12.49..ebuild +++ b/kde-apps/marble/marble-20.12.49..ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" +IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation BDEPEND=" @@ -52,6 +52,7 @@ DEPEND=" >=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? ( @@ -80,6 +81,7 @@ src_configure() { -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) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index ade641c3cc..c5e6880425 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://marble.kde.org/; LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" +IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation BDEPEND=" @@ -52,6 +52,7 @@ DEPEND=" >=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? ( @@ -80,6 +81,7 @@ src_configure() { -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) diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 565eba0753..f57f36e23e 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -9,6 +9,7 @@ Enable support for APRS data sources Install plugin for dev-qt/designer Enable position information via dev-qt/qtpositioning + Enable OpenStreetMap PBF file
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 4e2a96e1d9b2e1b0ea141af8c650daed17c5a1bd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 30 11:45:32 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 30 17:23:03 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e2a96e1 kde-apps/marble: Use cmake_comment_add_subdirectory Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-20.08.49..ebuild | 5 + kde-apps/marble/marble-.ebuild | 5 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kde-apps/marble/marble-20.08.49..ebuild b/kde-apps/marble/marble-20.08.49..ebuild index 99d1d01008..4609ad1836 100644 --- a/kde-apps/marble/marble-20.08.49..ebuild +++ b/kde-apps/marble/marble-20.08.49..ebuild @@ -69,10 +69,7 @@ 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 + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt } src_configure() { diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 40935d7f38..9a386b1857 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -69,10 +69,7 @@ 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 + use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt } src_configure() {
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 72cf3344abe37feb6bbc473864a069e7f79036f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 15 10:10:58 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 15 10:21:40 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=72cf3344 kde-apps/marble: Add missing DEPEND Filed upstream: https://invent.kde.org/education/marble/-/merge_requests/1 Reported-by: Jérôme Borme laposte.net> Closes: https://bugs.gentoo.org/728234 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-20.04.49..ebuild | 5 - kde-apps/marble/marble-.ebuild | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-20.04.49..ebuild b/kde-apps/marble/marble-20.04.49..ebuild index ced12b1069..c3694610d2 100644 --- a/kde-apps/marble/marble-20.04.49..ebuild +++ b/kde-apps/marble/marble-20.04.49..ebuild @@ -54,7 +54,10 @@ DEPEND=" ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index ced12b1069..c3694610d2 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -54,7 +54,10 @@ DEPEND=" ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + ) " RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 175afb357bd189429002ffdb39ea1d971979250b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 17 19:03:27 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 18 15:17:27 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=175afb35 kde-apps/marble: Fix DEPENDs, src_configure() with USE !kde Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-19.08.49..ebuild | 16 +++- kde-apps/marble/marble-.ebuild | 16 +++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/kde-apps/marble/marble-19.08.49..ebuild b/kde-apps/marble/marble-19.08.49..ebuild index c66895e677..4db7aa7256 100644 --- a/kde-apps/marble/marble-19.08.49..ebuild +++ b/kde-apps/marble/marble-19.08.49..ebuild @@ -30,6 +30,7 @@ DEPEND=" $(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) ) @@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" 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" + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" fi - - kde5_src_prepare } src_configure() { @@ -83,5 +85,9 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - kde5_src_configure + if use kde; then + kde5_src_configure + else + cmake-utils_src_configure + fi } diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index c66895e677..4db7aa7256 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -30,6 +30,7 @@ DEPEND=" $(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) ) @@ -58,13 +59,14 @@ RDEPEND="${DEPEND}" 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" + -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" fi - - kde5_src_prepare } src_configure() { @@ -83,5 +85,9 @@ src_configure() { # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" ) - kde5_src_configure + if use kde; then + kde5_src_configure + else + cmake-utils_src_configure + fi }
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 93a215d04b4774e704888641a4e924e7218d3f6b Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 14 16:30:35 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 14 18:49:24 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=93a215d0 kde-apps/marble: Set KDE_HANDBOOK to optional Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/marble/marble-18.12.49..ebuild | 2 +- kde-apps/marble/marble-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-18.12.49..ebuild b/kde-apps/marble/marble-18.12.49..ebuild index 142eebdd12..c66895e677 100644 --- a/kde-apps/marble/marble-18.12.49..ebuild +++ b/kde-apps/marble/marble-18.12.49..ebuild @@ -3,7 +3,7 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt KDE_SUBSLOT="true" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 142eebdd12..c66895e677 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -KDE_HANDBOOK="forceoptional" +KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt KDE_SUBSLOT="true" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test"
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 9732420631753731e85a7fc70eeba28ee05e006c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 21 08:16:05 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 21 08:16:05 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=97324206 kde-apps/marble: Really fix USE webengine this time Closes: https://bugs.gentoo.org/669164 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/marble/marble-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index fc026ba2b9..7affd9eb79 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -76,8 +76,8 @@ src_configure() { -DWITH_KF5=$(usex kde) -DWITH_Phonon4Qt5=$(usex phonon) -DWITH_libshp=$(usex shapefile) - $(cmake-utils_use_find_package webkit Qt5WebEngine) - $(cmake-utils_use_find_package webkit Qt5WebEngineWidgets) + $(cmake-utils_use_find_package webengine Qt5WebEngine) + $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets) -DWITH_libwlocate=OFF # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg"
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 79c76ba8c69660a1d4a5e8368288197c483fd5d5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 18 21:28:10 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 18 21:28:10 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=79c76ba8 kde-apps/marble: Fix USE webengine Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/marble/marble-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 8f136a3b97..fc026ba2b9 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) - webengine? ( $(add_qt_dep qtwebkit) ) + webengine? ( $(add_qt_dep qtwebengine 'widgets') ) " DEPEND="${RDEPEND} aprs? ( dev-lang/perl )
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: a7f1ecabc48b0e804dea71df917cea23c6469c57 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 17 18:16:28 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Oct 17 18:16:30 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f1ecab kde-apps/marble: Drop USE webkit, add USE webengine Upstream commit b42ee5c83d77761ef7d8bf8635662159bc2884bb Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/marble/marble-.ebuild | 10 +- kde-apps/marble/metadata.xml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 2ec8a2e844..8f136a3b97 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -46,7 +46,7 @@ RDEPEND=" ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) - webkit? ( $(add_qt_dep qtwebkit) ) + webengine? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) @@ -76,8 +76,8 @@ src_configure() { -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) + $(cmake-utils_use_find_package webkit Qt5WebEngine) + $(cmake-utils_use_find_package webkit Qt5WebEngineWidgets) -DWITH_libwlocate=OFF # bug 608890 -DKDE_INSTALL_CONFDIR="/etc/xdg" diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 88bdb56140..565eba0753 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -11,5 +11,6 @@ Enable position information via dev-qt/qtpositioning Enable sound support via media-libs/phonon Enable support for ESRI shapefiles + Use dev-qt/qtwebengine for embedded web browser
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: b1aab568194c845bf87bd6dc8323e67b8867e2e2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 30 09:17:49 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 30 09:18:36 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1aab568 kde-apps/marble: Rename USE=positioning -> geolocation Gentoo-bug: 631750 Package-Manager: Portage-2.3.10, Repoman-2.3.3 kde-apps/marble/marble-17.08.49..ebuild | 6 +++--- kde-apps/marble/marble-.ebuild | 6 +++--- kde-apps/marble/metadata.xml| 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kde-apps/marble/marble-17.08.49..ebuild b/kde-apps/marble/marble-17.08.49..ebuild index 5b31a6ced7..0314306b6b 100644 --- a/kde-apps/marble/marble-17.08.49..ebuild +++ b/kde-apps/marble/marble-17.08.49..ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -29,6 +29,7 @@ RDEPEND=" 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) @@ -44,7 +45,6 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5(+)] ) - positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib:= ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -69,7 +69,7 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Positioning) + $(cmake-utils_use_find_package geolocation Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 5b31a6ced7..0314306b6b 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -29,6 +29,7 @@ RDEPEND=" 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) @@ -44,7 +45,6 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5(+)] ) - positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib:= ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -69,7 +69,7 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Positioning) + $(cmake-utils_use_find_package geolocation Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index e6bb9652ae..88bdb56140 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -8,8 +8,8 @@ Enable support for APRS data sources Install plugin for dev-qt/designer + Enable position information via dev-qt/qtpositioning Enable sound support via media-libs/phonon - Enable position information via dev-qt/qtpositioning and dev-qt/qtlocation Enable support for ESRI shapefiles
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 1d66273a72c187250c713905ca7da8763ba5323b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 22 14:23:29 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 22 14:23:29 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d66273a kde-apps/marble: Add USE=nls and missing DEPEND Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/marble/marble-17.04.49..ebuild | 3 ++- kde-apps/marble/marble-.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-17.04.49..ebuild b/kde-apps/marble/marble-17.04.49..ebuild index d7eaeded02..07c072ada1 100644 --- a/kde-apps/marble/marble-17.04.49..ebuild +++ b/kde-apps/marble/marble-17.04.49..ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -50,6 +50,7 @@ RDEPEND=" " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) + nls? ( $(add_qt_dep linguist-tools) ) " # bug 588320 diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index d7eaeded02..07c072ada1 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit" +IUSE="aprs +dbus designer gps +kde nls phonon +positioning shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -50,6 +50,7 @@ RDEPEND=" " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) + nls? ( $(add_qt_dep linguist-tools) ) " # bug 588320
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: b23b1b0144355735e85e7466fca69cf41be5353e Author: Michael Palimaka gentoo org> AuthorDate: Sat Mar 25 02:02:03 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Mar 25 02:02:12 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b23b1b01 kde-apps/marble: fix configuration installation path Gentoo-bug: 608890 Package-Manager: Portage-2.3.5, Repoman-2.3.2 kde-apps/marble/marble-17.03.80.ebuild | 2 ++ kde-apps/marble/marble-17.04.49..ebuild | 2 ++ kde-apps/marble/marble-.ebuild | 2 ++ 3 files changed, 6 insertions(+) diff --git a/kde-apps/marble/marble-17.03.80.ebuild b/kde-apps/marble/marble-17.03.80.ebuild index b1bccd1a82..a4c24ad25c 100644 --- a/kde-apps/marble/marble-17.03.80.ebuild +++ b/kde-apps/marble/marble-17.03.80.ebuild @@ -78,6 +78,8 @@ src_configure() { $(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-17.04.49..ebuild b/kde-apps/marble/marble-17.04.49..ebuild index 72393a9ff5..d7eaeded02 100644 --- a/kde-apps/marble/marble-17.04.49..ebuild +++ b/kde-apps/marble/marble-17.04.49..ebuild @@ -78,6 +78,8 @@ src_configure() { $(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-.ebuild b/kde-apps/marble/marble-.ebuild index 72393a9ff5..d7eaeded02 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -78,6 +78,8 @@ src_configure() { $(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 }
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 9a8097d6d636b2301c546a0e4948769a2283fe14 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 21 22:27:45 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 21 22:27:45 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a8097d6 kde-apps/marble: Add subslot operator for shapelib RDEPEND Package-Manager: portage-2.3.0 kde-apps/marble/marble-16.12.49..ebuild | 2 +- kde-apps/marble/marble-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-16.12.49..ebuild b/kde-apps/marble/marble-16.12.49..ebuild index 470ce28..bd43caa 100644 --- a/kde-apps/marble/marble-16.12.49..ebuild +++ b/kde-apps/marble/marble-16.12.49..ebuild @@ -46,7 +46,7 @@ RDEPEND=" ) phonon? ( media-libs/phonon[qt5] ) positioning? ( $(add_qt_dep qtpositioning) ) - shapefile? ( sci-libs/shapelib ) + shapefile? ( sci-libs/shapelib:= ) webkit? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND} diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 470ce28..bd43caa 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -46,7 +46,7 @@ RDEPEND=" ) phonon? ( media-libs/phonon[qt5] ) positioning? ( $(add_qt_dep qtpositioning) ) - shapefile? ( sci-libs/shapelib ) + shapefile? ( sci-libs/shapelib:= ) webkit? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND}
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 7c0eec4f24d722a534255e16c2536d28c1dbd611 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Dec 10 20:10:33 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Dec 11 19:13:03 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7c0eec4f kde-apps/marble: Fix configure Upstream commit e4219c9fd7044c523c88f6c264e9ad443b61e634 Package-Manager: portage-2.3.0 kde-apps/marble/marble-16.12.49..ebuild | 2 +- kde-apps/marble/marble-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-16.12.49..ebuild b/kde-apps/marble/marble-16.12.49..ebuild index 4d30c4c..287ed03 100644 --- a/kde-apps/marble/marble-16.12.49..ebuild +++ b/kde-apps/marble/marble-16.12.49..ebuild @@ -74,7 +74,7 @@ src_configure() { -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) - -DWITH_Phonon=$(usex phonon) + -DWITH_Phonon4Qt5=$(usex phonon) -DWITH_libshp=$(usex shapefile) $(cmake-utils_use_find_package webkit Qt5WebKit) $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 4d30c4c..287ed03 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -74,7 +74,7 @@ src_configure() { -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) - -DWITH_Phonon=$(usex phonon) + -DWITH_Phonon4Qt5=$(usex phonon) -DWITH_libshp=$(usex shapefile) $(cmake-utils_use_find_package webkit Qt5WebKit) $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: f73cc3fbb4a8ab377a1170b3c37b38ae315da2b1 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Dec 8 09:19:40 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Dec 9 09:46:42 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f73cc3fb kde-apps/marble: Drop unused DEPEND Upstream commit 670a24a87adab6d7b76de60ce67c8eef8433c24c Closes: https://github.com/gentoo/kde/pull/842 Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber gentoo.org> kde-apps/marble/marble-16.12.49..ebuild | 8 ++-- kde-apps/marble/marble-.ebuild | 8 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/kde-apps/marble/marble-16.12.49..ebuild b/kde-apps/marble/marble-16.12.49..ebuild index c772895..4d30c4c 100644 --- a/kde-apps/marble/marble-16.12.49..ebuild +++ b/kde-apps/marble/marble-16.12.49..ebuild @@ -45,10 +45,7 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) - positioning? ( - $(add_qt_dep qtlocation) - $(add_qt_dep qtpositioning) - ) + positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -57,7 +54,7 @@ DEPEND="${RDEPEND} " # bug 588320 -RESTRICT=test +RESTRICT+=" test" src_prepare() { if use kde; then @@ -72,7 +69,6 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Location) $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index c772895..4d30c4c 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -45,10 +45,7 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) - positioning? ( - $(add_qt_dep qtlocation) - $(add_qt_dep qtpositioning) - ) + positioning? ( $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) webkit? ( $(add_qt_dep qtwebkit) ) " @@ -57,7 +54,7 @@ DEPEND="${RDEPEND} " # bug 588320 -RESTRICT=test +RESTRICT+=" test" src_prepare() { if use kde; then @@ -72,7 +69,6 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) - $(cmake-utils_use_find_package positioning Qt5Location) $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) -DWITH_DESIGNER_PLUGIN=$(usex designer)
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: babaa9e08f100f389b352a3c1553ce183cc16d18 Author: Andreas Sturmlechner gmail com> AuthorDate: Fri Nov 18 19:21:31 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Nov 19 00:18:29 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=babaa9e0 kde-apps/marble: Add KDE_SUBSLOT=true Package-Manager: portage-2.3.0 kde-apps/marble/marble-16.12.49..ebuild | 1 + kde-apps/marble/marble-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/marble/marble-16.12.49..ebuild b/kde-apps/marble/marble-16.12.49..ebuild index f79dac2..c772895 100644 --- a/kde-apps/marble/marble-16.12.49..ebuild +++ b/kde-apps/marble/marble-16.12.49..ebuild @@ -5,6 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_SUBSLOT="true" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index f79dac2..c772895 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -5,6 +5,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" +KDE_SUBSLOT="true" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 8027428822f8a78f238c66eeb6d0a66411f19be1 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Oct 26 19:24:38 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Nov 12 10:55:01 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=80274288 kde-apps/marble: Add USE=webkit Package-Manager: portage-2.3.0 kde-apps/marble/marble-16.08.49..ebuild | 6 -- kde-apps/marble/marble-.ebuild | 6 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kde-apps/marble/marble-16.08.49..ebuild b/kde-apps/marble/marble-16.08.49..ebuild index c94aae4..5c7bc8b 100644 --- a/kde-apps/marble/marble-16.08.49..ebuild +++ b/kde-apps/marble/marble-16.08.49..ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -25,7 +25,6 @@ RDEPEND=" $(add_qt_dep qtscript) $(add_qt_dep qtsql) $(add_qt_dep qtsvg) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) aprs? ( $(add_qt_dep qtserialport) ) @@ -51,6 +50,7 @@ RDEPEND=" $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) + webkit? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) @@ -80,6 +80,8 @@ src_configure() { -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) + $(cmake-utils_use_find_package webkit Qt5WebKit) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) -DWITH_libwlocate=OFF ) kde5_src_configure diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 543ae6f..f79dac2 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit" # FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" $(add_qt_dep qtprintsupport) $(add_qt_dep qtsql) $(add_qt_dep qtsvg) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) aprs? ( $(add_qt_dep qtserialport) ) @@ -50,6 +49,7 @@ RDEPEND=" $(add_qt_dep qtpositioning) ) shapefile? ( sci-libs/shapelib ) + webkit? ( $(add_qt_dep qtwebkit) ) " DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) @@ -79,6 +79,8 @@ src_configure() { -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) + $(cmake-utils_use_find_package webkit Qt5WebKit) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) -DWITH_libwlocate=OFF ) kde5_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 1a2fc9c0fcad3eee4fe758b8f8a8048917b0fc67 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Oct 17 19:52:08 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Oct 18 21:44:47 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a2fc9c0 kde-apps/marble: Drop unused DEPEND Qt5Script no longer used after upstream commit 4e97f5be53e8981c626a8ac9caa74f3406a040fd Package-Manager: portage-2.3.0 kde-apps/marble/marble-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index c94aae4..543ae6f 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -22,7 +22,6 @@ RDEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) $(add_qt_dep qtsql) $(add_qt_dep qtsvg) $(add_qt_dep qtwebkit)
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: d8288236756f2eec94d9b0fb98c6b8cea8398040 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 16 20:46:49 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Aug 16 21:59:02 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8288236 kde-apps/marble: Add USE=dbus,positioning fix DEPENDs, DESCRIPTION - Add Qt5SerialPort to aprs DEPENDs now that it's in tree - Add Qt5{Location,Positioning} support, same USE naming as in PyQt5 - Other packages are using 'designer' so bring marble in line - Disable marble-qt if USE=kde, it only adds confusion - Drop unused and deprecated Qt5OpenGL - Improve DESCRIPTION Package-Manager: portage-2.2.28 kde-apps/marble/marble-16.07.90.ebuild | 36 - kde-apps/marble/marble-16.08.49..ebuild | 36 - kde-apps/marble/marble-.ebuild | 36 - kde-apps/marble/metadata.xml| 3 ++- 4 files changed, 77 insertions(+), 34 deletions(-) diff --git a/kde-apps/marble/marble-16.07.90.ebuild b/kde-apps/marble/marble-16.07.90.ebuild index 1dbf794..862dcda 100644 --- a/kde-apps/marble/marble-16.07.90.ebuild +++ b/kde-apps/marble/marble-16.07.90.ebuild @@ -9,22 +9,18 @@ KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="Generic geographical map widget" +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -IUSE="aprs designer-plugin gps +kde phonon shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" -# FIXME (new packages): -# libwlocate, WLAN-based geolocation -# qextserialport, interface to old fashioned serial ports +# FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtopengl) $(add_qt_dep qtprintsupport) $(add_qt_dep qtscript) $(add_qt_dep qtsql) @@ -32,7 +28,10 @@ RDEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - gps? ( >=sci-geosciences/gpsd-2.95 ) + aprs? ( $(add_qt_dep qtserialport) ) + dbus? ( $(add_qt_dep qtdbus) ) + designer? ( $(add_qt_dep designer) ) + gps? ( sci-geosciences/gpsd ) kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -47,6 +46,10 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) + positioning? ( + $(add_qt_dep qtlocation) + $(add_qt_dep qtpositioning) + ) shapefile? ( sci-libs/shapelib ) " DEPEND="${RDEPEND} @@ -56,17 +59,28 @@ DEPEND="${RDEPEND} # 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 positioning Qt5Location) + $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) - -DWITH_DESIGNER_PLUGIN=$(usex designer-plugin) + -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) - -DWITH_QextSerialPort=OFF - -DWITH_liblocation=0 + -DWITH_libwlocate=OFF ) kde5_src_configure } diff --git a/kde-apps/marble/marble-16.08.49..ebuild b/kde-apps/marble/marble-16.08.49..ebuild index 06dd32b..c94aae4 100644 --- a/kde-apps/marble/marble-16.08.49..ebuild +++ b/kde-apps/marble/marble-16.08.49..ebuild @@ -9,22 +9,18 @@ KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="Generic geographical map widget" +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/; KEYWORDS="" -IUSE="aprs designer-plugin gps +kde phonon shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" -# FIXME (new packages): -# libwlocate, WLAN-based geolocation -# qextserialport, interface to old fashioned serial ports +# FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 2d2fc4404f019fee043976b46a4cee10601149dd Author: Johannes Huber gentoo org> AuthorDate: Sat Jul 9 18:21:29 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sat Jul 9 18:21:29 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d2fc440 kde-apps/marble: Restrict test Add virtual x for tests. Gentoo-bug: 588320 Package-Manager: portage-2.3.0 kde-apps/marble/marble-16.04.3.ebuild | 4 kde-apps/marble/marble-16.04.49..ebuild | 4 kde-apps/marble/marble-.ebuild | 4 3 files changed, 12 insertions(+) diff --git a/kde-apps/marble/marble-16.04.3.ebuild b/kde-apps/marble/marble-16.04.3.ebuild index b49d65f..1dbf794 100644 --- a/kde-apps/marble/marble-16.04.3.ebuild +++ b/kde-apps/marble/marble-16.04.3.ebuild @@ -6,6 +6,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Generic geographical map widget" @@ -52,6 +53,9 @@ DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) " +# bug 588320 +RESTRICT=test + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) diff --git a/kde-apps/marble/marble-16.04.49..ebuild b/kde-apps/marble/marble-16.04.49..ebuild index fc16a5d..06dd32b 100644 --- a/kde-apps/marble/marble-16.04.49..ebuild +++ b/kde-apps/marble/marble-16.04.49..ebuild @@ -6,6 +6,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Generic geographical map widget" @@ -52,6 +53,9 @@ DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) " +# bug 588320 +RESTRICT=test + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index fc16a5d..06dd32b 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -6,6 +6,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Generic geographical map widget" @@ -52,6 +53,9 @@ DEPEND="${RDEPEND} aprs? ( dev-lang/perl ) " +# bug 588320 +RESTRICT=test + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl)
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: d790c50ef9cb4cc356f3ce66e1936a726d2ddbe9 Author: Michael Palimaka gentoo org> AuthorDate: Tue Mar 1 14:12:15 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Mar 1 14:12:15 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d790c50e kde-apps/marble: remove unused local USE flag Package-Manager: portage-2.2.27 kde-apps/marble/metadata.xml | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 3cba1ee..5f70c96 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -1,15 +1,14 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + k...@gentoo.org + Gentoo KDE Project + Enable support for APRS data sources Enable designer plugin Enable sound support via media-libs/phonon Enable support for ESRI shapefiles - Enable support for reading and displaying .kmz files - - k...@gentoo.org - Gentoo KDE Project -
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: b0625451429d3f3cd15d0faf8b627c8ed2cd8436 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Feb 24 19:18:05 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Feb 24 19:18:05 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0625451 kde-apps/marble: Fix EAPI 6 Package-Manager: portage-2.2.27 kde-apps/marble/marble-15.12.49..ebuild | 2 +- kde-apps/marble/marble-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/marble/marble-15.12.49..ebuild b/kde-apps/marble/marble-15.12.49..ebuild index 25bd3e9..cb78f68 100644 --- a/kde-apps/marble/marble-15.12.49..ebuild +++ b/kde-apps/marble/marble-15.12.49..ebuild @@ -53,7 +53,7 @@ DEPEND="${RDEPEND} " src_prepare() { - use handbook || comment_add_subdirectory doc + use handbook || cmake_comment_add_subdirectory doc kde5_src_prepare } diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 25bd3e9..cb78f68 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -53,7 +53,7 @@ DEPEND="${RDEPEND} " src_prepare() { - use handbook || comment_add_subdirectory doc + use handbook || cmake_comment_add_subdirectory doc kde5_src_prepare }
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: a7eaeb1143299d54e9be73325fd18d461585521d Author: Christian Schmitt ilovelinux de> AuthorDate: Sat Feb 20 16:01:05 2016 + Commit: Christian Schmitt ilovelinux de> CommitDate: Sat Feb 20 16:03:08 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7eaeb11 kde-apps/marble-15.12.2: Fix EAPI 6 function call kde-apps/marble/marble-15.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/marble/marble-15.12.2.ebuild b/kde-apps/marble/marble-15.12.2.ebuild index 02420b5..cb2b35e 100644 --- a/kde-apps/marble/marble-15.12.2.ebuild +++ b/kde-apps/marble/marble-15.12.2.ebuild @@ -53,7 +53,7 @@ DEPEND="${RDEPEND} " src_prepare() { - use handbook || comment_add_subdirectory doc + use handbook || cmake_comment_add_subdirectory doc kde5_src_prepare }
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: bba5d8c4d7447852a4c7268c61e72a6998c09d6f Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Nov 18 21:06:34 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Nov 19 12:17:25 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bba5d8c4 kde-apps/marble: Add kde-frameworks/kcrash to DEPEND Package-Manager: portage-2.2.20.1 kde-apps/marble/marble-15.12.49..ebuild | 1 + kde-apps/marble/marble-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/marble/marble-15.12.49..ebuild b/kde-apps/marble/marble-15.12.49..ebuild index 1f3e54f..4b2568a 100644 --- a/kde-apps/marble/marble-15.12.49..ebuild +++ b/kde-apps/marble/marble-15.12.49..ebuild @@ -35,6 +35,7 @@ RDEPEND=" kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kdoctools) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 1f3e54f..4b2568a 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -35,6 +35,7 @@ RDEPEND=" kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) $(add_frameworks_dep kdoctools) $(add_frameworks_dep ki18n) $(add_frameworks_dep kio)
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 937e95e30307a5c9768a2eb348264ad97b6d2996 Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com AuthorDate: Mon Feb 2 16:03:52 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Wed Jun 10 19:09:46 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=937e95e3 [kde-apps/marble] Frameworks merged to master Package-Manager: portage-2.2.14 kde-apps/marble/marble-.ebuild | 105 - kde-apps/marble/metadata.xml | 1 + 2 files changed, 45 insertions(+), 61 deletions(-) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 18cf222..0ff0cdd 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -4,88 +4,71 @@ EAPI=5 -KDE_HANDBOOK=optional -KDE_REQUIRED=optional -CPPUNIT_REQUIRED=optional -PYTHON_COMPAT=( python2_7 ) -inherit kde4-base python-single-r1 +KDE_HANDBOOK=true +KDE_TEST=true +inherit kde5 DESCRIPTION=Generic geographical map widget HOMEPAGE=http://marble.kde.org/; KEYWORDS= -IUSE=debug designer-plugin gps +kde phonon plasma python shapefile test zip -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -# tests fail / segfault. Last checked for 4.9.0 -RESTRICT=test +IUSE=aprs designer-plugin gps +kde phonon shapefile zip +# FIXME (new packages): +# libwlocate, WLAN-based geolocation +# qextserialport, interface to old fashioned serial ports RDEPEND= - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtdeclarative:4 - dev-qt/qtgui:4 - dev-qt/qtscript:4 - dev-qt/qtsql:4 - dev-qt/qtsvg:4 - dev-qt/qtwebkit:4 - designer-plugin? ( dev-qt/designer:4 ) - gps? ( =sci-geosciences/gpsd-2.95[qt4] ) - kde? ( media-libs/phonon[qt4] ) - phonon? ( media-libs/phonon[qt4] ) - python? ( - ${PYTHON_DEPS} - =dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] - kde? ( $(add_kdebase_dep pykde4 ${PYTHON_USEDEP} ) ) + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + gps? ( =sci-geosciences/gpsd-2.95 ) + kde? ( + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdoctools) + $(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 ) - zip? ( dev-libs/quazip ) - -DEPEND= - ${RDEPEND} - test? ( dev-qt/qttest:4 ) + zip? ( dev-libs/quazip[qt5] ) -# the qt dependencies are needed because with USE=-kde nothing is pulled in -# by default... bugs 414165 429346 - -REQUIRED_USE= - plasma? ( kde ) - python? ( kde ) +DEPEND=${RDEPEND} + aprs? ( dev-lang/perl ) -pkg_setup() { - kde4-base_pkg_setup - use python python-single-r1_pkg_setup +src_prepare() { + use handbook || comment_add_subdirectory doc + kde5_src_prepare } src_configure() { local mycmakeargs=( + $(cmake-utils_use_build test MARBLE_TESTS) + $(cmake-utils_use_find_package aprs Perl) $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN) - $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS) - $(cmake-utils_use_with python PythonLibrary) - $(cmake-utils_use_with python PyQt4) - $(cmake-utils_use_with python SIP) $(cmake-utils_use_with gps libgps) - $(cmake-utils_use !kde QTONLY) + $(cmake-utils_use_with kde KF5) $(cmake-utils_use_with phonon) - $(cmake-utils_use_with plasma) $(cmake-utils_use_with shapefile libshp) $(cmake-utils_use_with zip quazip) - -DBUILD_MARBLE_TESTS=OFF - -DWITH_liblocation=0 -DWITH_QextSerialPort=OFF + -DWITH_liblocation=0 ) - - kde4-base_src_configure -} - -src_test() { - if use kde; then - elog Marble tests can only be run in the qt-only version - else - local mycmakeargs=( - -DBUILD_MARBLE_TESTS=ON - ) - kde4-base_src_test - fi + kde5_src_configure } diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 3431dc8..f2ab4b0 100644 ---
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/
commit: 1ca417c3ec3bd9dd8a4a5816adf840b0c8948a45 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Wed May 6 13:16:34 2015 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Wed May 6 13:16:34 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ca417c3 [kde-apps/marble] Add missing dependency wrt bug #548722. Package-Manager: portage-2.2.18 kde-apps/marble/marble-14.12.3.ebuild | 1 + kde-apps/marble/marble-15.04.0.ebuild | 1 + kde-apps/marble/marble-.ebuild| 1 + 3 files changed, 3 insertions(+) diff --git a/kde-apps/marble/marble-14.12.3.ebuild b/kde-apps/marble/marble-14.12.3.ebuild index 5e0a75f..170d016 100644 --- a/kde-apps/marble/marble-14.12.3.ebuild +++ b/kde-apps/marble/marble-14.12.3.ebuild @@ -29,6 +29,7 @@ RDEPEND= dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 + designer-plugin? ( dev-qt/designer:4 ) gps? ( =sci-geosciences/gpsd-2.95[qt4] ) kde? ( media-libs/phonon[qt4] ) phonon? ( media-libs/phonon[qt4] ) diff --git a/kde-apps/marble/marble-15.04.0.ebuild b/kde-apps/marble/marble-15.04.0.ebuild index 5e0a75f..170d016 100644 --- a/kde-apps/marble/marble-15.04.0.ebuild +++ b/kde-apps/marble/marble-15.04.0.ebuild @@ -29,6 +29,7 @@ RDEPEND= dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 + designer-plugin? ( dev-qt/designer:4 ) gps? ( =sci-geosciences/gpsd-2.95[qt4] ) kde? ( media-libs/phonon[qt4] ) phonon? ( media-libs/phonon[qt4] ) diff --git a/kde-apps/marble/marble-.ebuild b/kde-apps/marble/marble-.ebuild index 6dfab47..18cf222 100644 --- a/kde-apps/marble/marble-.ebuild +++ b/kde-apps/marble/marble-.ebuild @@ -29,6 +29,7 @@ RDEPEND= dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 + designer-plugin? ( dev-qt/designer:4 ) gps? ( =sci-geosciences/gpsd-2.95[qt4] ) kde? ( media-libs/phonon[qt4] ) phonon? ( media-libs/phonon[qt4] )
[gentoo-commits] proj/kde:master commit in: kde-apps/marble/, kde-apps/drkonqi/, kde-apps/kdeartwork-styles/, ...
commit: 535c1ab58893252ba98653c60d6b204cebb4ec59 Author: Michael Palimaka kensington AT gentoo DOT org AuthorDate: Sat Nov 29 15:37:00 2014 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Sat Nov 29 15:37:00 2014 + URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=535c1ab5 [kde-apps] Restore kde-base category to packages not part of applications. --- kde-apps/dolphin/dolphin-14.11.97.ebuild | 8 kde-apps/dolphin/dolphin-5..ebuild| 6 +++--- kde-apps/dolphin/dolphin-.ebuild | 8 kde-apps/drkonqi/drkonqi-14.11.97.ebuild | 2 +- kde-apps/drkonqi/drkonqi-.ebuild | 2 +- kde-apps/gwenview/gwenview-14.11.97.ebuild| 2 +- kde-apps/gwenview/gwenview-.ebuild| 2 +- kde-apps/kajongg/kajongg-14.11.97.ebuild | 2 +- kde-apps/kajongg/kajongg-.ebuild | 2 +- .../kdeartwork-kscreensaver-14.11.97.ebuild | 2 +- .../kdeartwork-kscreensaver/kdeartwork-kscreensaver-.ebuild | 2 +- kde-apps/kdeartwork-styles/kdeartwork-styles-14.11.97.ebuild | 2 +- kde-apps/kdeartwork-styles/kdeartwork-styles-.ebuild | 2 +- kde-apps/kdebase-kioslaves/kdebase-kioslaves-14.11.97.ebuild | 2 +- kde-apps/kdebase-kioslaves/kdebase-kioslaves-.ebuild | 2 +- kde-apps/kget/kget-14.11.97.ebuild| 4 ++-- kde-apps/kget/kget-.ebuild| 4 ++-- kde-apps/kgpg/kgpg-14.11.97.ebuild| 2 +- kde-apps/kgpg/kgpg-.ebuild| 2 +- kde-apps/klinkstatus/klinkstatus-14.11.97.ebuild | 2 +- kde-apps/klinkstatus/klinkstatus-.ebuild | 2 +- kde-apps/kopete/kopete-14.11.97.ebuild| 4 ++-- kde-apps/kopete/kopete-.ebuild| 4 ++-- kde-apps/kuser/kuser-14.11.97.ebuild | 2 +- kde-apps/kuser/kuser-.ebuild | 2 +- kde-apps/kwalletd/kwalletd-14.11.97.ebuild| 2 +- kde-apps/kwalletd/kwalletd-.ebuild| 2 +- kde-apps/lokalize/lokalize-14.11.97.ebuild| 2 +- kde-apps/lokalize/lokalize-.ebuild| 2 +- kde-apps/marble/marble-14.11.97.ebuild| 2 +- kde-apps/marble/marble-.ebuild| 2 +- kde-apps/nepomuk/nepomuk-14.11.97.ebuild | 2 +- kde-apps/nepomuk/nepomuk-.ebuild | 2 +- kde-apps/plasma-runtime/plasma-runtime-14.11.97.ebuild| 2 +- kde-apps/plasma-runtime/plasma-runtime-.ebuild| 2 +- kde-apps/superkaramba/superkaramba-14.11.97.ebuild| 2 +- kde-apps/superkaramba/superkaramba-.ebuild| 2 +- 37 files changed, 49 insertions(+), 49 deletions(-) diff --git a/kde-apps/dolphin/dolphin-14.11.97.ebuild b/kde-apps/dolphin/dolphin-14.11.97.ebuild index f7fdaa7..615165a 100644 --- a/kde-apps/dolphin/dolphin-14.11.97.ebuild +++ b/kde-apps/dolphin/dolphin-14.11.97.ebuild @@ -14,14 +14,14 @@ KEYWORDS= IUSE=debug semantic-desktop thumbnail DEPEND= - $(add_kdeapps_dep kactivities '' 4.13) + $(add_kdebase_dep kactivities '' 4.13) $(add_kdeapps_dep libkonq) media-libs/phonon[qt4] x11-libs/libXrender semantic-desktop? ( - $(add_kdeapps_dep baloo) - $(add_kdeapps_dep baloo-widgets) - $(add_kdeapps_dep kfilemetadata) + $(add_kdebase_dep kactivities) + $(add_kdebase_dep kactivities-widgets) + $(add_kdebase_dep kfilemetadata) ) RDEPEND=${DEPEND} diff --git a/kde-apps/dolphin/dolphin-5..ebuild b/kde-apps/dolphin/dolphin-5..ebuild index 1ff0344..fa3c51e 100644 --- a/kde-apps/dolphin/dolphin-5..ebuild +++ b/kde-apps/dolphin/dolphin-5..ebuild @@ -44,9 +44,9 @@ DEPEND= dev-qt/qtxml:5 media-libs/phonon[qt5] semantic-desktop? ( - $(add_kdeapps_dep baloo) - $(add_kdeapps_dep baloo-widgets) - $(add_kdeapps_dep kfilemetadata) + $(add_kdebase_dep kactivities) + $(add_kdebase_dep kactivities-widgets) + $(add_kdebase_dep kfilemetadata) ) RDEPEND=${DEPEND} diff --git a/kde-apps/dolphin/dolphin-.ebuild b/kde-apps/dolphin/dolphin-.ebuild index f7fdaa7..615165a 100644 --- a/kde-apps/dolphin/dolphin-.ebuild +++ b/kde-apps/dolphin/dolphin-.ebuild @@ -14,14 +14,14 @@ KEYWORDS= IUSE=debug semantic-desktop thumbnail