gentoo auto-resync : 15:08:2022 - 14:28:19

3 files changed, 2 insertions, 181 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index faff775b1094..a0411b6ee78b 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,7 +3,6 @@ AUX plasma-desktop-5.24.6-fix-mouse-settings-loading.patch 1637 BLAKE2B 7dbd5ef2
 DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
-EBUILD plasma-desktop-5.24.6-r1.ebuild 5212 BLAKE2B 9e3292213d22aa001054312f084233ddb6219eaa97f5f52c01e274dcb51acf35d04512fcf3dfd58130a479bdd3d5cd19aadb810b384998aff36129de2b0fb663 SHA512 ca15c914bd7285044dca71c22bed509c2fb834f75d945d8b34b7d8c30004e493bf7557519d7304a2bfdcc72b90aa785af9c45a3bcad3d25dd4f1c07e2b08e8ca
-EBUILD plasma-desktop-5.24.6-r2.ebuild 5346 BLAKE2B 0cc1d66998b446c5b3f89f076ff9dff7a8b087208f931414b551603755d66da16ab53c9c171f9209246e7c07e5b96343d040e9a380cc5da3831eb3ebc0169c64 SHA512 626c8e4f174bc49e8f15a4d36fda315f61372f328c91123a5d3a0b070935914c9c3baa991df0878c9cd64dfba8da38d88dfeaae07f11b1edb26a37a2499d5006
+EBUILD plasma-desktop-5.24.6-r2.ebuild 5345 BLAKE2B f901b5c04f76da56895ef1393a656194c31f2d929713259db250b7583c2040a9c6c6631b24264723357a22c393f6ec1103c0b83c4456bea0533bc05a3952c1f7 SHA512 53286a2b785e35ab8167f4b44f567867b356dc3942feae31b63be879f9be9862592faa2256588a4383530d65d633ceb104d26c645468b83c492f3894aeaef994
 EBUILD plasma-desktop-5.25.4.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
deleted file mode 100644
index 8547a063ba7b..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-2"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
index 3a563be24716..5b816b2adcf6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="