gentoo resync : 18.11.2019

3 files changed, 47 insertions, 43 deletions

diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index a75097b7cc2f..9c7c2338619e 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-19.04.3.tar.xz 5652260 BLAKE2B ae87d7c345946be755dd95283f2c44d7367af7e0a49aee12ec2351df3d621691b1e6321c1e38008a6ff298730a8e3af3154fd8b7464fcffaf66c3a7046174b25 SHA512 bc9a5f081cd50b32b651dac12a6d2146f63788dda6cb7c8fe1c8f6ada99d422e13e0f9b512f8fb6e620ce70a63baca0a44bb5a1d94f0f90d3c0c4aed3705332b
-DIST kolourpaint-19.08.2.tar.xz 5655368 BLAKE2B 25310ad61a1e652457132be11e04ba043900acfd38eaaab49798d4d07e60d5f140962bd9cc27cdee2c883b0f4d7522da8c199c9b0b82b769306986790eba9d78 SHA512 beaf80f8cdc13f23ad19e0832fdb7d95d17fa11a84137e0d2c84c8f5fadd57e4c6cfa03583ebfa52d2c55923dfd9802362f63e04e59829ef205947033b47590f
+DIST kolourpaint-19.08.3.tar.xz 5654752 BLAKE2B 24a2700197cdec75201b0a51534ee5b14b13c94db82306161319e89db1ea189463e9ef8884ef9162195ca8c2c14ae073244dc6cd85b5c22045fb8905daa3c909 SHA512 97430f2a04d60bfe4d5131e961381b3390181a57cc4b6ca8eda048b60a32804dcd89fec5a69bc50383f88e1bce05a5b7a1dfde33292d0e72f6bda76cda0dd851
 EBUILD kolourpaint-19.04.3.ebuild 1048 BLAKE2B 8d209dbea8bfa2ed851d973c42f785ec6b5c82629428b077dce7a1595b0f55edbb49560b88ddd8292dc4a72e9da20492b35d7cbccb4ac2c103cb9741744e1fc7 SHA512 9294001a1ce2521f432b2b43aeb54382f97bfcb3a7280b7b2a86efad2204bf1eea0c3a839f12b1f8378349e63c2fc153a0892d8f84d263fe2a9de77c3e074a65
-EBUILD kolourpaint-19.08.2.ebuild 1051 BLAKE2B 5feeb360b49c436df12f080a47e847ad8fa04a5013c231f27ba10b5cfc084229df8586c0011eb7ee761aa2bf97346684e1c89fc31547869337b72434b61d13b6 SHA512 e5f70d737041ef65ef0589de38d2f69de8f86a563f9b0fce4e8d920cff60a66a2b6441a4395d8cc67b22f8faad8721ac2dae158d5c2e808f770380896f61132a
+EBUILD kolourpaint-19.08.3.ebuild 1206 BLAKE2B 7fb818cfd4bd648c69b5b173bd3bb2b16097750c41b89073c377a2c869246b12427926f4f91848310b1274498ac2fb23141d2b22d3bc3d1a9909e311b853568b SHA512 ca5e2d2330a55ced466be2c29802cf77dda2abf3ea7e4deffab69cc90254215b76cecfcee097a997bc87a12c5f2eef059e012ad3d544d04269b169b7d823ccb3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.2.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.2.ebuild
deleted file mode 100644
index d36c8c7865a0..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-19.08.2.ebuild
+++ /dev/null
@@ -1,41 +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="Paint Program by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/kolourpaint/"
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="scanner"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
new file mode 100644
index 000000000000..0524d9a1a609
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Paint Program by KDE"
+HOMEPAGE="https://kde.org/applications/graphics/kolourpaint/"
+LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="scanner"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	scanner? ( >=kde-apps/libksane-${PVCUT}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package scanner KF5Sane)
+	)
+
+	ecm_src_configure
+}