gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 89 deletions

diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index e4651ae88d37..641e30ae0481 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,6 +1,3 @@
-AUX krfb-19.08.3-portal-support.patch 868 BLAKE2B c1239f4247cb507eae14fe79a6f1e375b438dd23eaeb65eb32f81d81223eb58794524ce753c1aba2304058c202dc72a62bea330d9fe2be5c36f331de2df971f3 SHA512 ee64e02efadd52f4df4a753624790d42bd38aa8e45d984351814a91f3dccb00f1595c7dabffb64287c846d8added370d49580aaeb85f9a97508f8772dab91252
-DIST krfb-19.08.3.tar.xz 1278072 BLAKE2B f4103c255b64a5058eda2d8c580514fc79131590aa33b4b7dfe7e4d42f5cbad88b7a16a2939f33853128cea71769b869ee2a3fa5d78cd738fdef76e45acbeb71 SHA512 4c2012c0fe8363854bc93f7c86918e4d151bc8eb7505327615688ff8631a1c77a2acbdabe23bc56a072b5ccd3df5fe7a864ba0402ecc6171b4862118c814d40c
-DIST krfb-19.12.2.tar.xz 1276620 BLAKE2B abe854e4c76f81259d5756f0fdc1c503fba679c9dea47c4580f30db8b181be1453f662fd9527b44e283703a8e27bfcfe71416c962e30534adc3bedff8b9cc037 SHA512 6730eb847f331211077859d8ce19f3cf04ec724b5a882759fc57cffa9d70624c0548660a94af2cb560fc88e02c0116e258150355d935ab01fd1cc03942904381
-EBUILD krfb-19.08.3.ebuild 1445 BLAKE2B a7d117c051cceaea97c62750070054a84ee90d9483c986e7d2c62bd16bddce96457d46f843f88141b67d00a1e49797f1fc2ddec38357a40851e07d838929dfae SHA512 03cb252a8a2c3372b5266ef704636b533662c905ff30fb5123272869e0e7614fd298f318932556c4d2b7288a99afd570dd675db031e975087570c31ac57040d2
-EBUILD krfb-19.12.2.ebuild 1405 BLAKE2B 3c7ef9fc8ba64a56630474c42df280f643bb68612bcc6eafef1e8e1f03c471a67b2878e256d7a8b144d17dd8ddfbfaf037bb164543da3021ddbbbe949fc4eaf7 SHA512 63a103c9d7b532a0fa7c929fee32a5a772192f83d344336236e87c9a79861d695742a227e277ac83f62bd9dadb5f348ed5bf150fabacf113a27b3941f6aaaad4
+DIST krfb-19.12.3.tar.xz 1276964 BLAKE2B 59fb41031e70711888992ac91e0083f5ef5afb0590052ba5ce529073e361d6ad2656590ba2f4bb32c6129a071b0a30ef0095b061f6b075c40ca77152c02439b5 SHA512 d4cd5957034a42164756e226c8596816bcb19aca72f3b4b1af6967c4ab9881aaeed50c396630dd434dd9234fc3f8ddfd0783926f5e7f72a7de101a0c98ad4f36
+EBUILD krfb-19.12.3.ebuild 1402 BLAKE2B ad1739e1c69b79f20c8629dbdae976b23e458440df6510c0571f539253656b8906b9f51632f972290d86d23ead854725c7eeab5413354abc35a4f6da001fdd00 SHA512 414d494ffa9e23043410891e1af89f8b0c4cd9443b6b7754ecbd996c1690b6af6f9ad42fb594e1fceae609ccd830aec2fc1fd28d558deb019353c6edd54c3fdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch b/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch
deleted file mode 100644
index cf27528c2039..000000000000
--- a/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 80db244c7ddd98d284a1412540c8f9e368e86f65 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Wed, 6 Nov 2019 12:05:06 +0100
-Subject: Un-break portal support
-
-Summary: We need to mention what wayland interfaces will be used, otherwise KWin will not let us to use them.
-
-Reviewers: apol
-
-Reviewed By: apol
-
-Differential Revision: https://phabricator.kde.org/D25167
----
- krfb/org.kde.krfb.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop
-index c610c5b..7cd0ac7 100755
---- a/krfb/org.kde.krfb.desktop
-+++ b/krfb/org.kde.krfb.desktop
-@@ -217,3 +217,4 @@ Comment[zh_HK]=桌面分享
- Comment[zh_TW]=桌面分享
- Categories=Qt;KDE;Network;RemoteAccess;
- X-DBUS-ServiceName=org.kde.krfb
-+X-KDE-Wayland-Interfaces=org_kde_kwin_fake_input,org_kde_kwin_remote_access_manager
--- 
-cgit v1.1
diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
deleted file mode 100644
index 067909c47a66..000000000000
--- a/kde-apps/krfb/krfb-19.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-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"
-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] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-portal-support.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland PipeWire)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/krfb/krfb-19.12.2.ebuild b/kde-apps/krfb/krfb-19.12.3.ebuild
index 78c3709131f4..926471ea2971 100644
--- a/kde-apps/krfb/krfb-19.12.2.ebuild
+++ b/kde-apps/krfb/krfb-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krfb"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="wayland"
 
 DEPEND="