From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D6D7158042 for ; Sat, 9 Nov 2024 10:56:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92DB8E08CE; Sat, 9 Nov 2024 10:56:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A293E08CE for ; Sat, 9 Nov 2024 10:56:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD334335D6D for ; Sat, 9 Nov 2024 10:56:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D4901A26 for ; Sat, 9 Nov 2024 10:55:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731149738.e3041249be88272aec4bec6e31f986eee7d86aa3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: sci-astronomy/kstars/ X-VCS-Repository: proj/kde X-VCS-Files: sci-astronomy/kstars/kstars-9999.ebuild X-VCS-Directories: sci-astronomy/kstars/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e3041249be88272aec4bec6e31f986eee7d86aa3 X-VCS-Branch: master Date: Sat, 9 Nov 2024 10:55:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e65cc8b-6b70-4fcb-bfc2-a905d03a0d34 X-Archives-Hash: 5497053a79b6a1267b0163b7b2acc5e4 commit: e3041249be88272aec4bec6e31f986eee7d86aa3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 9 10:51:57 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 9 10:55:38 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e3041249 sci-astronomy/kstars: Port to KF6 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-astronomy/kstars/kstars-9999.ebuild | 66 +++++++++++++++------------------ 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/sci-astronomy/kstars/kstars-9999.ebuild b/sci-astronomy/kstars/kstars-9999.ebuild index 0a74bb3668..9d5648338b 100644 --- a/sci-astronomy/kstars/kstars-9999.ebuild +++ b/sci-astronomy/kstars/kstars-9999.ebuild @@ -5,8 +5,8 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.115.0 -QTMIN=5.15.12 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm kde.org optfeature DESCRIPTION="Desktop Planetarium" @@ -18,60 +18,51 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then fi LICENSE="GPL-2+ GPL-3+" -SLOT="5" +SLOT="0" IUSE="+password raw wcs" # IUSE wcs needed by TestPolarAlign REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( wcs )" +# https://wiki.gentoo.org/wiki/Project:Qt/Qt6_migration_notes#Still_unpackaged +# >=dev-qt/qtdatavis3d-${QTMIN}:6 COMMON_DEPEND=" - >=dev-qt/qtdatavis3d-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwebsockets-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kplotting-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebsockets-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kplotting-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 sci-libs/cfitsio:= sci-libs/gsl:= >=sci-libs/indilib-2.0.2 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 sys-libs/zlib - password? ( dev-libs/qtkeychain:=[qt5(+)] ) + password? ( >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) " -# TODO: Add back when re-enabled by upstream -# opengl? ( -# >=dev-qt/qtopengl-${QTMIN}:5 -# virtual/opengl -# ) +# TODO: what about virtual/opengl? DEPEND="${COMMON_DEPEND} dev-cpp/eigen:3 - >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[concurrent] test? ( sci-astronomy/erfa ) " RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 + !${CATEGORY}/${PN}:5 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtpositioning-${QTMIN}:6 " CMAKE_SKIP_TESTS=( @@ -86,8 +77,9 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged + -DBUILD_QT5=OFF # KF6 please -DBUILD_DOC=$(usex handbook) - $(cmake_use_find_package password Qt5Keychain) + $(cmake_use_find_package password Qt6Keychain) $(cmake_use_find_package raw LibRaw) $(cmake_use_find_package wcs WCSLIB) )