gentoo resync : 15.12.2019

5 files changed, 59 insertions, 71 deletions

diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 83d032bbff29..7faad54182ee 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,7 +1,6 @@
-AUX krfb-19.04.3-missing-header.patch 554 BLAKE2B 77768cba45ca6792f1938f3b245cd8d7cfc6fe0fd807f02b5ea923c1f7c599d3dc06b1d40874efd3575557981bf9ce5f2f0a3123a548dde42a02919e88bc9c33 SHA512 1541b46ab8c006d61e5b31a9e2a9f36621aa15ae9501abdb35f16fbf8b2d95cf4a1120c3afa927c07b5527153b3ee6d501a69850b80752507ac9084c18830b1d
 AUX krfb-19.08.3-portal-support.patch 868 BLAKE2B c1239f4247cb507eae14fe79a6f1e375b438dd23eaeb65eb32f81d81223eb58794524ce753c1aba2304058c202dc72a62bea330d9fe2be5c36f331de2df971f3 SHA512 ee64e02efadd52f4df4a753624790d42bd38aa8e45d984351814a91f3dccb00f1595c7dabffb64287c846d8added370d49580aaeb85f9a97508f8772dab91252
-DIST krfb-19.04.3.tar.xz 1256560 BLAKE2B 81e1ccacf9ec5eddd89caccb9ffa8400ecc8c90a4813fa890fc2d57b80258a1998dd189e00d2e90950dbd3de3235035c5887daf001ec45bf6877e5d57fa6fbbf SHA512 4334c51d4c0471cb0aa2a226626a49d6a1456e0c2ab8d03bbed99228bf6e61efbb41570e0c3f35310c2994831b2444c57caa6ebfa8739c5747b12a2f378917cf
 DIST krfb-19.08.3.tar.xz 1278072 BLAKE2B f4103c255b64a5058eda2d8c580514fc79131590aa33b4b7dfe7e4d42f5cbad88b7a16a2939f33853128cea71769b869ee2a3fa5d78cd738fdef76e45acbeb71 SHA512 4c2012c0fe8363854bc93f7c86918e4d151bc8eb7505327615688ff8631a1c77a2acbdabe23bc56a072b5ccd3df5fe7a864ba0402ecc6171b4862118c814d40c
-EBUILD krfb-19.04.3.ebuild 1019 BLAKE2B 77a02fe40b5fcbdb904c555f551a4d7e3d7a3d9993d28bcaa69f4c706db977cff4fde773fce90fa90c7559440483f628ea7e028b004a207485b718d6c77f5a2f SHA512 f588dee0f6773b3a3388a02d46f281a48559846be63077c149de0749dbc91882b1194391b4fbd360b9f6aeb7a0566d11ac8c5b0479a0a819262d9c54bc7dc171
-EBUILD krfb-19.08.3.ebuild 1454 BLAKE2B a0f756380d71d74c2fc18aa6c24d10185f04465151ed25c8eba77a35173f9b47d1cdc7427f3add06d42db6fd2de6a80c17cee65baa9583836b93696785cd65f6 SHA512 ab4958e5c12a2ef633445eb9331aaa72823a497c3709a48b58e32df5f8d73256e916a57472391ea5b9f1ce603aab1997ac600e09c69f1468904499a429964687
+DIST krfb-19.12.0.tar.xz 1278040 BLAKE2B 18f127fcc2cbdf5ae7126c89125078e22cfe3488a6de1cb9c3cf088084347020e679201bf7dd159f4e2526b840ccc62f1030d6451bebe5bae7a0c853c1f882a4 SHA512 2447cc2967fae38f9885aa6f451ea7f3218d91ef1f88008aad238a526a2d32b468b27ea9ad0252ab18e4926b5bb3b2896a4df903aba13dfea5c45c08fab35b2a
+EBUILD krfb-19.08.3.ebuild 1451 BLAKE2B e651fecf5f3858806ee10c32d2b13a7ddfd413dd70acd491a1e49cb5ec5d1137b721af5d839def8ac30b2c0639bd6b721149f3309097e6901a2b91566f75731c SHA512 b25cc03c91d33b0e5ed0b1355232d5bf68245e71d2fe38991dfc5fcadde2f1ab4e39cb08f7165221eab587fa83070e082c2c779d09a0aa36c851c05b9f43dbe2
+EBUILD krfb-19.12.0.ebuild 1405 BLAKE2B 5d3c4cbdf3d214c0f743bf206690c2047c8dba1c0fe88f2a4e0b00f87baea6e15a5169b350df488b371c0c0ea660776e15034c1bf32bc3c9785ad8cdd34d5d7d SHA512 d3ee03c653bc212779dcf7a02442f108b2cfd46c42d35ebd47d3b9cce58aa1c5c0b33c3f6d671ef9a0144016dc1ae739f415790f836c6d30abe4308abdd52003
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch b/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
deleted file mode 100644
index fc3220d4f40d..000000000000
--- a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9290ba179c5d1e3a0a829666f4cb24177cb49395 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 9 Aug 2019 21:19:23 +0200
-Subject: [PATCH] Add missing QHash
-
-Fixes build with future Frameworks.
----
- krfb/trayicon.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/krfb/trayicon.h b/krfb/trayicon.h
-index 6517e4a..166e97b 100644
---- a/krfb/trayicon.h
-+++ b/krfb/trayicon.h
-@@ -18,6 +18,8 @@
- #ifndef TRAYICON_H
- #define TRAYICON_H
- 
-+#include <QHash>
-+
- #include <KStatusNotifierItem>
- 
- class RfbClient;
--- 
-2.22.0
-
diff --git a/kde-apps/krfb/krfb-19.04.3.ebuild b/kde-apps/krfb/krfb-19.04.3.ebuild
deleted file mode 100644
index 5779798598ea..000000000000
--- a/kde-apps/krfb/krfb-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://kde.org/applications/system/krfb/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
index fc89b16763a7..fb0eab568011 100644
--- a/kde-apps/krfb/krfb-19.08.3.ebuild
+++ b/kde-apps/krfb/krfb-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://kde.org/applications/system/krfb/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/kde-apps/krfb/krfb-19.12.0.ebuild b/kde-apps/krfb/krfb-19.12.0.ebuild
new file mode 100644
index 000000000000..2500ae4ba71e
--- /dev/null
+++ b/kde-apps/krfb/krfb-19.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.krfb"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="wayland"
+
+DEPEND="
+	>=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/kdnssd-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${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/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=net-libs/libvncserver-0.9.9
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	wayland? ( media-video/pipewire:= )
+"
+RDEPEND="${DEPEND}
+	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland PipeWire)
+	)
+
+	ecm_src_configure
+}