commit: 9f775d64b603d020ddfe571b23ee996017e3cf3f
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 20:17:16 2021 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon May 24 20:17:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f775d64
media-sound/pithos-1.5.1: Version bump, add py39
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
media-sound/pithos/Manifest | 2 +-
media-sound/pithos/files/pithos-1.5.0-py38.patch | 41 ----------------------
.../{pithos-1.5.0.ebuild => pithos-1.5.1.ebuild} | 6 ++--
3 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 1c11e496cf1..684c9f03dac 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1 +1 @@
-DIST pithos-1.5.0.tar.gz 123047 BLAKE2B
6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3
SHA512
eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657
+DIST pithos-1.5.1.tar.gz 123504 BLAKE2B
fc7cd51fd773989b5734d7bfcea674c622b3c9e5072d8ae65ed724476a025802f08916c533ea6c338e748aaf5fcce595ff352b0bae6c72dc074de2afaddbb737
SHA512
43841194d0a3c3df9dd98b819c8a1e30862ebd49aad8ba4f92e91cc7e680fba97159b70748f4042737d5e399bda64cd16d6e9f6d0e29136350c78be57474442e
diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch
b/media-sound/pithos/files/pithos-1.5.0-py38.patch
deleted file mode 100644
index dd4327a0d3f..00000000000
--- a/media-sound/pithos/files/pithos-1.5.0-py38.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 3a23742614058b4bc97d71e1bb826e19891f0d24
-Author: JasonLG1979 <jasonlevigr...@gmail.com>
-Date: Sun Mar 22 20:50:53 2020 -0500
-
- Quiet SyntaxWarning: "is" with a literal in Python 3.8
-
-diff --git a/pithos/SearchDialog.py b/pithos/SearchDialog.py
-index d8eec14..fcc9004 100644
---- a/pithos/SearchDialog.py
-+++ b/pithos/SearchDialog.py
-@@ -61,11 +61,11 @@ class SearchDialog(Gtk.Dialog):
- return
-
- for i in results:
-- if i.resultType is 'song':
-+ if i.resultType == 'song':
- mk = '<b>{}</b> by {}'.format(html.escape(i.title),
html.escape(i.artist))
-- elif i.resultType is 'artist':
-+ elif i.resultType == 'artist':
- mk = '<b>{}</b> (artist)'.format(html.escape(i.name))
-- elif i.resultType is 'genre':
-+ elif i.resultType == 'genre':
- mk = '<b>{}</b>
(genre)'.format(html.escape(i.stationName))
- self.model.append((i, mk))
- self.treeview.show()
-diff --git a/pithos/StationsDialog.py b/pithos/StationsDialog.py
-index a2b51b2..43cdcb6 100644
---- a/pithos/StationsDialog.py
-+++ b/pithos/StationsDialog.py
-@@ -201,9 +201,9 @@ class StationsDialog(Gtk.Dialog):
- def add_station_cb(self, dialog, response):
- result = dialog.result
- if result is not None:
-- if result.resultType is 'song':
-+ if result.resultType == 'song':
- description = '{} by {}'.format(html.escape(result.title),
html.escape(result.artist))
-- elif result.resultType is 'artist':
-+ elif result.resultType == 'artist':
- description = html.escape(result.name)
- else:
- description = html.escape(result.stationName)
diff --git a/media-sound/pithos/pithos-1.5.0.ebuild
b/media-sound/pithos/pithos-1.5.1.ebuild
similarity index 93%
rename from media-sound/pithos/pithos-1.5.0.ebuild
rename to media-sound/pithos/pithos-1.5.1.ebuild
index 16a9e61fadc..e2e787a9ca0 100644
--- a/media-sound/pithos/pithos-1.5.0.ebuild
+++ b/media-sound/pithos/pithos-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit meson gnome2-utils virtualx python-r1
if [[ ${PV} =~ [9]{4,} ]]; then
@@ -46,8 +46,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/pithos-1.5.0-py38.patch"
-
# comment out tests that need internet
"${FILESDIR}/pithos-1.5.0-tests.patch"
)
