gentoo resync : 16.09.2021

4 files changed, 15 insertions, 20 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 7f66cbf97baa..20a92fe00d7d 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -4,9 +4,8 @@ AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e03
 AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
 AUX plasma-5.85.0-fix-svgicon-memleak.patch 1613 BLAKE2B be00da72ac0a1a8ce97cf771ea83db44fe97142ddadfc1a1b283cce5297568ec0566b7a2ce626ad7d7e4f7bbc82edf260dcda1db6ea8cf8ed1c132b3a25dedce SHA512 c8dbb37558ecf3491edbbbda6f93075d7ddea7561eb42b30416d61f7b7256966c609862fb8e0c746b9a93d2caff37b8afef9eff0d5db271d6e3cff8aef2d560b
 AUX plasma-5.85.0-fix-theme-memleak.patch 3873 BLAKE2B 8ec65e67dab0020febd483b4b369d26d4f9e7a1782b783c2910e80db643f92562559053a6319b57af4f905daeaa970db7d78e1a2c11b07dcdbc9d3bb74f52c10 SHA512 fe93829d4881a71bd4671af187a7210fb8fec1c92b29917d1530c58d1247976d59ea2e16eb0eec0c14e25824a9b15caebb7912f7db23b6088c1352e9925d15a9
-DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623ff8f31d5de0ae812ffc1666badf388fa711887afd9479d718cd50f9bdea42d725f30fbae8d32d87cd071b30b1ba49768377a8d07e9bbc3 SHA512 3e8608f7c7d6da150a30fd48e2ac5115f95f6346056ef2f12134ba8e93617c7b067b8ccb1bab5e1586f3ef1af7f010b8ddd9fe0a9a7ee0def01bc991be8e546c
-DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
 DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
-EBUILD plasma-5.82.0.ebuild 2030 BLAKE2B a64a05c28c10890fb3f845286362f0041de75d1f895e1166ee7f1d4ea2f84249582fb4f06c202d4493b97c05359df34c3c1a6938042c9a0ef740d96c3906d398 SHA512 1faab810a201f647dabe24e7d192b53c1b7cbde16287f35c4ccfeaada018d5c967b07589e6d82734f1f5a229d351bd19666ad16d888f34dd4c599d12e07c501a
-EBUILD plasma-5.85.0-r3.ebuild 2332 BLAKE2B 210c27c7263f3b6d59a5a9e3dffd1c6cc6f2d2d2d4492618d3e1b6a51172b33adda22c8bff5f363a649b7b1e95fb88278c70e244915a57dabe973e432ca5f8ba SHA512 c9f5315b6d50decac97aa44e6ec56b7fd082777510264f5fd757c0773e5387bc7aa69da8305d98a1106d4019142bf29e63b6f66da9553149686054ab9696b9b3
-MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
+DIST plasma-framework-5.86.0.tar.xz 3147804 BLAKE2B 39b58d3613a5e99217b9cef3aaff0c5ef7c0563f3a6014b50ccd8ac1a7b328f6fc2a91af94c66c2bb702435f892b23605cda6a8aee049c6f7c9ea7a455fae57d SHA512 f94d9a0175141705eb8e384877d69d0b6bfbdc76a12f7f3fcc33587186a7ab5ed7cf87eaa9e13102932d7c8fad500bf479da111ea4b61c1e35acea9f216eaef8
+EBUILD plasma-5.85.0-r3.ebuild 2329 BLAKE2B eab27d4eea5e926738094e0e3f711369a229f87922aa1256f75e9b240111f0c6f8a430102c807ed4cb93dcfd392005f13c0f81f572134a51e0c47d32c49da4e1 SHA512 f40ddb75ef8316018d0eda6db3602ecea8958d26446517c790fed6776f297a78e7d22bbc113149f625b8b2f37b9ed98dcfad73fe7dd176db6e7c4388ecb8aafc
+EBUILD plasma-5.86.0.ebuild 1943 BLAKE2B 4f9cabe4ac6c36839d71bfbad8cd5b6652d22723eba67017ae7587941de3efb6595c4f472770bee802a4421f6c711e83832185e3a8d333e358a0b4cdb1a79526 SHA512 23aa0e6f6349402291049e4203dff1a9263fd797a749cb274e4d53b8032eac9931f1d457290499ae9694ef93dbbd82b329d9c55e707496906f89adc3f0b6c122
+MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml
index 85b864e35960..506ecf605bc4 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
index b75fc07332f5..e5f077ebe256 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gles2-only man wayland X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/plasma/plasma-5.82.0.ebuild b/kde-frameworks/plasma/plasma-5.86.0.ebuild
index 56c3d574ac5e..1ccc68601353 100644
--- a/kde-frameworks/plasma/plasma-5.82.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.86.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KDE_ORG_NAME="${PN}-framework"
 PVCUT=$(ver_cut 1-2)
@@ -10,21 +10,17 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Plasma framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-${PN}-transparency.patch.xz"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only wayland X"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
-BDEPEND="
-	>=kde-frameworks/kdoctools-${PVCUT}:5
-"
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
@@ -47,10 +43,10 @@ RDEPEND="
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
 	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( virtual/opengl )
+	!gles2-only? ( media-libs/libglvnd[X?] )
 	wayland? (
 		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/mesa[egl]
+		media-libs/libglvnd
 	)
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
@@ -61,12 +57,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
-
-PATCHES=( "${WORKDIR}/${P}-plasma-transparency.patch" ) # KDE-bug 434202
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
 		$(cmake_use_find_package X X11)