gentoo resync : 12.05.2022

4 files changed, 7 insertions, 119 deletions

diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 8be5ed6e6dd8..d58adb943381 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,6 +1,5 @@
-AUX kajongg-21.08.3-python3.10.patch 4231 BLAKE2B 52752926e4700f95670f84963577e01297b6b2a3edb8c632a3641aa09692bf59807d4a2c2ef0bef5f056273b52799d864e8ccac94f3429a91273ddb4c0a9309d SHA512 a5f213d14c558321521713924c5b390e3a0644ca40d3db4a63635e708572f1b2f68f313290b065fade9fb2f526a636025f66bae38c1bc62918793dacc6dcf178
-DIST kajongg-21.08.3.tar.xz 4558208 BLAKE2B 0f92104be52b61ac107d6530078fd669509d40d39dec2a27f9bf22230e3395e756e7e58f809d8536d98d0d5fb2b2312c0f26ab94de6e216a27fd2408167a514c SHA512 017f687822e5de18466333e70479bfab12b7d22f28ba69479adf16cca99ef102106c2b6aa55dea801edb2299fb2ad5de379bb30942314ff2a195beb54695ae2f
 DIST kajongg-21.12.3.tar.xz 4560472 BLAKE2B 517ed163099f56d67a75cd7cbd76069affff8fa95ad3860a4702f8200ed58b3bddebfe21d17e1bb7e86f8983a8292ffe52c09cf1fa5509c44eaf7a753c857a25 SHA512 7b0cf7cb4994946b7e5fb1a203a4fd0a7ea9be7fd095f694033c1c56f3aa514703213474aed3e670800a0e09cc005d1fd3c964248ad6eaaf2b600bfa3a913b01
