gentoo resync : 05.12.2021

2 files changed, 0 insertions, 62 deletions

diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index eab6ecf95ff3..6025ca519dd3 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,3 @@
-AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac
 DIST picard-2.6.4.tar.gz 4319362 BLAKE2B 78768b4a8a22c51c118ba03a9e97ba6c4bec9180e5739867b5756170083930a942a0a1ceaeb74bbe724af3ca392b92139cbc4acdde9556e9031be16a968a0240 SHA512 5f44f91f9f44cb17ecd27e204b75c83b776a2c55e2a6e42f96018c83f4073d92f028ef74006d6acbe42b1ed374543a65e177f34c561bfdf13ded1085515bf353
 EBUILD picard-2.6.4.ebuild 1373 BLAKE2B 0e4d19baada49a91a0f5e9e2023c910343417d45b7e9dbaeb445069ed992338d3dc335b1985d26122e6b15309600da15ff568dc91334b9224ea4d391a4e6b416 SHA512 3f0056bf9addd5973b1cb9fdbc39288bbcb745157d6505f462e4be06b4f3f360c8df98e1a1fd26e29b1cb5b0fc4a20c3ce2c317f866fa26b8191ffdccc6c144f
 EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372
diff --git a/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch b/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch
deleted file mode 100644
index 772cbda3868d..000000000000
--- a/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 452bba954c30d5a642f03c02411529f511bda786 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Fri, 27 Aug 2021 00:43:48 +0200
-Subject: [PATCH] Fix TypeErrors with Python 3.10
-
-Without these changes, running Picard with Python 3.10 results in errors
-such as:
-  File "./picard/ui/coverartbox.py", line 74, in __init__
-    self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
-TypeError: arguments did not match any overloaded call:
-  scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
-  scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float'
----
- picard/ui/coverartbox.py | 2 +-
- picard/ui/itemviews.py   | 6 +++---
- picard/util/__init__.py  | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py
-index c3eb4ddb74..f3a174664b 100644
---- a/picard/ui/coverartbox.py
-+++ b/picard/ui/coverartbox.py
-@@ -135,7 +135,7 @@ def dropEvent(self, event):
-             event.acceptProposedAction()
- 
-     def scaled(self, *dimensions):
--        return (self.pixel_ratio * dimension for dimension in dimensions)
-+        return (round(self.pixel_ratio * dimension) for dimension in dimensions)
- 
-     def show(self):
-         self.set_data(self.data, True)
-diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py
-index cffab6d70d..d1101b340f 100644
---- a/picard/ui/itemviews.py
-+++ b/picard/ui/itemviews.py
-@@ -141,9 +141,9 @@ def get_match_color(similarity, basecolor):
-     c1 = (basecolor.red(), basecolor.green(), basecolor.blue())
-     c2 = (223, 125, 125)
-     return QtGui.QColor(
--        c2[0] + (c1[0] - c2[0]) * similarity,
--        c2[1] + (c1[1] - c2[1]) * similarity,
--        c2[2] + (c1[2] - c2[2]) * similarity)
-+        int(c2[0] + (c1[0] - c2[0]) * similarity),
-+        int(c2[1] + (c1[1] - c2[1]) * similarity),
-+        int(c2[2] + (c1[2] - c2[2]) * similarity))
- 
- 
- class MainPanel(QtWidgets.QSplitter):
-diff --git a/picard/util/__init__.py b/picard/util/__init__.py
-index 3a4765f7cd..26f7576f56 100644
---- a/picard/util/__init__.py
-+++ b/picard/util/__init__.py
-@@ -400,7 +400,7 @@ def throttled_func(*args, **kwargs):
-             else:
-                 decorator.args = args
-                 decorator.kwargs = kwargs
--                QtCore.QTimer.singleShot(r, later)
-+                QtCore.QTimer.singleShot(int(r), later)
-                 decorator.is_ticking = True
-             mutex.unlock()
-