kde-apps/kalzium: Port to KF6, dropping IUSE editor for now

Depends on nonexistent sci-libs/avogadrolibs[qt6] Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
a17r · Mar 7, 2024 · ba10c32 · ba10c32
1 parent 4269d0d
commit ba10c32
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
@@ -256,6 +256,7 @@ if $(ver_test -gt 24.03.75); then
 	case ${PN} in
 		itinerary | \
 		k3b | \
+		kalzium | \
 		kdeedu-data | \
 		kdesdk-thumbnailers | \
 		kimagemapeditor | \

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -4,43 +4,43 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.0.0
+QTMIN=6.6.2
 inherit ecm gear.kde.org flag-o-matic
 
 DESCRIPTION="Periodic table of the elements"
 HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
-IUSE="editor solver"
+IUSE="solver"
 
+# TODO: IUSE="editor"
+# 	editor? (
+# 		dev-cpp/eigen:3
+# 		>=dev-qt/qtopengl-${QTMIN}:6
+# 		>=kde-frameworks/knewstuff-${KFMIN}:6
+# 		sci-chemistry/openbabel:=
+# 		>=sci-libs/avogadrolibs-1.93[qt6]
+# 	)
 DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	editor? (
-		dev-cpp/eigen:3
-		>=dev-qt/qtopengl-${QTMIN}:5
-		>=kde-frameworks/knewstuff-${KFMIN}:5
-		sci-chemistry/openbabel:=
-		>=sci-libs/avogadrolibs-1.93[qt5]
-	)
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+	>=dev-qt/qtscxml-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kplotting-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kunitconversion-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	solver? ( dev-ml/facile:=[ocamlopt] )
 "
 RDEPEND="${DEPEND}
@@ -55,11 +55,12 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: bug 823101
-		$(cmake_use_find_package editor Eigen3)
-		$(cmake_use_find_package editor AvogadroLibs)
-		$(cmake_use_find_package editor OpenBabel2)
-		$(cmake_use_find_package solver OCaml)
-		$(cmake_use_find_package solver Libfacile)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Eigen3=ON
+# 		$(cmake_use_find_package editor Eigen3)
+# 		$(cmake_use_find_package editor AvogadroLibs)
+# 		$(cmake_use_find_package editor OpenBabel2)
+# 		$(cmake_use_find_package solver OCaml)
+# 		$(cmake_use_find_package solver Libfacile)
 	)
 
 	ecm_src_configure