gentoo resync : 15.12.2019

4 files changed, 66 insertions, 61 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 47dbac460259..ca5238405a1c 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
-DIST konsole-19.04.3.tar.xz 1117408 BLAKE2B c5b0bf8800f24d464c4fd0c24203fe6df95f293959d3c2357c97323980c58bf034586ea9eee1c9bde784b754110d3520ebb3fb60d9b7815405a9d65570b06dbc SHA512 20ec8ae12268110f00999b9f1197aff667ee2af7d7c2747b4d142c9db48fceaca7c01ab8f12fbc541cfc79eaebcbd704e166610f263c46083ad9fefb3c5da848
 DIST konsole-19.08.3.tar.xz 1147832 BLAKE2B 65d781a3a571b2c80d496c5885d517c9df89623858ce0fb6954d05eabc497add8fcc546b7994413d93de613877e30edc7bcb4944a1d95fc2c443c66d95bc0510 SHA512 140a34b8f73786557b71ac5b23b500950c598ef88795e660c7fde3077c9f5d842ae1eed73966eb14dfb54d2833fa63c310fa2cb340a81c30f31fdd77e9f263dc
-EBUILD konsole-19.04.3.ebuild 1419 BLAKE2B 765b1104d279359f6b9622159fcfca9d53a32bf068439af214d34beb01b4e27ef6d4fab3a4193efeaffc1696b2dc36926fbba19f9708094441e73aca3e70401c SHA512 5f0dc638cf96a5cb27584446f79314cd06cf251a59be79494110e821ec02894aa518dd67cf400e610ca1affdcef0067955f0927965a1056b0bf4e4c243050e2a
-EBUILD konsole-19.08.3.ebuild 1667 BLAKE2B 07cab1e962a2585b7d089f9ee0b7c05a6010225f598d6871179e9b5f64a32349142eced7bd813c8ba992297ff1fe554b80fa71c86a0aefe6a6be9b0a39f74d19 SHA512 a2a897935ae53bc97460f76810fb70849686da7a5d032f4b59d526be9f89ec2340a9c59a2d280216f809ce0bc5e3c97c23d01b272f979c9c43ce752a0b162edd
+DIST konsole-19.12.0.tar.xz 1161060 BLAKE2B eaf6ede4a4de55ae9b4436c5dd29e3c002ef32e3d568775c9aebed679662b3ea3cd053540ff506134e55023c3ade6c10f4925e3602b42dff2aea34d454aa44ac SHA512 3a9bcbc9c07eafe178406d4ea5eab06c24ede5fcb7ad43dc8b0a46776cdd64ce6d2033ea1083f648370cdb50eda4e93ec1cdd76e318a2d7ec44f46b4be75e89d
+EBUILD konsole-19.08.3.ebuild 1664 BLAKE2B c5bbc16b2c9114fd2d186f1b5873652c0179589ada8c831ff280dbdd6ea1f6b6feaa4751955cfd0133b23a27c6d60eb08fc2a6daf7c0e40b111100ca17fbd70d SHA512 0c161200c93f59b49de2b0fd371eb6f8d28a172a8d14d6aab1ccfc21a7df1d86b0bd47eea6a548fa42d6f4b447381437d958cbb767308d72d91e489baa15e783
+EBUILD konsole-19.12.0.ebuild 1669 BLAKE2B f267af4f85b38e28a1b135c95f96542c4fdb1d3fa729d679f301bba9fda9b258a3986636adef5768db17eb08ae7a46db6da19fe5ed9b9026906935a13e15f220 SHA512 0aef44535867e16fe90ff032ae1842fbee678fd20204ec497494a6a5e8ee20f17766d6548edf7a9c9aa012abbbcb65d1dd4726cf0191782a3e3e53c529c98699
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.04.3.ebuild b/kde-apps/konsole/konsole-19.04.3.ebuild
deleted file mode 100644
index 149525ca79fb..000000000000
--- a/kde-apps/konsole/konsole-19.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-19.08.3.ebuild b/kde-apps/konsole/konsole-19.08.3.ebuild
index 1f6d3ecd4d4c..661c542361cf 100644
--- a/kde-apps/konsole/konsole-19.08.3.ebuild
+++ b/kde-apps/konsole/konsole-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-19.12.0.ebuild b/kde-apps/konsole/konsole-19.12.0.ebuild
new file mode 100644
index 000000000000..893e8382e61b
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${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
+	>=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
+	>=dev-qt/qtxml-${QTMIN}:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}