commit: 647c83811a0e89bdb58d415555a50eb728866c28 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 25 21:49:25 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 21:50:06 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=647c8381
dev-libs/kpublictransport: port to Qt6/KF6 Signed-off-by: Sam James <sam <AT> gentoo.org> .../kpublictransport/kpublictransport-24.02.0.ebuild | 19 +++++++++---------- .../kpublictransport-24.02.49.9999.ebuild | 19 +++++++++---------- eclass/gear.kde.org.eclass | 2 +- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dev-libs/kpublictransport/kpublictransport-24.02.0.ebuild b/dev-libs/kpublictransport/kpublictransport-24.02.0.ebuild index 6a7053c69b..56f600f080 100644 --- a/dev-libs/kpublictransport/kpublictransport-24.02.0.ebuild +++ b/dev-libs/kpublictransport/kpublictransport-24.02.0.ebuild @@ -5,8 +5,8 @@ EAPI=8 ECM_QTHELP="true" ECM_TEST="true" -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=5.249.0 +QTMIN=6.6.2 inherit ecm gear.kde.org DESCRIPTION="Library for accessing public transport timetables and other information" @@ -14,27 +14,26 @@ HOMEPAGE="https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"; LICENSE="LGPL-2+" -SLOT="5" +SLOT="6" KEYWORDS="~amd64" IUSE="networkmanager" RDEPEND=" dev-libs/protobuf:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=kde-frameworks/ki18n-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,ssl] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 sys-libs/zlib - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) " DEPEND="${RDEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) ) ecm_src_configure } diff --git a/dev-libs/kpublictransport/kpublictransport-24.02.49.9999.ebuild b/dev-libs/kpublictransport/kpublictransport-24.02.49.9999.ebuild index a67b291aa8..2ada71ad1f 100644 --- a/dev-libs/kpublictransport/kpublictransport-24.02.49.9999.ebuild +++ b/dev-libs/kpublictransport/kpublictransport-24.02.49.9999.ebuild @@ -5,8 +5,8 @@ EAPI=8 ECM_QTHELP="true" ECM_TEST="true" -KFMIN=5.113.0 -QTMIN=5.15.9 +KFMIN=5.249.0 +QTMIN=6.6.2 inherit ecm gear.kde.org DESCRIPTION="Library for accessing public transport timetables and other information" @@ -14,27 +14,26 @@ HOMEPAGE="https://invent.kde.org/libraries/kpublictransport https://www.volkerkrause.eu/2019/03/02/kpublictransport-introduction.html"; LICENSE="LGPL-2+" -SLOT="5" +SLOT="6" KEYWORDS="" IUSE="networkmanager" RDEPEND=" dev-libs/protobuf:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=kde-frameworks/ki18n-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,ssl] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 sys-libs/zlib - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) " DEPEND="${RDEPEND} - test? ( >=dev-qt/qtwidgets-${QTMIN}:5 ) + test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) " src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) ) ecm_src_configure } diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 1e0928b035..1753cac22c 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -191,6 +191,7 @@ if $(ver_test -gt 24.01.75); then kpimtextedit | \ kpkpass | \ kpmcore | \ + kpublictransport | \ kreversi | \ krfb | \ kruler | \ @@ -259,7 +260,6 @@ if $(ver_test -gt 24.03.75); then kmplot | \ kolourpaint | \ kompare | \ - kpublictransport | \ krdc | \ ksanecore | \ libkeduvocdocument | \
