gentoo resync : 25.11.2020

3 files changed, 6 insertions, 74 deletions

diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index ea19c7778925..cd0c9011583c 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,3 @@
-DIST step-20.04.3.tar.xz 929364 BLAKE2B 273fce857039052832d1e5a295d9387a0021e847bbfb169ba88ad5c9f0b849ebe494d56a7881184be07912aee3708536c435b08ff1451927d73c701faafc6c1c SHA512 1df12a6994a0f3e62bff837fc8e0ff8fc9b4afb651f51ee1e14e4cdc80905fc21d7a9af540433e0f97a7040e2ed4968d9a81a4f868bb46b07c0c7ad1efb21f96
-DIST step-20.08.1.tar.xz 942732 BLAKE2B e8dc6ebc9649615135efcd195cd9d9b99915eb7b8598cc548cc8d0eff96b3b318499c4801670a1c0c5e7e5cb6179537050419c643d231e37913a23e08ae2ecf7 SHA512 91b28b5758bb43a28c7cc891c48edef3f8efe7821cf37cc501907c373d05ab40080d4e66199b436efc16c117063ab7d6951e9b3b3855d832e304935d6e7be4b7
-EBUILD step-20.04.3.ebuild 1621 BLAKE2B 211bfddffaa7a3f39940591780162f7969fab239213dac8f2f58da6715a2aa76564d48e7eb4a9752e51b8e05f0c13f784e7261948ea53371e561495c24aafb8c SHA512 2e80237c6aa63c03aa9e8cff69fef09bc705854cc039bfb0c6825dcfb08b21e7b104c09a54d776d06ca623e1a79432798bd7352a73041811933a07852101b606
-EBUILD step-20.08.1.ebuild 1595 BLAKE2B 5f01c11aa642ddcbe5fd877735bf03dff2219668993926df44022d9d403b4b56b92d8ce0a0521e5f6bcf13ac23dd9f46e4a8106b5e5f89cd5c2add8193c06791 SHA512 a85141c26cad296f5a79723126ab39c830a4b514eeb562c8dadbb4ff3b91d25923895a4dc3991135f744afb0d429ddf9b10c9c8d6308793d4cf95559644c8e14
+DIST step-20.08.3.tar.xz 952000 BLAKE2B f7d8aef7a59bd8b06816b2844ec963d1ee24389f43643b2ffabccb740dc8daa9715ba0a239861aecb27b07d4b3af9c5a1de7f8180347144a4f4f3cfdcc3c932a SHA512 d75d72afa0706676740bef46ef1df097f851e83db4886c8410e1a33835655108325bb79f61802d6733beb733af0a2ab6db9423888b01f5d779ab4402ae02730f
+EBUILD step-20.08.3.ebuild 1569 BLAKE2B c5b4b308b3e4a4d4ae641f09577271975abec4a299185633f71688e55ad9f58acc4b2d57c6a8283e26b9cd45b63d40c9a45c8bd79927dcc177ca580188946421 SHA512 9f9482864636fcadd3f48f75d8b8e367ceb618ee6096a344b03c0ca9b9c02bbcf6d8809ebc655e26d6d6ac389d27bc8ea96dda746a170cffbc4f5ca6ac290491
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-20.04.3.ebuild b/kde-apps/step/step-20.04.3.ebuild
deleted file mode 100644
index 49bd6ad930eb..000000000000
--- a/kde-apps/step/step-20.04.3.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="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://kde.org/applications/education/org.kde.step
-https://edu.kde.org/step/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gsl nls +qalculate"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-cpp/eigen-3.2:3
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kplotting-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package qalculate Qalculate)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/step/step-20.08.1.ebuild b/kde-apps/step/step-20.08.3.ebuild
index 2506eb4b5712..95fae9a388a3 100644
--- a/kde-apps/step/step-20.08.1.ebuild
+++ b/kde-apps/step/step-20.08.3.ebuild
@@ -5,17 +5,16 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://kde.org/applications/education/org.kde.step
-https://edu.kde.org/step/"
+HOMEPAGE="https://apps.kde.org/en/step https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="