media-sound/beets: Drop patch for now.

Closes: https://bugs.gentoo.org/702272
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index a340e1c3ed4292ec4f74ba5d51bfcd23ed15b52f..f7001b9fd20aeecb9efe3c1f265e65933e91604a 100644 (file)
--- a/media-sound/beets/beets-1.4.9-r1.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -78,11 +78,11 @@ RDEPEND="${DEPEND}"
 
 RESTRICT="test" # tests broken in 1.4.3 already
 
-PATCHES=( "${FILESDIR}/${P}-py37.patch" )
-
 S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
+       distutils-r1_python_prepare_all
+
        rm_use_plugins() {
                [[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
                local use=${1}
@@ -103,8 +103,6 @@ python_prepare_all() {
                done
        }
 
-       distutils-r1_python_prepare_all
-
        rm_use_plugins chromaprint chroma
        rm_use_plugins ffmpeg convert
        rm_use_plugins icu loadext

diff --git a/media-sound/beets/files/beets-1.4.9-py37.patch b/media-sound/beets/files/beets-1.4.9-py37.patch
deleted file mode 100644 (file)
index 564357b..0000000
--- a/media-sound/beets/files/beets-1.4.9-py37.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 15d44f02a391764da1ce1f239caef819f08beed8 Mon Sep 17 00:00:00 2001
-From: Adrian Sampson <adrian@radbox.org>
-Date: Sun, 22 Jul 2018 12:34:19 -0400
-Subject: [PATCH] Fix Python 3.7 compatibility (#2978)
-
----
- beets/autotag/hooks.py | 8 +++++++-
- docs/changelog.rst     | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
-index 3615a93337b8..1c62a54c5c35 100644
---- a/beets/autotag/hooks.py
-+++ b/beets/autotag/hooks.py
-@@ -31,6 +31,12 @@ import six
- 
- log = logging.getLogger('beets')
- 
-+# The name of the type for patterns in re changed in Python 3.7.
-+try:
-+    Pattern = re._pattern_type
-+except AttributeError:
-+    Pattern = re.Pattern
-+
- 
- # Classes used to represent candidate options.
- 
-@@ -433,7 +439,7 @@ class Distance(object):
-         be a compiled regular expression, in which case it will be
-         matched against `value2`.
-         """
--        if isinstance(value1, re._pattern_type):
-+        if isinstance(value1, Pattern):
-             return bool(value1.match(value2))
-         return value1 == value2
- 
--- 
-2.20.1