gentoo resync : 15.12.2019

4 files changed, 52 insertions, 48 deletions

diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 8afe546fd6d5..e5f4821169cb 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
-DIST artikulate-19.04.3.tar.xz 3986260 BLAKE2B a0ffe7a8193718d4a51f0a7c51292cdd9312d2ff4779d5436fd906dfabd3a54159918f7e27a4d084f3ff6843e7e102409a3f152e9569240be918374ef560c5eb SHA512 b61cb3514839c9d6af09f8be950528ff08cab827c27e338cf92972aee7f8811032113f0fc8fe1b5cabe11b4ba689c7d10870a90fdb830c32fc565c879adfc939
 DIST artikulate-19.08.3.tar.xz 3998692 BLAKE2B 77849480349e3edbd6b6a98884cc25b28ab6246dd36991f728659d9535f751ff68a13065fca4c510d96b87bfc12982f8c911cb59de2ef13ef33886d8ae157334 SHA512 2c27d37462fde6fe4b1b68efb96f71e4ee4b88c2685274872cad44a264a46a98bddc143d2074b3ccb0fe214a73abd54de204a52aeeb0ddae150a55c0c08ffb8c
-EBUILD artikulate-19.04.3.ebuild 1124 BLAKE2B 42ecf7dd97280d34a589e9ae74d04a0e9b147e884b4ca615dbd4180a9ec854ebbd0f0663264472ddbcd734269cd74838ee91f129f1b27c18ea6bdebc00505a4c SHA512 695aaccdd37cae1d0d68d18fcb2c359dbf71fd3302d87c8d6678ba1b3f606b3ba5b016a70f9baa1f5a4b37f688e1944371b48bd39a2a6c47f86fe0882df44d27
-EBUILD artikulate-19.08.3.ebuild 1294 BLAKE2B 7b732dd7a0d018cf81493b5e9d7b79057e9a3e1589730f9cf471fa954afb53aa691a645be99b0a3b2045f143872f4c41ff0fb83493eb1c0877cae4664aa93689 SHA512 f2a9dabf101132cbd27267dce43585d0da83e6bb9786ba25403a290d81f4301e43916a9ea80bbef8ac6e4c035471f4098a7a9406d2901351538c74917940f43a
+DIST artikulate-19.12.0.tar.xz 4008004 BLAKE2B f449aea6293dc101b99f2236a812ea69569a8ee2439e54c1d4f40e0d2cccdf2a48ad3bb89fc39f4e336941a022834fa732e202927045d6a19ea76606a0deb31d SHA512 3c06b2764812cf4f816a75b47f30e45a81b65df82a554a9b52c1116dd3e6e8713e16dd03cc3ac843d1419c55300c8f21c985ce05b27d76a6d2dd49d06080e802
+EBUILD artikulate-19.08.3.ebuild 1291 BLAKE2B ec41db6f49861a90732a61b1106333ecf8dd80b8cf6cbeba7044ea46e46c7ea562dc8267a0046099498dbd9ef9af4e7b44e8bb43bed27b89912bd01ce8f5d15d SHA512 6728ea8ea58fa5efd63d235a1f4641f21c7bc4fb2e0aa33efb86e73f0df5ec7ed70681616c98c509fb1e97cfe7816626c50cf6cb386c76bd84c3d0875432b28d
+EBUILD artikulate-19.12.0.ebuild 1263 BLAKE2B e17523d759ccab90c3062e6660a2d922be1fa2daf4bed79a5b377c5c8e6d27c34a821c7b3be8b0050a8fe83cd3fcbfd9f04585e01a763eebe3178d83befa3d31 SHA512 69d1b0562a3a3d37a67e2edb1bad7446d1b23bf48b3992a83a0b998ac37c7aabdbbb6c9416961467101a20fbcfa0b6489e1a7f7273ea898a7f2bd6249e1f223a
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-19.04.3.ebuild b/kde-apps/artikulate/artikulate-19.04.3.ebuild
deleted file mode 100644
index 72be6e1f3808..000000000000
--- a/kde-apps/artikulate/artikulate-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-19.08.3.ebuild b/kde-apps/artikulate/artikulate-19.08.3.ebuild
index 3eda6c9272af..283725ca9839 100644
--- a/kde-apps/artikulate/artikulate-19.08.3.ebuild
+++ b/kde-apps/artikulate/artikulate-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Language learning application that helps improving pronunciation sk
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gstreamer qtmedia"
 
 REQUIRED_USE="|| ( gstreamer qtmedia )"
diff --git a/kde-apps/artikulate/artikulate-19.12.0.ebuild b/kde-apps/artikulate/artikulate-19.12.0.ebuild
new file mode 100644
index 000000000000..60bb8abecd29
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://kde.org/applications/education/org.kde.artikulate"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+gstreamer qtmedia"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+DEPEND="
+	>=kde-frameworks/karchive-${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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
+	)
+
+	ecm_src_configure
+}