gentoo resync : 29.01.2021

4 files changed, 2 insertions, 192 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8ec618f3c2fd..0aa6cc2a92b4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,4 @@
-AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
-DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.19.5.ebuild 4714 BLAKE2B 907055b17edd13e279b51463352301b5397b34b189d060f53df1f1394004a726a3127923736df58bc134833aff3cd157fbc95ccca73a4b5b12b0dbaf0728d10d SHA512 66229eab5329c3fdc40018d036dc8bd2d7882a087729c4ea81be2288a1dfe0235a70aad78bbf29ec81fb34ff4d0d5b19f7ba7c2527df62fbd4beb5ee2a0eeb95
-EBUILD plasma-desktop-5.20.5.ebuild 4760 BLAKE2B 35abca1a9f8a65d1fff506276c83907c1451c06e39ef492ed75c8a956ba7e65ae28575764633601924f1b37e624ebb472784e06e36aa42baa577c19a11ba5f07 SHA512 6b70bf430b94e98e39bdf76738e41e230793bd9214e3fc13743b02d74c755f9b29cef5b581da000d058a17cf2d8439693cf4d0daf193332a55b806ce30e5687c
+EBUILD plasma-desktop-5.20.5.ebuild 4758 BLAKE2B 1fdcf427ebf602b6340e0617da18bec58456ee1661a8e3b351d0279d0a91593edcf06588f58bd05a4620bf8b3b0b8ee37d7806063c0aa1793b1867ad7170663d SHA512 70133d7de94057e62b25d52f327bd699a689898695f99a2787cd84793d83f6ddbd4216566e64de73289ebb142f5034a834a9db71283fd95fb9a516b705cdecc7
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
deleted file mode 100644
index 69f33cb402e8..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e7cb58f156a240c70c085be38a12e2a01dc5ede6 Mon Sep 17 00:00:00 2001
-From: Guo Yunhe <i@guoyunhe.me>
-Date: Sun, 20 Sep 2020 21:12:08 +0300
-Subject: [PATCH] Force Emojier using color emoji font
-
----
- applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-index 858cbd935..e7198156b 100644
---- a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-+++ b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
-@@ -113,6 +113,7 @@ Kirigami.ScrollablePage
-         delegate: MouseArea {
-             QQC2.Label {
-                 font.pointSize: 25
-+                font.family: 'emoji' // Avoid monochrome fonts like DejaVu Sans
-                 fontSizeMode: model.display.length > 5 ? Text.Fit : Text.FixedSize
-                 minimumPointSize: 10
-                 text: model.display
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
deleted file mode 100644
index c3f9e924568f..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="emoji +fontconfig ibus scim +semantic-desktop"
-
-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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${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/kwallet-${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/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXcursor
-	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
-	)
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-force-emojier-use-color-emoji-font.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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-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 scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=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
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
index d82cd24a2f0c..025fd6bdfccb 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"