gentoo resync : 15.12.2019

4 files changed, 52 insertions, 48 deletions

diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 78d25b8edfe2..4f2317e7a390 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-integration-19.04.3.tar.xz 71276 BLAKE2B f31ad7c6d0f5edf7ec2fda72c5e16d064e02dd6b1b08c0ade58bd04d6c597e0b41b48cee777a074abd5007eed28025ae3b0622469b32ee2db13f92334a5cc8d2 SHA512 19e25869fdbb086d0619e49ed3c2f893ac462e9ced6b5faa50f9935b448461fd3cc6a9a3f646f4563a798e573f7b441f1030d4ab38e336dd7f36198deb3ffc99
 DIST kaccounts-integration-19.08.3.tar.xz 71924 BLAKE2B b4c6fa383c053843c0b6529d33e8bff7f4fcbbef20287c6f102f696b1ea833e35d889342668d0617fdafc63663ba3bd47ee6178dafe1b76d8e486f8e8c3e92e9 SHA512 f1e7a1c3959b6739aeba3ab8a2bce51116b1b7263951cb55931564f2628f0fbe7eaa876dff9a4b7a4c6846853360293e5949297d4faf5d6a739579bf29245fd6
-EBUILD kaccounts-integration-19.04.3.ebuild 974 BLAKE2B ebee9faac992e21062c774937a3587acafca2bb066b84054ed417c4308c3fcb94ad359a209d0abbea20faf90c12453676976ef12b8b8c6e3952ed7026ddf09a4 SHA512 bd78326f8aeb718e6a8aac2a57823954b1d481296fdb591c2a00d080d93c074928121968c099baf20f605ab8e2183e3d5d54126ee6b2a19e372b41ecaedf81d6
-EBUILD kaccounts-integration-19.08.3.ebuild 1122 BLAKE2B d01aa612e88e70ab36666bc6b416583706d65f920c40c3a9a228817d3a7ad2cf3f92e97336aa4d3250bde9f52cbb514cbace5e33f61a4e936c91f219d8ea3485 SHA512 50f3a5428ec80f091bafd43d773b67325e2e6629c1d08eff11d1ba75cc1b40d504c6531c5a614ab5eca50679a911d79d917075ca87645ce90c4d4d246b28a772
+DIST kaccounts-integration-19.12.0.tar.xz 66496 BLAKE2B 3752f9ebcc4f92f6373f323a8d43c0cd7b513fed154549bef75fe638554d6d2ea8f0ee38833e34a2c84804a4b2ced4a6eb6f89e94d40c7cb7a2e37a6191da6cc SHA512 c40775509f9c336974bef0effade36adf36e19398a0445e5d155a8e4e3062219da191fab912640c610799dc7d6bc114f7daa423fea97304714332b9f00db94b9
+EBUILD kaccounts-integration-19.08.3.ebuild 1119 BLAKE2B ae323d64dff359664f76d5a73423d2e9bec23c25942c7ea68e674c6422cf093e6a912539a8395fff9baa105eb28d2ca172a9f5ad67ae99cff75eb075e8c25bc8 SHA512 95b78b84e136bc3f3654a36d4ad4aaf2b45c6dc081db17b0a0638d921cca8ac90ebe00e9d338a3ed63ba64644c8569c2affd887a8b69d79bded343eaf635e167
+EBUILD kaccounts-integration-19.12.0.ebuild 1122 BLAKE2B 5e6acaa443d0e5acfda16d33146ddf69130b0e7e7a8d44c10e3311a0d69d24994923429deec71928b731d3b43b0f560649d891c4152cc2a1a4dac3074d85078b SHA512 81a42f8f855ff53fe6104d4dfbec53fb0e2d0f916acc70844f8145282ea198448a024cf1385abba5db234e21c4328cd06baa4a16539a99764fcb90e5395817ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.04.3.ebuild
deleted file mode 100644
index 5d256445c110..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-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_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21:=
-	net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
index 37b62f17e3b3..a9b6e2a67330 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.0.ebuild
new file mode 100644
index 000000000000..aadd91a625db
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-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_TEST="forceoptional"
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	net-libs/accounts-qt
+	>=net-libs/libaccounts-glib-1.21:=
+	net-libs/signond
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+
+# bug #549444
+RESTRICT+=" test"