-EBUILD kajongg-21.08.3-r1.ebuild 1065 BLAKE2B 550cd500677f8046222316a8411ee84894abcf9969c077966fb68a91180c9b1485058f1ac219a4ec5260090c84b92eb47b2d25c090d612899ed5211731588304 SHA512 08cf5244d4b7af6f5d962d53a7b1e8443494c9aa96f2c4745f8ec5fc4a617fe38c477da3d02ab398c553d5e14486582e1a79e80036276dcb52bfb7be704880bf
-EBUILD kajongg-21.12.3.ebuild 1017 BLAKE2B 3b02ebfb8073cf9240c8e67f268ff6ca9c12d8bd85b9b80d9a3821a6e2af8aca7c75d660de449a96f94992c17e939b4779a70926036662c8a0172d8b373ffb55 SHA512 9f3e8c19976e82102d8c9dd4e8e797c946a27f2301b36a0cdbf76612d5c41d182eaf27fc48b8de202dbddeadb7076f313397c8294fb3ca430155286ec859e9a3
+DIST kajongg-22.04.0.tar.xz 4567040 BLAKE2B 11186c38e725c70291eff916525d0366d3ee42c9e76c229a4f73ad1bb0253f71813f20995fd1f0fd54e869aab957ffad2f0b91126c69d8c76ffd2faff3f5b733 SHA512 f607763a9b9da77fbccd36259a7bd66bb08db2360bcf41a82bfbe826cbdebfc24a907d7ac2554895e9ff2a10d8f4e70166b13f21759ba610a088ef2361750258
+EBUILD kajongg-21.12.3.ebuild 1016 BLAKE2B 51a9407500f6c3807d11ccfa956bde1acd62c3fd47c1b2678cdc3e7a0442a56918793c49fdd7a1dac2f7a826d9f2c169b48db5e91a4008de46b8d079d74c1533 SHA512 0f8b48c601551f3872289dd5c486b90c1f2df1ae3b441de5e3a033e82f9d0574180b1de100d74d619561aee7ac6c9ad6f4cc7eb7bee13bb6f10a101acb7a689c
+EBUILD kajongg-22.04.0.ebuild 1019 BLAKE2B fbe3e9376ac3497a8a00ec48bdcb7d26de3b6c91f6df6ab7c74163a43cc9428376b73b2dcd933f9216948ce6c6525c0b0285239a71c9647ad03023bb3908ab0b SHA512 cf8fd733d8f8dee1ac4e1fdf77c55c76e0982ed19da24101f7653853c0e5091e498f5c83c134112e19930bb83a039549ceb1fdf1e989a6546ab2ef5780539087
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch b/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch
deleted file mode 100644
index d9f7e100309d..000000000000
--- a/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From b647417e16f6146f4ae89608fd0494e7780da862 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 18 Dec 2021 10:13:32 +0000
-Subject: [PATCH] Fix running with Python 3.10
-
----
- src/board.py            | 10 +++++-----
- src/genericdelegates.py |  2 +-
- src/humanclient.py      |  4 ++--
- src/qtreactor.py        |  2 +-
- src/uitile.py           |  4 ++--
- 5 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/board.py b/src/board.py
-index 2f52a47d..ed432c22 100644
---- a/src/board.py
-+++ b/src/board.py
-@@ -102,7 +102,7 @@ class PlayerWind(AnimatedMixin, QGraphicsObject, StrMixin):
-         """paint the marker"""
-         with Painter(painter):
-             painter.setBrush(self.__brush)
--            size = Internal.scene.windTileset.faceSize.height()
-+            size = int(Internal.scene.windTileset.faceSize.height())
-             ellRect = QRectF(QPoint(), QPoint(size, size))
-             painter.drawEllipse(ellRect)
-             renderer = Internal.scene.windTileset.renderer()
-@@ -112,7 +112,7 @@ class PlayerWind(AnimatedMixin, QGraphicsObject, StrMixin):
- 
-     def boundingRect(self): # pylint: disable=no-self-use
-         """define the part of the tile we want to see"""
--        size = Internal.scene.windTileset.faceSize.height() * 1.1
-+        size = int(Internal.scene.windTileset.faceSize.height() * 1.1)
-         return QRectF(QPoint(), QPoint(size, size))
- 
-     def __str__(self):
-@@ -878,11 +878,11 @@ class FittingView(QGraphicsView):
-         tRect = uiTile.boundingRect()
-         tRect = self.viewportTransform().mapRect(tRect)
-         pmapSize = QSize(
--            tRect.width() * uiTile.scale,
--            tRect.height() * uiTile.scale)
-+            int(tRect.width() * uiTile.scale),
-+            int(tRect.height() * uiTile.scale))
-         pMap = uiTile.pixmapFromSvg(pmapSize)
-         drag.setPixmap(pMap)
--        drag.setHotSpot(QPoint(pMap.width() / 2, pMap.height() / 2))
-+        drag.setHotSpot(QPoint(int(pMap.width() / 2), int(pMap.height() / 2)))
-         return drag
- 
- 
-diff --git a/src/genericdelegates.py b/src/genericdelegates.py
-index be99eb57..a4521177 100644
---- a/src/genericdelegates.py
-+++ b/src/genericdelegates.py
-@@ -64,7 +64,7 @@ class RichTextColumnDelegate(QStyledItemDelegate):
-         text = index.model().data(index)
-         self.document.setDefaultFont(option.font)
-         self.document.setHtml(text)
--        return QSize(self.document.idealWidth() + 5,
-+        return QSize(int(self.document.idealWidth()) + 5,
-                      option.fontMetrics.height())
- 
- 
-diff --git a/src/humanclient.py b/src/humanclient.py
-index 1d3f58f3..8edf848b 100644
---- a/src/humanclient.py
-+++ b/src/humanclient.py
-@@ -321,8 +321,8 @@ class ClientDialog(QDialog):
-             idx if vertical else 0,
-             idx if not vertical else 0)
- 
--        geometry.setWidth(width)
--        geometry.setHeight(height)
-+        geometry.setWidth(int(width))
-+        geometry.setHeight(int(height))
-         self.setGeometry(geometry)
- 
-     def showEvent(self, dummyEvent):
-diff --git a/src/qtreactor.py b/src/qtreactor.py
-index bda4782f..c24d01d0 100644
---- a/src/qtreactor.py
-+++ b/src/qtreactor.py
-@@ -250,7 +250,7 @@ class QtReactor(posixbase.PosixReactorBase):
-             timeout = 0
-         else:
-             timeout = self.timeout()
--        self._timer.setInterval(timeout * 1000)
-+        self._timer.setInterval(int(timeout * 1000))
-         self._timer.start()
- 
-     def runReturn(self, installSignalHandlers=True):
-diff --git a/src/uitile.py b/src/uitile.py
-index 57e322bb..9e4b3f9d 100644
---- a/src/uitile.py
-+++ b/src/uitile.py
-@@ -250,8 +250,8 @@ class UITile(AnimatedMixin, QGraphicsObject, StrMixin):
-         if self.showFace():
-             faceSize = self.tileset.faceSize.toSize()
-             faceSize = QSize(
--                faceSize.width() * xScale,
--                faceSize.height() * yScale)
-+                int(faceSize.width() * xScale),
-+                int(faceSize.height() * yScale))
-             painter.translate(self.facePos())
-             renderer.render(painter, self.tileset.svgName[self.tile.exposed],
-                             QRectF(QPointF(), QSizeF(faceSize)))
--- 
-GitLab
-
diff --git a/kde-apps/kajongg/kajongg-21.12.3.ebuild b/kde-apps/kajongg/kajongg-21.12.3.ebuild
index 7093b4a39c00..bf57e862edc2 100644
--- a/kde-apps/kajongg/kajongg-21.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kajongg/kajongg-21.08.3-r1.ebuild b/kde-apps/kajongg/kajongg-22.04.0.ebuild
index 254228048ce3..e8ea0981cde1 100644
--- a/kde-apps/kajongg/kajongg-21.08.3-r1.ebuild
+++ b/kde-apps/kajongg/kajongg-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{8..10} )
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit python-single-r1 ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,8 +37,6 @@ RDEPEND="${DEPEND}
 	>=kde-apps/libkmahjongg-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-python3.10.patch" )
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup