gentoo resync : 18.11.2019

3 files changed, 55 insertions, 50 deletions

diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 6bef95522c3f..bc3f91462c9d 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-19.04.3.tar.xz 2786024 BLAKE2B 860b38d7412d0f4b13de1160c39c2d96398f736a0c21cc88d48c4ad09041ed3da5ac8d28ccf95badb4bc5904cc5f3c390a4569dbe5b65a562b3e3f2c4bafde55 SHA512 b9062896b9f90c52535ada3fe66a7b4f21054e229829217b1d8b2df00571ac483c0c0eee464e996b4f66edc3c2fd56e2f73fa76824f679eaf8fe69d3f200f1a9
-DIST kgpg-19.08.2.tar.xz 2786968 BLAKE2B e73a8eabbf24a8a657e9a0bbfcc5059c9f70e82dea9c41da0c19116a34a12b4ac4cac2a9ae1887abd5e964b1f988753c34c467da9b331dfe3f87ac666face3ab SHA512 c6dd268fc3e007d4e4fb93317b64606e2b87299352a460f9c2889f61d9828dda93c6c2767e4a1b787fb62fd3b0288eccb466f0e08fb89af6fae845d2bff38654
+DIST kgpg-19.08.3.tar.xz 2786856 BLAKE2B 38efb63afabb7f757fb76daab61ffff97e7e3a419bb2fa79d779f82d338be8a52eabdcc15da718347ae8a55fbab639f0d2814d4ec38593e830a763013c3449fd SHA512 fc4aa8bd94ed1e11790828a0a38f03bb36b3b866d7702a92dbf6a02fab87beb48997eac1e077d462456aae23182cc792a383b37695b3e6cec16760db494352db
 EBUILD kgpg-19.04.3.ebuild 1275 BLAKE2B d8689bd627beac45d7fbeb6f70790074ffc4ab04b34cf05c917d2a76e0154c32327dc013c74f6fbd1d0ecb93e47f7436712232a5e0fd8bec37e30d297ccefd2f SHA512 854676b8f8c86e159188bac38ed5cdbee9ccebe32c44c65bbd6368e8d6da7b9a286bab8eb3efdb46632485b35b552bc1e6a00732365b8394e2ae5f7d672b70c2
-EBUILD kgpg-19.08.2.ebuild 1281 BLAKE2B 5d57fe54680a84d6fd5a8df0bf54341f59e4ce5fb7075659229dddb3a0e233742bf4a56d7f25761bd231d30cb6e3eb0c4b69111074bdb3ae79d9a3782fb73dad SHA512 57cc0541951419a7d3d6ed9fa11e9b02617eefd530542b4401cc4f6b1aa736fbe80aa8c777e432f08cb0ca959b553ab8124400146a0bd594b4af2c62526a6bd2
+EBUILD kgpg-19.08.3.ebuild 1518 BLAKE2B eb91a6338d17a9d448af18fe32c261a5d4d0330ec762685a9057a733ecd6aff05508cda90b337f9455d93e22ae9733128f178189a18c7b139f68068669d4eb5a SHA512 9c50c86e670fcbe55dd18317331f680cd7cae91a416af73ab9eebc4407c67d49471459b479948735b406b4b296ce96ee21fab31c9c7611173448028de3270b37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-19.08.2.ebuild b/kde-apps/kgpg/kgpg-19.08.2.ebuild
deleted file mode 100644
index 9f966c0c2551..000000000000
--- a/kde-apps/kgpg/kgpg-19.08.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-19.08.3.ebuild b/kde-apps/kgpg/kgpg-19.08.3.ebuild
new file mode 100644
index 000000000000..f1d68658c3cd
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-19.08.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"