gentoo resync : 18.11.2019

3 files changed, 53 insertions, 48 deletions

diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 6b838c7e3111..845b4d114cd7 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-19.04.3.tar.xz 8816536 BLAKE2B 7e3ef26f1cf3f1ff4a6367d088a05c4404b4efb2ab6a1662cfa9e5d853c8f3f6e14b3ffc94061b8808eda618fe0d21c7a3ba1e53f71072260b8f2df62aac825c SHA512 cf3a8f86a48d8207b4ff4235edc841bea34cb3588f0b09a6b233f1cb312a8b77907de4dab611d0adfa5eda932dbb64ddba349a3479f7d394237d61aebc401bba
-DIST parley-19.08.2.tar.xz 8831840 BLAKE2B 7dfb4dc1d1d3ac3c9c2f9c959913c6e5edf77ac566ec5b662d033c7c92202b6598397709bbd138a0db81c9575281f9973912f6c40e093dc6cefe52e33de113c3 SHA512 a87409f6bfc0da0e5b78c49860df93e8dbdb4a9bb73ca1cdcc1c73a19ddc479473cce1d89805934dab1100b0f627e6c551fcb3d4892e4793a4ca038e24453be7
+DIST parley-19.08.3.tar.xz 8827432 BLAKE2B 2657373f0cd855aefd898edf8c82f584d0f6c7fbc85e379336765a5334aa476a0f5f76b28a14e19b4ff797a8e552288d68d566158a41774c96ea9e69d56df4ba SHA512 5a8ede27d2a0612b1db3f0693e9f1749c6c20394bee4ab1cb1dd8fe41aff5d0c1c409f6be8d91dae3f540301aaac941d99c14e6fbfd8ce9e56e85a83c89d344b
 EBUILD parley-19.04.3.ebuild 1254 BLAKE2B 429b7913dc3896344df7b67500387bcfc51a639640291876a0b40f215af5d1c83710ef320a94b52964bbb8967eafb0731aa23dd00ea9a3af022ca526ff00230f SHA512 9b4c48747bbbb94995e4c0ebef12982e26b0d0fe78e2177d46dbcb9e3b5c7f0e00b37e8f7c315230b3340300392b482fe241a95e3a25fcbfa06dc5ed99ef8459
-EBUILD parley-19.08.2.ebuild 1228 BLAKE2B 02a109163560f3eccf0c103d3c0e3676f21ec5bf144c431dcfe87237df1999135aa4b80fd8b6ab9aa8fcc0291bb1d9645433a20e811dd41c9d272365403675de SHA512 f7c9b692b72b7e5529a0bb180af3cea3f858919242878d576f5362cbb9d0a1cad127b511b81df70ceed6c719696dff74ec324fb6e6187334c09b7d2a5d22d476
+EBUILD parley-19.08.3.ebuild 1469 BLAKE2B fb93dd02d78628221642f71aa76280f769f0a06336d5238956c8dec6e760d1df6a2628cb8fb71988843a29bddc1bfd0131e0fbb99eb6d6822074629824d015a1 SHA512 9abd8935c745c6f71825e97aff613e61c10b155cd6db1975477af3c297c3fb2ec254df7649fe01ac0c4d7462acd696441c6effa424736b6b6d59e1dbce474298
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-19.08.2.ebuild b/kde-apps/parley/parley-19.08.2.ebuild
deleted file mode 100644
index 5b295febf83b..000000000000
--- a/kde-apps/parley/parley-19.08.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(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 knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtwebengine 'widgets')
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"
diff --git a/kde-apps/parley/parley-19.08.3.ebuild b/kde-apps/parley/parley-19.08.3.ebuild
new file mode 100644
index 000000000000..2d94cbb2ae5d
--- /dev/null
+++ b/kde-apps/parley/parley-19.08.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}: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/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-apps/libkeduvocdocument-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdeedu-data-${PVCUT}:5
+"