gentoo resync : 18.11.2019

3 files changed, 66 insertions, 62 deletions

diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index f1014830c8bb..1e87c05107f6 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-19.04.3.tar.xz 862920 BLAKE2B 63fad0cb0d22c60220d046773c6f717f954eeaa5a4e2cd8fe6e40e34d361dd3ff7bc9de690cdb7ffd9094c9eff295fbb424ab8a97cae043e54b35809ac2db162 SHA512 d67df9dcd8c84c1358ef0b531808e3515749c255f6fae38a54b5656256bb10ac0b508836ca758baff2b4b3d3f47c736122de29f4f50a7fee72e91e17e08aeca1
-DIST step-19.08.2.tar.xz 871208 BLAKE2B f381987f9ab1fbef8f06f7771c6d3172ab4b3e9538e913270e27d14d512f3bd4fd138789bc267ee601975fd74c779b45957f919b04464433d5a0dc31e8138c37 SHA512 8f2a90ef74bad6a3b73470f0342269da2dc6d53f2ce05a14e13762c02e2ff28f621d821f31fdba9733cb0a7cbe0b3ad099e3c36cdfe2198dd50106eaea63b8a6
+DIST step-19.08.3.tar.xz 869880 BLAKE2B 29efdd4b38df7e171a02102459124b33b4c3e6fc7bf2d07db35f76e298226a7417922d10c459fcaf6b07c42166afa0c216067ce711667ebee4460bc5ebf4579c SHA512 685529b065d46cd6b1fa0fc29c71177763c8dadbbe541795766820d6797a0902b0b51c5bda58ad23338c573368e2edf440da4596fb877d175c06f3ca362fae74
 EBUILD step-19.04.3.ebuild 1419 BLAKE2B d777ac10559edee96a4da72fd4f709a0a82a931a9a4d9c6be83de65b15d14e7dcabef991262d7aadb734993226150e420ae2168b60fbf4f0245aed9ea5fcdf42 SHA512 1ddc66649dcd0d039b096dac9a0bbee6b3d3c96b0e9a1e9eef560b4a4f3fba56888c7038c87d184b4fbb38d62bf64b7693b731061f7133022ba38e42d0411586
-EBUILD step-19.08.2.ebuild 1422 BLAKE2B 2077eaa0b42bf3bf3885107b7676ab9fcd50c99dd58270d1c2500be8d328ea4243bfe186bb7918c32539cf9fe356e4cd51fd3a0447fc8b37c50cff0609adf2ce SHA512 21e96e7e7146f7b353f4d70831c37487fd1d02766d449edd033cc124c4d6e895424a0612e29ab4084abe453f8932735318c3d73320a71dfbe5a69a544663b5b6
+EBUILD step-19.08.3.ebuild 1618 BLAKE2B 642eee7a6597815d6b76b307153528e302a1429f0824eee4bee830b1f0e1c4f2ac9237359d54a6a2cfc80eed6609d215d06d3ca247dc0202a6b1f81705d68d5e SHA512 d0a63019da69027b6f843444772b55eabb736e305a6a2def7531872796f6e5f8027198bc5d3c1a02adffa162f96c4d6f4b3477d2cc4ae9fa0a4df6b7978d642e
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-19.08.2.ebuild b/kde-apps/step/step-19.08.2.ebuild
deleted file mode 100644
index 0c8734816df7..000000000000
--- a/kde-apps/step/step-19.08.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+gsl nls +qalculate"
-
-BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/step/step-19.08.3.ebuild b/kde-apps/step/step-19.08.3.ebuild
new file mode 100644
index 000000000000..3864e7b04a04
--- /dev/null
+++ b/kde-apps/step/step-19.08.3.ebuild
@@ -0,0 +1,64 @@
+# 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-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	ecm_src_configure
+}