gentoo resync : 25.11.2020

3 files changed, 5 insertions, 73 deletions

diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 3d9b599ce889..0ab48af9b126 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,3 @@
-DIST kalzium-20.04.3.tar.xz 24550796 BLAKE2B 85309f277178f3e70b50db5154376371fbf3484d8b7fd7486ff74025044745de5dd77f4c8e5b18520279b8d5630ccb8f3fc3bc68618f2fbcd4a593090715ad0f SHA512 fa8f67128d35faa8bdc343cf425aedda8a9370584bdeb69e22ca229c0c1029a5d178f851d4131bd60c635d8d846c8bf1e9104fc030fddb15578ead4c2cba7ea0
-DIST kalzium-20.08.1.tar.xz 24525128 BLAKE2B 20d5e28d549812d78ef914ce8a23c79d737235a68db91be3aa0c6a0a443d1f1c72be4bc320cb69ee3fd882ee5550f3468d7b9d03b73946eb9f2e67a037730da3 SHA512 60da587ba5001b718bd6106a384c26b5351e41d943ad6796def4b1e8e8c8aa8c077f58019e4a6e6796a90a3d594dfa61602cd149d82415d7cf7df0e6f453c5ee
-EBUILD kalzium-20.04.3.ebuild 1731 BLAKE2B b7747e84156c31e099835ec5a178cad83489ae4ef08f76139b461145438b8f78efc3846cc86815c342d7890ee315e9b5cbffba3ee68c37e89f49c59bd5a5177e SHA512 9add3f09f1bd58fcb7f67bf8af307e368a1d296d06464e41eb9c990c83c8aec5c1bcb6eae7dc385556dcc981c355a4e17a2c9aedb64303fd4f93879f3df588d5
-EBUILD kalzium-20.08.1.ebuild 1734 BLAKE2B 6b5ed0bc64619fded84fb7eb79aee2ec4b3716a69a4ac908d0107e89d66afc6ae243d1b9bb79dbe7aa26169473620ee0e088e6f5481a868790dab0fcf6036e39 SHA512 9f4195997416c2513b5ac9cde5fa3594cb2a0a2731e4bb317ecae8d26ae333b1a714425009e53a6dadeb0a9b9fefc934c95392bccecef52a8ce3c6d1a869aa04
+DIST kalzium-20.08.3.tar.xz 24524836 BLAKE2B 5e039f685890ce647cfabd1f320f34f51677809c33e012d9de8c10c461726e50f119856b4a32e333cc971f64255c2b112b96a79a468786610e0a9059ac34de88 SHA512 d755c601c5478901be24368da9bcd22ffd8df932bcc08a22a3919fe853a012ef300ae142fc3512af4b6615dcdd02263df300acc3afa66922b64a6ae41ebbcd2f
+EBUILD kalzium-20.08.3.ebuild 1708 BLAKE2B c971efde3ccddc4d282acd81258a9173dd6fbf68238b79c7f22171a485ab1707c28986355e4c874d9b84728d0586ec747dfaccc08b5b569413f6bfcd7dd79b42 SHA512 e0eb830d4cd6a1c57b0ab3653b95ae7a3e72a6a997d38faa24ce15ec682a3bfdf46acee74638a645f1bce2b2f8c8eb4c3e9c98713b23f046eac3182325ef2f36
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-20.08.1.ebuild b/kde-apps/kalzium/kalzium-20.08.1.ebuild
deleted file mode 100644
index f3555e79c6ab..000000000000
--- a/kde-apps/kalzium/kalzium-20.08.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kalzium
-https://edu.kde.org/kalzium/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor solver"
-
-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/kparts-${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]
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(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
-}
diff --git a/kde-apps/kalzium/kalzium-20.04.3.ebuild b/kde-apps/kalzium/kalzium-20.08.3.ebuild
index 33b080fbf333..bac5f26501d5 100644
--- a/kde-apps/kalzium/kalzium-20.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-20.08.3.ebuild
@@ -4,13 +4,12 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org flag-o-matic
 
 DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kalzium
-https://edu.kde.org/kalzium/"
+HOMEPAGE="https://apps.kde.org/en/kalzium https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"