gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 69 deletions

diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 0ec6f4435f25..068259210b57 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,3 @@
-DIST step-19.08.3.tar.xz 869880 BLAKE2B 29efdd4b38df7e171a02102459124b33b4c3e6fc7bf2d07db35f76e298226a7417922d10c459fcaf6b07c42166afa0c216067ce711667ebee4460bc5ebf4579c SHA512 685529b065d46cd6b1fa0fc29c71177763c8dadbbe541795766820d6797a0902b0b51c5bda58ad23338c573368e2edf440da4596fb877d175c06f3ca362fae74
-DIST step-19.12.2.tar.xz 915052 BLAKE2B 7359e6749e0cdb454e3284babf4e8789e3f7e5ed8a04e8bf28829a8443b9f8ab43016f2ef1539079a2e1b0d963253b29fa73557d72abcfc70f1281bba65a15df SHA512 81378ea5850369c3cb6c72d8830cfef2669cbdbba4753cbdad9410ad0667a7711685d0042fe9acc47895ff441ad70dba460767c4b6f027e539b3c9a0a8c1c707
-EBUILD step-19.08.3.ebuild 1603 BLAKE2B 32f5c6f687042f65508a5b282b8abe080d5461f2d7e207f0441379f6d1701953b3eb00b89a7637273d0485d76029557f61c732817c268e7b04fedda4ead77311 SHA512 281f063df7e525c793aad035ded4775f6a2b8dbb83ad526e25926eb914c2a957003626bf5da8bde10c4268cc034c0b1af153e71d5b0159e11f7b9f5b47f56be8
-EBUILD step-19.12.2.ebuild 1624 BLAKE2B 374971b8b8fbd4e07318eac6b0a0dc060e1e4a7c402c4b937c52a84ddfdced2796e6599e0aecb45b245ba84e61bc41127511ca0e23dba5628b8fa95adf4795ce SHA512 218951652fff9d9291bb813d4c82382cf2e4294fdac38077d2fe6d298cb6c3a452d4e3f3dd25667e85d73973ba48bb6768f59b440433ccfa97c46b52c2ccb4f3
+DIST step-19.12.3.tar.xz 915748 BLAKE2B 43a032bd68ad2278a0ffee22412d4e10093040934c5f68f0680164a9c3f2883d0bb826730b472c40f03b0d31b73c1792c59cb319e0645d4df67ff31e29e4d15f SHA512 af8c67a0e6678461a2536a7abdc7b27d1ed4d172bf838414c29c47ff4ed42db5e32a2c6394bfa704d3bd2de04c4186fe608da16aa6e13414de26555cbf4cd7a1
+EBUILD step-19.12.3.ebuild 1621 BLAKE2B 5d6287bfe0dcf49415f3ad44cad4c220a7519045247fa0c84fefc449c1dfbc687157f015c91e09cfc68920eea3a37e5a263324731f11abc5262cc265c0c41161 SHA512 25e5d21e54c154124b81106c060a5da56e82ddf226c4a00621e2e8b94948f5900a6239eb6ad64a24c8f19645cf7ce1bd1029ea54249277da8cbccbb36b90e6ab
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-19.08.3.ebuild b/kde-apps/step/step-19.08.3.ebuild
deleted file mode 100644
index 724db3cc44b4..000000000000
--- a/kde-apps/step/step-19.08.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="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="
-	>=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/khtml-${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
-	>=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
-	>=dev-cpp/eigen-3.2:3
-	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-19.12.2.ebuild b/kde-apps/step/step-19.12.3.ebuild
index 9457033bdd13..8c193573bcc5 100644
--- a/kde-apps/step/step-19.12.2.ebuild
+++ b/kde-apps/step/step-19.12.3.ebuild
@@ -15,7 +15,7 @@ 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="