From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56CFF138334 for ; Sun, 8 Dec 2019 08:53:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DE44E0918; Sun, 8 Dec 2019 08:53:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADB4DE0918 for ; Sun, 8 Dec 2019 08:53:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 656A434D5B1 for ; Sun, 8 Dec 2019 08:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B71B27FE for ; Sun, 8 Dec 2019 08:53:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1575795176.4508997e9ffd762f35f6cff6cc5ba93ace9123e9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/beets/files/, media-sound/beets/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/beets/beets-1.4.9-r1.ebuild media-sound/beets/files/beets-1.4.9-py37.patch X-VCS-Directories: media-sound/beets/ media-sound/beets/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4508997e9ffd762f35f6cff6cc5ba93ace9123e9 X-VCS-Branch: master Date: Sun, 8 Dec 2019 08:53:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f52739d6-8be7-4010-a28c-38782dc38491 X-Archives-Hash: 5b2f316fcc4b17ae08636b8a41a98341 commit: 4508997e9ffd762f35f6cff6cc5ba93ace9123e9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 8 08:52:27 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 8 08:52:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4508997e 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 gentoo.org> media-sound/beets/beets-1.4.9-r1.ebuild | 6 ++-- media-sound/beets/files/beets-1.4.9-py37.patch | 38 -------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/media-sound/beets/beets-1.4.9-r1.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild index a340e1c3ed4..f7001b9fd20 100644 --- 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 index 564357bc378..00000000000 --- 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 -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