gentoo resync : 15.12.2019

4 files changed, 41 insertions, 35 deletions

diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index ffa2a2b25c38..5581f21e5ca4 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
-DIST kturtle-19.04.3.tar.xz 1827296 BLAKE2B b149cc81f8cb1cffc1124a9817519223c63103512c70f6957ec2faa08a1b24986d07fc1d1045a3a8c36a39b42796e25c2833fc36f6d3c4e248505722bb3f7599 SHA512 f5c376175856b2e8a851da51bb7fd49bf6efb17040ff8b6b2cf799156fddc22736f595b3caaf462694264a072b2c7ce93fa68bed286bc61cb6da7ce8a48977fb
 DIST kturtle-19.08.3.tar.xz 1829196 BLAKE2B 6b6fc4c681dc61563eb5f17cdd0b4a69f9458f035875c487723f388d7e154017d026bd1596e31748aed64848b7118347bec047971a84d0edb35270f59308b07a SHA512 2aab0d607b27561f377dd965351706c1fe49eca49f5e57a816f62311ea38ad7bb7c85f00ff71efe6b30edd6bb2798b1e5814e3d3708dffedb0f64c1fe173ec1c
-EBUILD kturtle-19.04.3.ebuild 843 BLAKE2B 4d8b479d814be1ee4b6ff69a8e339475c3472d93f5b4df44946a88b7027c905fb99b91735eb63bc3e66d417bd79fc0dd8a46ccda587f173045309c9ba64fccca SHA512 60c173152c424c4e84dd1312bc38049ca419980baaa0abbd7a0406d5d2b36fca92f9f36596949514a591797989ccf3fb1f83fd9818e1faa23db48789d5d5b022
-EBUILD kturtle-19.08.3.ebuild 1008 BLAKE2B 1fe53069fb9c4250d6566e7c829aaa1f1b6d264626a9fb1bbeefd5d8b2cc84b6eadbcf9155063562dc896406a4420461073c64b0ecf87f3a3a45d50ff103c023 SHA512 406fb6f55375306e57d8782331190b9abb9e47711c5b3980cef98028dcb286a4d029aa07eca4bdcfd07bfe8a76b783da3e04bcd2f81a87255be3363148f6e2ff
+DIST kturtle-19.12.0.tar.xz 1829452 BLAKE2B b454d6156bc3c3cc68fe0f9d20f0ad52db3e9dc3fb47478af9dbcfe47e5c8a61c35b6e45c0745192cda4101d46fc63fd490f5a6d494c6a145c28c202f3c6f401 SHA512 96af2300230e5db7b8221e9323fbebcad43c881b14b2a5426d0aae509518e008fd04dcd8bf8ed55c754bbfd811ef027f9f53939529468559651211ca90ab08db
+EBUILD kturtle-19.08.3.ebuild 1005 BLAKE2B bd3d8b7193206a653593e5dd7f2efc48a7949ee7d9aa5d3dc0d1769571bddc906c393240d3e6833a5d47506fee06f93864fb5efa29e4edff9276bca866e5e3e5 SHA512 0ecbc130802da63f41be25723fbf79cff9dfbd329c7aaafb566a40c353d461197a2090d7dd838f5a8452ba686daa14b0b9d748d6063d4ee29f79c04b3e908cbf
+EBUILD kturtle-19.12.0.ebuild 1017 BLAKE2B c4e850f43bbb8eb1b1302150c5dd235cfb7228dc25b398d16d7fe1d7d5faf7c8e5acbbae8d0aa743e529ba5e4c89346cdedafb505e229725a4f9e01e346e9fac SHA512 bf2e3f5e1a6951da429b9f315441eceaf7f3bd840641379006838a15ca66bdc8978d3981992214cfbacc77d74e7102e706f9f3d1bbecc9b1841f320ea0e7310f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-19.04.3.ebuild b/kde-apps/kturtle/kturtle-19.04.3.ebuild
deleted file mode 100644
index 53de2f053e76..000000000000
--- a/kde-apps/kturtle/kturtle-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-19.08.3.ebuild b/kde-apps/kturtle/kturtle-19.08.3.ebuild
index 0f75266ef007..c092a806f31f 100644
--- a/kde-apps/kturtle/kturtle-19.08.3.ebuild
+++ b/kde-apps/kturtle/kturtle-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Educational programming environment using the Logo programming lang
 HOMEPAGE="https://kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-19.12.0.ebuild b/kde-apps/kturtle/kturtle-19.12.0.ebuild
new file mode 100644
index 000000000000..294cf448819d
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kturtle
+https://edu.kde.org/kturtle/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"