gentoo resync : 28.04.2021

4 files changed, 41 insertions, 9 deletions

diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 8f1e5c797dea..52e0c615fd28 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,6 @@
-DIST kalzium-20.08.3.tar.xz 24524836 BLAKE2B 5e039f685890ce647cfabd1f320f34f51677809c33e012d9de8c10c461726e50f119856b4a32e333cc971f64255c2b112b96a79a468786610e0a9059ac34de88 SHA512 d755c601c5478901be24368da9bcd22ffd8df932bcc08a22a3919fe853a012ef300ae142fc3512af4b6615dcdd02263df300acc3afa66922b64a6ae41ebbcd2f
+AUX kalzium-21.03.90-cmake.patch 815 BLAKE2B ba13821a0d50f1120e37d73b30d13b7597a67342b74c710155429b3880bddaafcef665f44acbc93d63dc7ed894b5b906a906bfef7a0a587554cea278c4c41553 SHA512 3b188578152cc399b13062afceb6e5a0e006f5e42810c09dec45ee7d8388a4177a98a076fe7789d1aeba49236e70f861f6a9af6907a5c06db3405db383cf83c9
 DIST kalzium-20.12.3.tar.xz 24521912 BLAKE2B 23b1f1aa9948428789e46469c19e6bb9ebfa9841db29b4f8b89254e6cf973b213d49e9abda07fc9ee34a7a661d4ee2849491e0e6ade1e3fc0e544f7ba477e45b SHA512 09e3d588dd0ebcdac0b7c473f5bf7f240516a12797240a36efb1e764968c3953373c04e589ee84ff92b23df97e8d367a155b980175dc8ad01a2551a9d5d1f046
-EBUILD kalzium-20.08.3.ebuild 1708 BLAKE2B c971efde3ccddc4d282acd81258a9173dd6fbf68238b79c7f22171a485ab1707c28986355e4c874d9b84728d0586ec747dfaccc08b5b569413f6bfcd7dd79b42 SHA512 e0eb830d4cd6a1c57b0ab3653b95ae7a3e72a6a997d38faa24ce15ec682a3bfdf46acee74638a645f1bce2b2f8c8eb4c3e9c98713b23f046eac3182325ef2f36
-EBUILD kalzium-20.12.3.ebuild 1711 BLAKE2B 6975f4521c96fb93f1ace5377563551ca591bc1f0036105229547eff700a8aba6e6b70a7f13c744ff01acb645f0cc5fd69696d22318138cb2c1c33b439e5e04e SHA512 3ad71ff4727d244b94a819b70c78849d38b0bd35c52120613637921a4dcfd15d8f95798c7ebba74d4ae3c98d828ed25477f81b985895f22ef6701121d90edf37
+DIST kalzium-21.04.0.tar.xz 24544292 BLAKE2B a45ca661eac391c628030e30b45e96beebb5e4fc063c1c0f3103c7ba009ce176a8afde9c898ac6301d5f221b51493f0bb6df4f67184bf815bea3c72d9d81ffee SHA512 cc319f212b5284b7889fa5af85c3c0976ba9ed93d8224f2845ff2f1b64df63040f51ddbaf877c0d66ca33988832f5506fcfef8d598b121981612306ea12d6f3c
+EBUILD kalzium-20.12.3.ebuild 1708 BLAKE2B 2344c4303f4d37297c7c24427934c190f10ed1290819f592b857214b0545202d56c5e04d67b1a6c3fabd57a20c0ccc7259fe0b520a18611fa6d9047aa911bb4c SHA512 4ece25564b52a01334ea74d44ddc0fae6b9c42e1f766530f59558bff86e814e1c499d590a5c0b303f67c3a90dedd9db175286a7a297b9b1eac612b7e2929f17b
+EBUILD kalzium-21.04.0.ebuild 1837 BLAKE2B 7f1959e3252cc7c93f151e0a89989a8971a4f9171e0ca5d08430b58c30b11906b6b86c3dcea7d0d855b7ef4a8ec5b58508119772e9f0a87f169203eff3646c73 SHA512 51f33071a26b0ed49e97ec5638108f8b81c058b67f7a9a850ee70ca8c72ffe25cde6b14cca4508e6c226a6b03723cab860e13b6a4c03c28840f9e40cf15da136
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
new file mode 100644
index 000000000000..4339fbf0ce1c
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-21.03.90-cmake.patch
@@ -0,0 +1,28 @@
+From 137a209512e632ccc7b297355a6b54301657c9ff Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Apr 2021 00:02:48 +0200
+Subject: [PATCH] Drop brackets around OpenBabel3_FOUND
+
+It breaks when cmake is run with -DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index abc8120b..a370e5da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ find_package(Gettext REQUIRED)
+ find_package(PythonInterp REQUIRED)
+ find_package(PkgConfig)
+ find_package(OpenBabel3 3.1)
+-if(NOT ${OpenBabel3_FOUND})
++if(NOT OpenBabel3_FOUND)
+     find_package(OpenBabel2)
+ endif()
+ find_package(AvogadroLibs)
+-- 
+2.31.1
+
diff --git a/kde-apps/kalzium/kalzium-20.12.3.ebuild b/kde-apps/kalzium/kalzium-20.12.3.ebuild
index 94f0f019d72c..1f0afd8ff6d6 100644
--- a/kde-apps/kalzium/kalzium-20.12.3.ebuild
+++ b/kde-apps/kalzium/kalzium-20.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kalzium https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kalzium/kalzium-20.08.3.ebuild b/kde-apps/kalzium/kalzium-21.04.0.ebuild
index bac5f26501d5..18bc4df102d0 100644
--- a/kde-apps/kalzium/kalzium-20.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-21.04.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org flag-o-matic
 
 DESCRIPTION="Periodic table of the elements"
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/kalzium https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="editor solver"
 
 DEPEND="
@@ -39,7 +39,7 @@ DEPEND="
 		dev-cpp/eigen:3
 		>=dev-qt/qtopengl-${QTMIN}:5
 		>=kde-frameworks/knewstuff-${KFMIN}:5
-		sci-chemistry/openbabel
+		sci-chemistry/openbabel:=
 		>=sci-libs/avogadrolibs-1.93[qt5]
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
@@ -48,11 +48,14 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.03.90-cmake.patch" )
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenBabel3=ON # TODO: not packaged yet
 		$(cmake_use_find_package editor Eigen3)
 		$(cmake_use_find_package editor AvogadroLibs)
 		$(cmake_use_find_package editor OpenBabel2)