From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- media-sound/pithos/Manifest | 8 +- ...ithos-1.3.1-dont-try-to-update-icon-cache.patch | 20 ----- media-sound/pithos/files/pithos-1.5.0-py38.patch | 41 ++++++++++ media-sound/pithos/files/pithos-1.5.0-tests.patch | 23 ++++++ media-sound/pithos/pithos-1.3.1.ebuild | 93 ---------------------- media-sound/pithos/pithos-1.5.0.ebuild | 78 ++++++++++++++++++ media-sound/pithos/pithos-9999.ebuild | 93 ---------------------- 7 files changed, 146 insertions(+), 210 deletions(-) delete mode 100644 media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch create mode 100644 media-sound/pithos/files/pithos-1.5.0-py38.patch create mode 100644 media-sound/pithos/files/pithos-1.5.0-tests.patch delete mode 100644 media-sound/pithos/pithos-1.3.1.ebuild create mode 100644 media-sound/pithos/pithos-1.5.0.ebuild delete mode 100644 media-sound/pithos/pithos-9999.ebuild (limited to 'media-sound/pithos') diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest index 474ef80a3793..a3cde6c571a8 100644 --- a/media-sound/pithos/Manifest +++ b/media-sound/pithos/Manifest @@ -1,5 +1,5 @@ -AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41a490fdcaa3c781d9137099507192f9301e6237d7f3b833ccce81429efcf8aaa67c04945cf0af16d47829582968b7d72850446c7ced93fd3cf SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5 -DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4 -EBUILD pithos-1.3.1.ebuild 2028 BLAKE2B 983a55b505b4e58e32f99eefd1fb4fe34496e15591bc7280ca2f43e6384ebcb4be54c8d3d1dfe0879f0099b35f8406dc33d1febcc136bf4fd4edeb3cbce258d6 SHA512 0129b8ed80200daab5d416e62bafc06e982dc8d33623cd4d30645817cbc7cdc3a2b46d6595ad15ccb96056d8463bf55446890c72c60e019630cba84d15b0eb4c -EBUILD pithos-9999.ebuild 2023 BLAKE2B e1118278c43d6b560320e480fd022f5c3f54545064bcdc956f12e8af06b1466415bcd4d07799d992488f642c94b9f1976cdeb6eaaa3cea49272f19ed3129476b SHA512 531975652ccd1c80e44ed7ba4b34cfa4a03944baad2048493dfe035a13afc7de7de26231008cba1fc53c20d534f5cd5e8ef202553ca12d3a2fd87ee93011c2e9 +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 1748 BLAKE2B e7a105ba97fe29b780600c56876a8e2baade6bd754f835bf5e02b0118a5fe345c4925046b085de97bcbdc0ba821cbfca892efe79f75c07d6dcb043a712f2937a SHA512 a890310b7bc53195f2e7beaf8b5c31a7a128039990fe5afa3ba544e129ab7fc000d3d7dd8bffd77a4320e68a2264446a145fbdcb281156af2a97e9e3e3526805 MISC metadata.xml 418 BLAKE2B a438f3fc8d1df9e7dcdd099f5fce71bdf2423b5f030ef7c73c747cdc88a9de543321a825c1c4674ce3fe5659b71ee643c3e561d7237de2e290dafd6ac4583bef SHA512 2a0e965854663d1ae76b17729ced051a6571016e989fbf1605f41ddbac699e99e51a03dca7b171d829635725f920bfc13c5885110d3694878a425660201ff651 diff --git a/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch b/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch deleted file mode 100644 index 5e1b5da91c9a..000000000000 --- a/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 0c5e1cb..b413774 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -85,13 +85,11 @@ ubuntu_light_DATA = data/icons/ubuntu-mono-light/16x16/apps/io.github.Pithos-tra - ubuntu_darkdir = $(datadir)/icons/ubuntu-mono-dark/16x16/apps - ubuntu_dark_DATA = data/icons/ubuntu-mono-dark/16x16/apps/io.github.Pithos-tray.svg - --UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || : -- - install-data-hook: -- $(UPDATE_ICON_CACHE); -+ :; - - uninstall-hook: -- $(UPDATE_ICON_CACHE); -+ :; - - BUILT_SOURCES = pithos.gresource - SUBDIRS = po diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch b/media-sound/pithos/files/pithos-1.5.0-py38.patch new file mode 100644 index 000000000000..dd4327a0d3fd --- /dev/null +++ b/media-sound/pithos/files/pithos-1.5.0-py38.patch @@ -0,0 +1,41 @@ +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/files/pithos-1.5.0-tests.patch b/media-sound/pithos/files/pithos-1.5.0-tests.patch new file mode 100644 index 000000000000..cab7639772ef --- /dev/null +++ b/media-sound/pithos/files/pithos-1.5.0-tests.patch @@ -0,0 +1,23 @@ +diff --git a/data/meson.build b/data/meson.build +index efac217..d08796a 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -41,12 +41,12 @@ pithos_appstream = i18n.merge_file( + + pithos_settings = gnome.compile_schemas() + +-appstream_util = find_program('appstream-util', required: false) +-if appstream_util.found() +- test('Validate appstream file', appstream_util, +- args: ['validate', pithos_appstream] +- ) +-endif ++#appstream_util = find_program('appstream-util', required: false) ++#if appstream_util.found() ++# test('Validate appstream file', appstream_util, ++# args: ['validate', pithos_appstream] ++# ) ++#endif + + desktop_utils = find_program('desktop-file-validate', required: false) + if desktop_utils.found() diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild deleted file mode 100644 index 102dfd5bf500..000000000000 --- a/media-sound/pithos/pithos-1.3.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit autotools gnome2-utils python-r1 - -if [[ ${PV} =~ [9]{4,} ]]; then - inherit git-2 - 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="libnotify appindicator +keybinder" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/pylast[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.12[${PYTHON_USEDEP}] - dev-libs/appstream-glib[introspection] - x11-libs/pango[introspection] - media-libs/gstreamer:1.0[introspection] - media-plugins/gst-plugins-meta:1.0[aac,http,mp3] - >=x11-libs/gtk+-3.14:3[introspection] - x11-themes/gnome-icon-theme-symbolic - libnotify? ( x11-libs/libnotify[introspection] ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) - keybinder? ( dev-libs/keybinder:3[introspection] )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch" -) - -src_prepare() { - default - eautoreconf - python_copy_sources -} - -pithos_src_configure() { - pushd "${BUILD_DIR}" || die - econf UPDATE_ICON_CACHE=":" - popd || die -} - -src_configure() { - python_foreach_impl pithos_src_configure -} - -pithos_src_compile() { - pushd "${BUILD_DIR}" || die - emake - popd || die -} - -src_compile() { - python_foreach_impl pithos_src_compile -} - -pithos_src_install() { - pushd "${BUILD_DIR}" || die - emake DESTDIR="${D}" install - python_doscript "${D}"/usr/bin/pithos - popd || die -} - -src_install() { - python_foreach_impl pithos_src_install -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/media-sound/pithos/pithos-1.5.0.ebuild b/media-sound/pithos/pithos-1.5.0.ebuild new file mode 100644 index 000000000000..11ebd44dac4c --- /dev/null +++ b/media-sound/pithos/pithos-1.5.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,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-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild deleted file mode 100644 index 1f2906dd601c..000000000000 --- a/media-sound/pithos/pithos-9999.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -inherit autotools gnome2-utils 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="" -IUSE="libnotify appindicator +keybinder" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/pylast[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.12[${PYTHON_USEDEP}] - dev-libs/appstream-glib[introspection] - x11-libs/pango[introspection] - media-libs/gstreamer:1.0[introspection] - media-plugins/gst-plugins-meta:1.0[aac,http,mp3] - >=x11-libs/gtk+-3.14:3[introspection] - x11-themes/gnome-icon-theme-symbolic - libnotify? ( x11-libs/libnotify[introspection] ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) - keybinder? ( dev-libs/keybinder:3[introspection] )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch" -) - -src_prepare() { - default - eautoreconf - python_copy_sources -} - -pithos_src_configure() { - pushd "${BUILD_DIR}" || die - econf UPDATE_ICON_CACHE=":" - popd || die -} - -src_configure() { - python_foreach_impl pithos_src_configure -} - -pithos_src_compile() { - pushd "${BUILD_DIR}" || die - emake - popd || die -} - -src_compile() { - python_foreach_impl pithos_src_compile -} - -pithos_src_install() { - pushd "${BUILD_DIR}" || die - emake DESTDIR="${D}" install - python_doscript "${D}"/usr/bin/pithos - popd || die -} - -src_install() { - python_foreach_impl pithos_src_install -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} -- cgit v1.2.3