gentoo resync : 15.12.2019

5 files changed, 40 insertions, 63 deletions

diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 324d13ede7f9..2b25978a9d11 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,5 @@
-AUX kaccounts-providers-19.04.3-missing-header.patch 684 BLAKE2B c68fbf10b772c4e9a2ea84f5f571349a35db4f8417fcc8ed708d51ad7ac084175ccb2067bb36204e65b0cf8464653a8d0222a11e2da8365d6731d0725237f640 SHA512 a659ed6c206cdec0dad5c039ede2dbbee171888e1b949842a3a9c52083145b0d5ad5a520e014bc795a4461eedc2f6dd211db2de71fb8e0e4e297587b8e6a5d24
-DIST kaccounts-providers-19.04.3.tar.xz 31984 BLAKE2B 78d9cb9975a10cbff5b33a148e86685a812950e92a4d4d59bd11d85d5758aca3bc6632bbab0cbfbf42c9976ef9e664ec571a9770d54b1f5f7ef05c024e34c241 SHA512 e22e0747cd9d14bbfb8607e1de127343e7ad9d84a9420a168b0b9e37a3dc53770ba0fb1ebbab01d08f0b4e0754aa7f7744da5de3e3d6615eacdae27d5d649480
 DIST kaccounts-providers-19.08.3.tar.xz 32104 BLAKE2B c8d23fa7a7ae32caef2ac8ace2efeaf20e41a70b424009d2ab6c4604c817f4910d2400b21c3030cf66f17fb27527a3b81de3c801e38e4aa6bc4fc8526a8401fa SHA512 bb8e6a409688ca7a31ac802ab75e796eb161b9f4495d1ba1b9c3c5aa2d836b917f4549e81ce327ea157f5f19d15fcb0c50c079be49e114dff897066ae3fa1e06
-EBUILD kaccounts-providers-19.04.3.ebuild 693 BLAKE2B 1cb5a56dbfeb63a7774c6d18541ced207ff6567b31f098d05381dc937ef484ea265c1cedc14e53aac539e4d3686fb62d3d9044ddf03cfe0affde63de164e0c93 SHA512 9003d7e0c8383a6e47f10b03396bb185e22a07816625e11501482e7e60e59a1eafc4d5afc6ae60db4ae0524a8fc7c96ce5759a5296fc9437818d4077ffcbbfbf
-EBUILD kaccounts-providers-19.08.3.ebuild 757 BLAKE2B 9012afb9c856f7dfbe002689089bc2b251103aef2a3257adc08099c052be5aeae45ba8f757ed3311f3eda564b7e609580814ac8e623ca695c4fb0036a6cb9d70 SHA512 d7c0f679ea51fd9537807b485b61f2c06dac2be308ed68d3ced524f37e5f79e18ed474081aa8860e28819582dd5b5ec2dfae1024d4854a8bbd37196875db4697
+DIST kaccounts-providers-19.12.0.tar.xz 32180 BLAKE2B 1591368416dfbb9b60b3f368b6f230266f00908365084e7b7e9870ce5dd361f312ae39053e497c168723a99443b990c62ceb20b35e6a6c3ae70e862d8ec7f7fc SHA512 0bc9be70592f7e9a4e8eecf771f86bc89201a97627e177afe071e8581b1ce5c04a304dd3a0f0667e120b7a32b8d6f34558fa42d03460080c71ebfb84800a4278
+EBUILD kaccounts-providers-19.08.3.ebuild 754 BLAKE2B 3293c84ef37627c0a00b7173b7307cedf09721c16ab0f4b09085fa47740357fa9532ce168b10e71adf7984d23e82b70d43dc0c915df3b5262e4df7276691bf03 SHA512 af3437c0b702eccd11487a125cb3d103800cbc48ba4c63e8861198cd29264812cace6f9d8956a9bbaed1d22480f53f0bdd82597f450cca23e57e0778f50717f7
+EBUILD kaccounts-providers-19.12.0.ebuild 757 BLAKE2B f06e79269e311a862b2a80bcaf7eeac231bc058ca986b1b2205123dde89f58b35d0c04fb5128f138740f79d597f900277cb4d57980abda79c9aa532e314a59da SHA512 2c179e113f2c90bd3d35de5288b65cb54a861287dd3f60e04384dc74f30056051677868a7811a7b89a070fd320e19a6240f80b62f23dc316633686e3897c80cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch b/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch
deleted file mode 100644
index 162fd681454a..000000000000
--- a/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fd6b3ebfa73782de44f952f95394a6cbccd74ca4 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Fri, 9 Aug 2019 15:28:13 +0200
-Subject: Fix build with Qt 5.13
-
-QWindow include is no longer included transitively.
----
- plugins/owncloud-ui/owncloud.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/owncloud-ui/owncloud.cpp b/plugins/owncloud-ui/owncloud.cpp
-index 4330871..423faad 100644
---- a/plugins/owncloud-ui/owncloud.cpp
-+++ b/plugins/owncloud-ui/owncloud.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QQmlEngine>
- #include <QQmlContext>
-+#include <QWindow>
- 
- OwnCloudWizard::OwnCloudWizard(QObject *parent)
-     : KAccountsUiPlugin(parent)
--- 
-cgit v1.1
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild
deleted file mode 100644
index 8bd58fca12d2..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-"
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	net-libs/signon-ui
-	net-libs/signon-oauth2
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
index c1a57e6b012c..89d256e2f5fd 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild
new file mode 100644
index 000000000000..3d78ba1c09d4
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE accounts providers"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-util/intltool
+"
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-apps/kaccounts-integration-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	net-libs/signon-ui
+	net-libs/signon-oauth2
+"