commit: 0b0ea6868a228b52ff38a2803be422feb8b4e8e7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 25 21:45:29 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 21:47:24 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b0ea686
dev-libs/kosmindoormap: port to Qt6/KF6 Signed-off-by: Sam James <sam <AT> gentoo.org> .../kosmindoormap/kosmindoormap-24.02.0.ebuild | 35 +++++++++++----------- .../kosmindoormap-24.02.49.9999.ebuild | 35 +++++++++++----------- eclass/gear.kde.org.eclass | 2 +- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.02.0.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.02.0.ebuild index 1e11a6fede..e3133012a8 100644 --- a/dev-libs/kosmindoormap/kosmindoormap-24.02.0.ebuild +++ b/dev-libs/kosmindoormap/kosmindoormap-24.02.0.ebuild @@ -5,33 +5,34 @@ EAPI=8 ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=5.249.0 +QTMIN=6.6.2 inherit ecm gear.kde.org DESCRIPTION="Data Model and Extraction System for Travel Reservation information" HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"; LICENSE="LGPL-2+" -SLOT="5" +SLOT="6" KEYWORDS="~amd64" -IUSE="+openinghours" +IUSE="+gui" -COMMON_DEPEND=" - >=dev-libs/kpublictransport-${PVCUT}:5 +# kservice is optional and only used to find and open josm +RDEPEND=" dev-libs/protobuf:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui?,network] sys-libs/zlib - openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) + gui? ( + >=dev-libs/kopeninghours-${PVCUT}:6 + >=dev-libs/kpublictransport-${PVCUT}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + ) " -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " BDEPEND=" app-alternatives/lex @@ -40,8 +41,8 @@ BDEPEND=" src_configure() { local mycmakeargs=( + -DBUILD_TOOLS_ONLY=$(usex !gui) -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - $(cmake_use_find_package openinghours KOpeningHours) ) ecm_src_configure } diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.02.49.9999.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.02.49.9999.ebuild index 6cd24c576f..f8533bb17b 100644 --- a/dev-libs/kosmindoormap/kosmindoormap-24.02.49.9999.ebuild +++ b/dev-libs/kosmindoormap/kosmindoormap-24.02.49.9999.ebuild @@ -5,33 +5,34 @@ EAPI=8 ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=5.249.0 +QTMIN=6.6.2 inherit ecm gear.kde.org DESCRIPTION="Data Model and Extraction System for Travel Reservation information" HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap"; LICENSE="LGPL-2+" -SLOT="5" +SLOT="6" KEYWORDS="" -IUSE="+openinghours" +IUSE="+gui" -COMMON_DEPEND=" - >=dev-libs/kpublictransport-${PVCUT}:5 +# kservice is optional and only used to find and open josm +RDEPEND=" dev-libs/protobuf:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui?,network] sys-libs/zlib - openinghours? ( >=dev-libs/kopeninghours-${PVCUT}:5 ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) + gui? ( + >=dev-libs/kopeninghours-${PVCUT}:6 + >=dev-libs/kpublictransport-${PVCUT}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + ) " -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 +DEPEND="${RDEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " BDEPEND=" app-alternatives/lex @@ -40,8 +41,8 @@ BDEPEND=" src_configure() { local mycmakeargs=( + -DBUILD_TOOLS_ONLY=$(usex !gui) -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - $(cmake_use_find_package openinghours KOpeningHours) ) ecm_src_configure } diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 4a60be4d07..9bb99fef01 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -185,6 +185,7 @@ if $(ver_test -gt 24.01.75); then kontrast | \ konversation | \ korganizer | \ + kosmindoormap | \ kpat | \ kpimtextedit | \ kpkpass | \ @@ -258,7 +259,6 @@ if $(ver_test -gt 24.03.75); then kolourpaint | \ kompare | \ kopeninghours | \ - kosmindoormap | \ kpublictransport | \ krdc | \ ksanecore | \
