gentoo resync : 25.11.2020

3 files changed, 18 insertions, 29 deletions

diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 966932672aeb..17cdbc881cf3 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
-DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
 DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
-EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1310 BLAKE2B 21540d4659f2e56546b591e55aad777ac7f404cb506e223a2704855d231f64c7744627d4676d57d0d429b6084082b26769e8ddf25f017a546febc7c469e38b33 SHA512 9a32516c5a495ef62b2b668bca6cb0903ade52a91814df05fcb711b82f5f24816025b7e338a74ccba8dddf372cf6f1652a669c4713aab0793e3e25ee5245ed5f
-EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1216 BLAKE2B 8e9afd719ed8fca209edd4c44675835bef1d050141d53dbecb2cd81ca98f0f70dba1599cdd126ff5b87a719cb1a5833ec8417027f98625e1e3e3683d142ddb27 SHA512 a5339462675f046e8bfe440026f53e062833ee4323c33e43cfcc943e9291f70304b95e3fc7009d69a3d14d043e1180f764b391d561650474361af491fd8cec75
+DIST xdg-desktop-portal-kde-5.20.3.tar.xz 81764 BLAKE2B 2a95be9ae24d535a241beeb6260359763f3102f03ee80f812e8d8ce32bad69ea1a2c859b0b1823a30fcdcc104e818e41c3a91bceecbfad6a17518df517113eec SHA512 7543e1231c2f78db01852add1ee42846254a1bec2bc61d4eac0901e8376034cf60590dee10706c71462269a9e075fdf5451349984575a2e7baed63d9e8ac21ca
+EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1213 BLAKE2B 3a9514d45be2e1b59d30cb76b0057e291829a1aaac7cd8f2832f5719ab9585272185b4b064eca40f23f3a3295c562e296ca505eb9b75640e8f7cd1801a704ec4 SHA512 425f92eeaf6ab77c520df2dc69ed3bd7a1e5be79dba8afce0f656ff138c94772d63d71be4731420aa2c65ac4dd3f515f72536be6c1ee8b54b04110ec53775398
+EBUILD xdg-desktop-portal-kde-5.20.3.ebuild 1101 BLAKE2B 7e436fa86845de8bad31ed063be178dde63fcccc20dba74fdb14a1fec459d5168b6d1127dc67ff051affd175cc15b34cf01560be064bd7df7c92fa3670549f15 SHA512 287b119f135d79085a5dfee4898e7d92af4cc537210f443acc5dbaac53a8f98ce28c308a96194c830151eba501b6fed105ac5846ace7210ceaf3960fd328d057
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
index d5c931956e5f..ccd6c0f879a8 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="screencast"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
index cfa74d3b881c..0401c0d06978 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
@@ -3,19 +3,26 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="screencast"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
 
 COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -24,30 +31,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-libs/plasma-wayland-protocols-1.1.1
 	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal[screencast?]
+	sys-apps/xdg-desktop-portal
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package screencast PipeWire)
-		$(cmake_use_find_package screencast GBM)
-		$(cmake_use_find_package screencast Epoxy)
-	)
-	ecm_src_configure
-}