gentoo resync : 03.09.2021

7 files changed, 9 insertions, 39 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f80705df4176..c7763bb59cdd 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 5995e5bcbdda..ff092fe74418 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -4,5 +4,4 @@ DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13c
 DIST kunitconversion-5.85.0.tar.xz 888652 BLAKE2B 8e5a773f0f8acdd1c24b81a8946b7190e52a3dbe5a63c48027f423be9fb735508394ccd01b3caa4bb7c920dc873a73a08c78afb335a158b598f8793c53d194a7 SHA512 f053ba454f4a5a44801a1f5b8c6562a7db71f4aef1c3b253610d20d3bb1b634347f9bb1483f607cbe1746f0b80a8625dcfb05bee5cbda467b799c9d3d5ca6668
 EBUILD kunitconversion-5.82.0.ebuild 524 BLAKE2B 3f0bfebc97827dd3837e58d05f44c9b8dbe61ebfd276fa8c4c5921037016d8b6188e4d49cc3fd91ff421a0a3326650f86cd5f47a758e198fc5b0f4a52e9548b5 SHA512 c1f6d3a23f8f60c6c1df3cf609e0544f6f918abb3792578b732c3384d58fcf65c52b2aeefd1cb8d6fa1b735f1bf5ad76b2e346117b002bcbb09ae23f906720bf
 EBUILD kunitconversion-5.85.0-r1.ebuild 663 BLAKE2B 3c640b6bd6e0cedda969bb8a61ab78d41ac4ff04809f47dce229c2cb3d19abbf3e978ae5b751ef922abcf930a2fa90b6c37ceed68d3cba801ac2b192d2696f53 SHA512 85d23613cb40e64e3ed311a83ba963e132e36062f5b479f267f3025c10c53241a387ad76a3aafb1e9d75ab859957c1e05e0ff12627cf69a9546b6b8e493fab2d
-EBUILD kunitconversion-5.85.0.ebuild 534 BLAKE2B 68c73876457433b0c91f732609fd10ea2d7313a837873510a627f8d61041eb629c531a2b4e23a56a24e3145cb5751b0b91cc6d8b9f6b1f6a8019b46902e904f6 SHA512 6401d3670546c9bdbe6fbe78f7bb1d73c13ee0230adf103636f1be48955c8fb6d4b90ce92c3ec67fc1045e2461bf3074680941e189d2db367c0ff6503e3ac3c1
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.85.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.85.0.ebuild
deleted file mode 100644
index cbbc22b07e47..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.85.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# bug 623938 - needs internet connection
-	local myctestargs=(
-		-E "(convertertest)"
-	)
-
-	LC_NUMERIC="C" ecm_src_test # bug 694804
-}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index e53c834497db..866b86ea1e83 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
 DIST kwayland-5.85.0.tar.xz 331208 BLAKE2B 87397c48534784dac0b7b864ec1fd6579308c34daa5ff613d6b39f50b5fa6f5c59b33f648479e694e4135460468df9196682e169fcc9aee22d9dbd1be70ffc38 SHA512 b45321c2846c2311c2e4b48aa5edb19a3a4cac889415d490a21202470ea27281d8b9cf69f1521109bd236eb48ca93702e461b54c49e38dcc50fb90f4cea0d063
 EBUILD kwayland-5.82.0.ebuild 764 BLAKE2B f5ca1ecbdbdb23975f337dd58b86b6d8740ff9453e62881ad27d3f9a3859a771c94de027ff2deb9f495cc47593887f0751b19e3ba4206753728f6b888f22ddd1 SHA512 91880d5bbde65e9875e948d8a2b5507a4cffd27f2cb9c5b995eb0f7b93d49b4bdb403a9fd632e6f57925903916a13c371afdfaa84ebd4aad26154931a8ac193f
-EBUILD kwayland-5.85.0.ebuild 829 BLAKE2B 4e36da9d981fc9c4c9871c4f4719860dda879fb9953fe48fb5f09e9de824d6f6309ace6e01739883b2db454e1adddcbdf02a60c29ec5c976dcfec9450f54d408 SHA512 77f5b21528d8931025e5545b272c15b0f5b7cd20325d32257eb649a4736e03e1993f0138a9c1a917678c1f890cbf44685d8638c6a59b867da80b85c45f6d6ac7
+EBUILD kwayland-5.85.0-r1.ebuild 825 BLAKE2B 4b191ec6904bf85a6788693cd529b2a55d40fb2ea2fbe800f1ce6b8bb1caac6245319dcf0bf72dcee99330a16af207b035fe4aefdb59bbab89a61a256ac9b2cb SHA512 0f905a6404334c014737f5f3a176ca1223c5537b1696742d0b05271f3e9369b24b93ebd977693fe84c2e05a24f1bfa8b9773253c08ba83b7dbda87f1e4f158ed
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/kwayland/kwayland-5.85.0.ebuild b/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
index f8e681194d08..99f2db579e40 100644
--- a/kde-frameworks/kwayland/kwayland-5.85.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.85.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5=[egl]
 	>=dev-qt/qtwayland-${QTMIN}:5
-	media-libs/mesa[egl(+)]
+	media-libs/libglvnd
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.3.0
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 92709f40c690..37050d2798d5 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -5,5 +5,5 @@ DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623f
 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-r1.ebuild 2078 BLAKE2B 89d0212849ddffefec61455190c29f36d100cac5e711f524f8a5a75ae0c6006c2ebc87cb251ee5d0ee87e1b3a44db0944c2e6d32611a0f5acf14034e79e16a79 SHA512 8289ec8296f08607126415943f94f740889434b77a03508407bd3f2adff8cba4d70643afe873deb17004f066a1bd4cad7a185d4a2e584af97013a0b58d722ac0
+EBUILD plasma-5.85.0-r2.ebuild 2140 BLAKE2B be37c7efb88e70410b852a9027cad8f27e482cf94d6a663ff38cc5606cccaa1aea3dd8df56f6a64ac54056e337ed7aa9dd630593a0ce5edfcea8b1e08f47b61a SHA512 a8d9fdd14617d510f6f04eeba9910b770e8616b834a0e1f4dfc37ad6eb076cf70bc66d55c11d59a2ce8d010595675ff37b4c4e9af324f4a40370a0984a8aff79
 MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
diff --git a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r2.ebuild
index 1e392e190615..30eba0b8af0b 100644
--- a/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild
+++ b/kde-frameworks/plasma/plasma-5.85.0-r2.ebuild
@@ -13,17 +13,14 @@ DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only wayland X"
+IUSE="gles2-only man wayland X"
 
 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
@@ -46,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
@@ -60,6 +57,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch
@@ -70,6 +68,7 @@ PATCHES=(
 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)