gentoo resync : 15.12.2019

4 files changed, 81 insertions, 76 deletions

diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index c3b16696266a..d16057b4f2f8 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
-DIST knotes-19.04.3.tar.xz 319528 BLAKE2B e665b66e531001cd377c9867c0d7d6ee3da5567c52f779d29bc4ae02189e4b5e1ea628070b66d8aa063b80e8bee04d9c4d6e4ac5a71ff139b09a35a4441ff817 SHA512 ed50d590e7a54c15d046f3e82436dea58f6f40e3bfa4541f67f12603915748fb27202a4d6276de44aaa2d23648b429e0b1ac0eb98787363c7bbce68cb2c4a180
 DIST knotes-19.08.3.tar.xz 319336 BLAKE2B 2ea763279e30399cb7b68895ac33c751c4da3a407bd73dce151ca7febe2054a40a83eee1fb3dfab530b3cc3f9b2b3b1d8c4b99cb8340bf3f77fc41e7a8be4a9f SHA512 abe5fc4306dce76a4880a1abc31a80875004ae6ab8709af4fb373c16d9be53cd7fd54b7e36d0dc405f3a2071258abaffa2804b8a42532a57adec7c90c3b497c7
-EBUILD knotes-19.04.3.ebuild 1848 BLAKE2B 22742e13bcbba22ce992ad9a9482ab03b22825a9d026d22cc307f4c10cf7b9d5237332be6cde3e56e99c1c74854306c1ea62558f626a78577e1f6bdfc2d2afa3 SHA512 f760dddf3aede463d276d319b3505bbe3b9150ec2f8738beacd1a40b43a5c42085425e2bc2af5118f21d2febaaca658d853e86fb38ea8abc70b307e7e41d01fa
-EBUILD knotes-19.08.3.ebuild 2111 BLAKE2B 93cd622f429b4fbe214a4fe371a20c63dd231bfaa5764f407886ea90a88ebf17140a27e5de20782bf447acbd07342395434f010b59d83cf95a76ecc7e0f518b5 SHA512 c102fc3ae821629ef345bca60df24dca71be68a0cdb0ba0c9a7e2a9d77a0959c0de7824d7d4fcd5277fb681daa5c8d934869cd28982e7cc98b97a783532b61b8
+DIST knotes-19.12.0.tar.xz 320516 BLAKE2B 8e4b63fc3853fb01b57ba5104955e30af3617576ff13a18e0eb13944f7087bff84ade637cba52ba7fdc0d27c9d34756fc9b95a755aec7bc3c87afe98c428c5dd SHA512 08b0cb18ab904093493d3de64997b0a0bcc92296233ad4f25101b78858ebf1ef0921c68ff5264cf8698dba4ea7a65107755d24f54c9fff7e3d80f85cd1c2a5de
+EBUILD knotes-19.08.3.ebuild 2108 BLAKE2B ed904fbf40cdb666ea971b0d05e22c9b4ba98cacfc1ab9127ff5b42447f91990e3045641d22520ad1cafee9a5a80f8078297c8db023a30d52ec6145195562109 SHA512 79e78c996bc36412022f5864abe203f5e5b01f7511279de8063ecaa2579cdc4fdbc354b9f22a97929e8231a365d7c06bb272d15fc1cdac39df544e4706e2d7a6
+EBUILD knotes-19.12.0.ebuild 2183 BLAKE2B 81f752c43db167f4e6c94869814ba3fe92bcae2fb65bb470c9bde170fe25f16ecf2d1a9663fdb09e6dca386fa2a7d1808b77e7beacd6389d907e3a754784587c SHA512 cbc258e69c7b5d3a98483fe43b4313b43908b7be60d426529a2d35ad5e0e227f2b8f80d90cf40d5559e99d1dc3b92fae562f3b173acb3f872a94046d104b0a08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-19.04.3.ebuild b/kde-apps/knotes/knotes-19.04.3.ebuild
deleted file mode 100644
index 0a023adf6cb8..000000000000
--- a/kde-apps/knotes/knotes-19.04.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-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 kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
-# 	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/knotes/knotes-19.08.3.ebuild b/kde-apps/knotes/knotes-19.08.3.ebuild
index bba43d5a8cd0..f4ed9fedf665 100644
--- a/kde-apps/knotes/knotes-19.08.3.ebuild
+++ b/kde-apps/knotes/knotes-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Note taking application"
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/knotes/knotes-19.12.0.ebuild b/kde-apps/knotes/knotes-19.12.0.ebuild
new file mode 100644
index 000000000000..196c6f314a5d
--- /dev/null
+++ b/kde-apps/knotes/knotes-19.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
+https://kontact.kde.org/components/knotes.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${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/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${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-notes-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake_use_find_package X Qt5X11Extras)
+# 		$(cmake_use_find_package X X11)
+# 	)
+
+	ecm_src_configure
+}