gentoo resync : 15.12.2019

4 files changed, 62 insertions, 66 deletions

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index a41303b4fc9c..460c8d479522 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,5 @@
 DIST yakuake-19.08.3.tar.xz 371420 BLAKE2B c75ef829bee62a5e3e441ca3c5c26778171bf9f4455e7259cdecb21a625af30906a50dcfcc5e93d83f3648ed100018e3cc039b6525f9e4658b02c693feecd330 SHA512 6326d1923b9bb3c8923ce0b8238d3668c2911346519a5a2c5c9b3a693829d271a83a2ddc061d079d0f4b414814460b39e674e4cb78bf5d069f883fecf5db37f9
-DIST yakuake-3.0.5-patches.tar.xz 4996 BLAKE2B 0ffef1bf066b962c73ef6a28251d9abf3df66b28cf324bcd2d4f49c7038ba64dd3554490534cb0b001a589c42309253a0cf77683b4f97661d0fbfc17c96e5be0 SHA512 6c66043e22e98d65230de566e4594f4c1bfdcccc229ab8b66d604bf6fa666964f8b05746eb914f65d1e52fa850010aa5016a26b629f8eec09b67548dd2b00251
-DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
-EBUILD yakuake-19.08.3.ebuild 1573 BLAKE2B 4b97192bd98cbab8af162ca94e7a3527dcf7cf4dafc31a27ef533e9b6f8b212b584db0f8c250ebb9d47fd5635abd4215f938d39dcbc074c6426650b147835856 SHA512 721917e1a96786cea26af50509a958ecca96d36994e1735f660c296618815e769372232039d5c32f061dacadf09c7ba846ad1cd24ab1dedd7c86cd2de45f7a90
-EBUILD yakuake-3.0.5-r1.ebuild 1541 BLAKE2B ee193f05532f1ff554577cd10a610e148b48a682b7dc33c074eb65db4c4f16bd3a7b9ee08e1aba83db3ea32ca3e45aeccb4211713445ecbbb7788c99b3de9229 SHA512 6ffd18d724193374cb66da852b22a23161fdebf728f53a7d4ea75fdcee0859ad09e4c33b186b29cd16c7556cbe85b3422d5e5651ee8e4fe84312ff50d5415d89
+DIST yakuake-19.12.0.tar.xz 372548 BLAKE2B f07bb473258150926a99049756d2a3d8f8488c14cf966afe22c959730a586ea80a7eaff0dacc95b564e6fda39a89b1b64a237c083ee0131bc4b384cd87603266 SHA512 cd01f7e3ea4f5d68bdb7892c21ed6aba4f7f81b4f28c5e2e36d5c7b77e858749960bb4a6194af89edc3a2eea1abfeb2bacfdad9dffdd175458a9082182234fd7
+EBUILD yakuake-19.08.3.ebuild 1570 BLAKE2B 7f8e84fa2b7ecf68f3c78bb2e9a0a1e2c25e76598f6f65855b8cf11db9aee24ba1602f8d46b3544c7a15792973c9c99a18fafdedb92455c406393db65bc68d2e SHA512 301a2bf0b4b91fb59eb0110ab71d9aabddd08ffc89c07b98f201f333d5cc032e6c3d62591fe1000083d3aaaf582dcbdb09204a7f28ef2f68ea8fff648498844e
+EBUILD yakuake-19.12.0.ebuild 1561 BLAKE2B 5688b7fe6d8b801a6f2dcf6b860900f2c0e082760ed42333e461e5205c1b66036a029feaa1662d3718671ac039f71d5521febe778260d7f0ee5fb5faea68710f SHA512 37a309ee109d0cdd4f9a022dced6e5144c869a6eb8d8e1da17de4e8f3bbea988c0bacbb7b0e19a18631c93c85a488159ef2f23a3dcc54061779d04b22e1bf558
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-19.08.3.ebuild b/kde-apps/yakuake/yakuake-19.08.3.ebuild
index 5a9f3cfcafe2..46e4d915997b 100644
--- a/kde-apps/yakuake/yakuake-19.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/yakuake/yakuake-19.12.0.ebuild b/kde-apps/yakuake/yakuake-19.12.0.ebuild
new file mode 100644
index 000000000000..b3195f489afa
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# 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="Quake-style terminal emulator based on konsole"
+HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="absolute-position X"
+
+DEPEND="
+	>=kde-frameworks/karchive-${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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${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/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/konsole-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package absolute-position KF5Wayland)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/yakuake/yakuake-3.0.5-r1.ebuild b/kde-apps/yakuake/yakuake-3.0.5-r1.ebuild
deleted file mode 100644
index fddb44535f00..000000000000
--- a/kde-apps/yakuake/yakuake-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://yakuake.kde.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-IUSE="absolute-position X"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep konsole)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	absolute-position? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/yakuake:4
-"
-
-PATCHES=( "${WORKDIR}/${P}-patches" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package absolute-position KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}