From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- media-sound/pithos/Manifest | 5 +- media-sound/pithos/files/pithos-1.5.0-py38.patch | 41 ------------- media-sound/pithos/pithos-1.5.0.ebuild | 78 ------------------------ media-sound/pithos/pithos-1.5.1.ebuild | 76 +++++++++++++++++++++++ 4 files changed, 78 insertions(+), 122 deletions(-) delete mode 100644 media-sound/pithos/files/pithos-1.5.0-py38.patch delete mode 100644 media-sound/pithos/pithos-1.5.0.ebuild create mode 100644 media-sound/pithos/pithos-1.5.1.ebuild (limited to 'media-sound/pithos') diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest index 3e9434a2f9af..3f710ae8f5b5 100644 --- a/media-sound/pithos/Manifest +++ b/media-sound/pithos/Manifest @@ -1,5 +1,4 @@ -AUX pithos-1.5.0-py38.patch 1815 BLAKE2B b47a5efd83f41562919d9bfbaf97f714c30ec2aa6e92bcced871326ca84a060c3ad5c128d7974f3084e9eb045db7a434d53aa766775decad5ed58823ff7be22f SHA512 40174e33251b11f8c95099ad01b7ab482026a76ee625f12a5a68e38abe8d081fd265e5bc0939dbfc27e3650cbaac18085a215663cefb2a23417ab437fbadbde0 AUX pithos-1.5.0-tests.patch 730 BLAKE2B fbd1613c2c3e38a6acefd215e35babd9a6f41aac6fdb492b51e0d1285eac3b2441f3323206282acd8c72bb33dcd9b80c5a8d0fd53e478df9445f6d42ae4392ae SHA512 a50e0929f9a19cca0e2d7e888d5ac228ba820ff58c7d71e08b57f92394e7913bf9bf02e5ae2de736df4b69621c913b07bf6baf14ecc9aaee3e5df921965d70ea -DIST pithos-1.5.0.tar.gz 123047 BLAKE2B 6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3 SHA512 eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657 -EBUILD pithos-1.5.0.ebuild 1746 BLAKE2B 7710aeb5b046d7359204c3453702d705ec606d8cfccc474a7583c8aafe221891c42f2771ced786549cc7f8be14105c4f375a106527a14730e79a1016244660ef SHA512 43bd12189a868c1f0695f797056c6f95b925908c64a1d36742cbbf618dc3bd78d4f6e313cc55496d5e4e39a78267083d92ca4c8803f584b09a82c8084639155f +DIST pithos-1.5.1.tar.gz 123504 BLAKE2B fc7cd51fd773989b5734d7bfcea674c622b3c9e5072d8ae65ed724476a025802f08916c533ea6c338e748aaf5fcce595ff352b0bae6c72dc074de2afaddbb737 SHA512 43841194d0a3c3df9dd98b819c8a1e30862ebd49aad8ba4f92e91cc7e680fba97159b70748f4042737d5e399bda64cd16d6e9f6d0e29136350c78be57474442e +EBUILD pithos-1.5.1.ebuild 1707 BLAKE2B 61b5b14b480b1f9ae11aafbd58edeeae0dde8f68ab93bf5bf9c0be6b4efbfe46b4b221198586a3e7e8a03469679fbf5b7ed751c66ee83e608066c1ef8772376f SHA512 4cc56ed3173a47ebd821f005f34ac415c2e7db38e3261092da41e70ff43d09ca240713645b219d1c8d6bca0a7ecf39e483dad0fecb4708f5d17bb09e92ae65ba MISC metadata.xml 418 BLAKE2B a438f3fc8d1df9e7dcdd099f5fce71bdf2423b5f030ef7c73c747cdc88a9de543321a825c1c4674ce3fe5659b71ee643c3e561d7237de2e290dafd6ac4583bef SHA512 2a0e965854663d1ae76b17729ced051a6571016e989fbf1605f41ddbac699e99e51a03dca7b171d829635725f920bfc13c5885110d3694878a425660201ff651 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 dd4327a0d3fd..000000000000 --- a/media-sound/pithos/files/pithos-1.5.0-py38.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 3a23742614058b4bc97d71e1bb826e19891f0d24 -Author: JasonLG1979 -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 = '{} by {}'.format(html.escape(i.title), html.escape(i.artist)) -- elif i.resultType is 'artist': -+ elif i.resultType == 'artist': - mk = '{} (artist)'.format(html.escape(i.name)) -- elif i.resultType is 'genre': -+ elif i.resultType == 'genre': - mk = '{} (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.0.ebuild deleted file mode 100644 index 16a9e61fadcf..000000000000 --- a/media-sound/pithos/pithos-1.5.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) -inherit meson gnome2-utils virtualx python-r1 - -if [[ ${PV} =~ [9]{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="Pandora.com client for the GNOME desktop" -HOMEPAGE="https://pithos.github.io/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="appindicator +keybinder libnotify test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/pygobject[${PYTHON_USEDEP}] - app-crypt/libsecret[introspection] - dev-libs/appstream-glib[introspection] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pylast[${PYTHON_USEDEP}] - media-libs/gstreamer:1.0[introspection] - media-plugins/gst-plugins-meta:1.0[aac,http,mp3] - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] - x11-themes/gnome-icon-theme-symbolic - appindicator? ( dev-libs/libappindicator:3[introspection] ) - keybinder? ( dev-libs/keybinder:3[introspection] ) - libnotify? ( x11-libs/libnotify[introspection] ) -" -BDEPEND=" - virtual/pkgconfig - test? ( - ${RDEPEND} - dev-libs/glib:2 - dev-util/desktop-file-utils - ) -" - -PATCHES=( - "${FILESDIR}/pithos-1.5.0-py38.patch" - - # comment out tests that need internet - "${FILESDIR}/pithos-1.5.0-tests.patch" -) - -src_configure() { - python_foreach_impl meson_src_configure -} - -src_compile() { - python_foreach_impl meson_src_compile -} - -src_test() { - virtx python_foreach_impl meson_src_test -} - -src_install() { - python_foreach_impl meson_src_install - einstalldocs -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/media-sound/pithos/pithos-1.5.1.ebuild b/media-sound/pithos/pithos-1.5.1.ebuild new file mode 100644 index 000000000000..e2e787a9ca02 --- /dev/null +++ b/media-sound/pithos/pithos-1.5.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit meson gnome2-utils virtualx python-r1 + +if [[ ${PV} =~ [9]{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Pandora.com client for the GNOME desktop" +HOMEPAGE="https://pithos.github.io/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="appindicator +keybinder libnotify test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/pygobject[${PYTHON_USEDEP}] + app-crypt/libsecret[introspection] + dev-libs/appstream-glib[introspection] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pylast[${PYTHON_USEDEP}] + media-libs/gstreamer:1.0[introspection] + media-plugins/gst-plugins-meta:1.0[aac,http,mp3] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] + x11-themes/gnome-icon-theme-symbolic + appindicator? ( dev-libs/libappindicator:3[introspection] ) + keybinder? ( dev-libs/keybinder:3[introspection] ) + libnotify? ( x11-libs/libnotify[introspection] ) +" +BDEPEND=" + virtual/pkgconfig + test? ( + ${RDEPEND} + dev-libs/glib:2 + dev-util/desktop-file-utils + ) +" + +PATCHES=( + # comment out tests that need internet + "${FILESDIR}/pithos-1.5.0-tests.patch" +) + +src_configure() { + python_foreach_impl meson_src_configure +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + virtx python_foreach_impl meson_src_test +} + +src_install() { + python_foreach_impl meson_src_install + einstalldocs +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} -- cgit v1.2.3