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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40CA415ACFC for ; Thu, 27 Apr 2023 14:41:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4ADB6E0932; Thu, 27 Apr 2023 14:41:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23559E0932 for ; Thu, 27 Apr 2023 14:41:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 031E8340E43 for ; Thu, 27 Apr 2023 14:41:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52717A54 for ; Thu, 27 Apr 2023 14:41:00 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1682606449.0550e8561811e86aa2d433918a7911e5a6bfcb93.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/deluge-2.1.1-r3.ebuild net-p2p/deluge/files/deluge-2.1.1-ayatana.patch X-VCS-Directories: net-p2p/deluge/ net-p2p/deluge/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 0550e8561811e86aa2d433918a7911e5a6bfcb93 X-VCS-Branch: master Date: Thu, 27 Apr 2023 14:41:00 +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: 31680cc7-b5bc-4872-81fb-8accc69a58bd X-Archives-Hash: c18d8985a112ca26dc1ea8f66d0da811 commit: 0550e8561811e86aa2d433918a7911e5a6bfcb93 Author: Pacho Ramos gentoo org> AuthorDate: Thu Apr 27 14:39:30 2023 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Apr 27 14:40:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0550e856 net-p2p/deluge: Fix ayatana indicators detection Patch already accepted by upstream: https://dev.deluge-torrent.org/ticket/3598 https://dev.deluge-torrent.org/changeset/dbedf7f63 Closes: https://bugs.gentoo.org/904663 Signed-off-by: Pacho Ramos gentoo.org> net-p2p/deluge/deluge-2.1.1-r3.ebuild | 177 ++++++++++++++++++++++++ net-p2p/deluge/files/deluge-2.1.1-ayatana.patch | 17 +++ 2 files changed, 194 insertions(+) diff --git a/net-p2p/deluge/deluge-2.1.1-r3.ebuild b/net-p2p/deluge/deluge-2.1.1-r3.ebuild new file mode 100644 index 000000000000..2d6ade36c4d5 --- /dev/null +++ b/net-p2p/deluge/deluge-2.1.1-r3.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 systemd xdg + +DESCRIPTION="BitTorrent client with a client/server model" +HOMEPAGE="https://deluge-torrent.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" +else + SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="console gui libnotify sound webinterface" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + libnotify? ( gui ) + sound? ( gui ) +" + +BDEPEND=" + dev-util/intltool + test? ( + $(python_gen_cond_dep ' + >=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}] + ') + ) +" + +RDEPEND=" + acct-group/deluge + acct-user/deluge + net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + gui? ( + sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) + dev-python/pygobject:3[${PYTHON_USEDEP}] + gnome-base/librsvg + libnotify? ( x11-libs/libnotify ) + ) + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + || ( + >=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}] + >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}] + ) + >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + "${FILESDIR}/${P}-twisted-22.10.patch" + # https://dev.deluge-torrent.org/ticket/3598 + "${FILESDIR}/${P}-ayatana.patch" +) + +distutils_enable_tests pytest + +python_prepare_all() { + local args=( + -e 's|"new_release_check": True|"new_release_check": False|' + -e 's|"check_new_releases": True|"check_new_releases": False|' + -e 's|"show_new_releases": True|"show_new_releases": False|' + ) + sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die + + distutils-r1_python_prepare_all +} + +python_test() { + local EPYTEST_IGNORE=( + # Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps... + deluge/plugins/Stats/deluge_stats/tests/test_stats.py + # Skipped upstream + deluge/tests/test_security.py + ) + local EPYTEST_DESELECT=( + # Skipped upstream + 'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui' + 'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered' + 'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni' + # never returns + 'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon' + # failing network(?)-related tests, even with sandbox disabled + 'deluge/tests/test_common.py::TestCommon::test_is_interface' + # fails + 'deluge/tests/test_core.py::TestCore::test_pause_torrents' + # fails because of network sandbox + 'deluge/tests/test_core.py::TestCore::test_test_listen_port' + 'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png' + 'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico' + 'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew' + 'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect' + # segfaults with FEATURES="network-sandbox" + 'deluge/tests/test_core.py::TestCore::test_pause_torrent' + ) + + # dev-python/pytest-twisted has disabled autoloading + epytest -m "not (todo or gtkui)" -p pytest_twisted -v +} + +python_install_all() { + distutils-r1_python_install_all + if ! use console ; then + rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die + rm "${ED}/usr/bin/deluge-console" || die + rm "${ED}/usr/share/man/man1/deluge-console.1" ||die + fi + if ! use gui ; then + rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die + rm -r "${ED}/usr/share/icons/" || die + rm "${ED}/usr/bin/deluge-gtk" || die + rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die + else + mkdir -p "${ED}/usr/share/applications/" || die + cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die + mkdir -p "${ED}/usr/share/metainfo" || die + cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die + fi + + if use webinterface; then + newinitd "${FILESDIR}/deluge-web.init-2" deluge-web + newconfd "${FILESDIR}/deluge-web.conf" deluge-web + systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service + systemd_install_serviced "${FILESDIR}/deluge-web.service.conf" + else + rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die + rm "${ED}/usr/bin/deluge-web" || die + rm "${ED}/usr/share/man/man1/deluge-web.1" || die + fi + + newinitd "${FILESDIR}"/deluged.init-2 deluged + newconfd "${FILESDIR}"/deluged.conf-2 deluged + systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service + systemd_install_serviced "${FILESDIR}"/deluged.service.conf + + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + elog + elog "If, after upgrading, deluge doesn't work please back up and then" + elog "remove your '~/.config/deluge' directory and try again" + elog + elog "To start the daemon either run 'deluged' as user" + elog "or modify /etc/conf.d/deluged and run" + elog "'/etc/init.d/deluged start' as root if you use OpenRC" + elog "or" + elog "'systemctl start deluged.service' as root if you use systemd" + elog "You can still use deluge the old way" + elog + elog "Systemd unit files for deluged and deluge-web no longer source" + elog "/etc/conf.d/deluge* files. Environment variable customization now" + elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf" + elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf" + elog + elog "For more information see https://dev.deluge-torrent.org/wiki/Faq" + elog +} diff --git a/net-p2p/deluge/files/deluge-2.1.1-ayatana.patch b/net-p2p/deluge/files/deluge-2.1.1-ayatana.patch new file mode 100644 index 000000000000..72f6378ada88 --- /dev/null +++ b/net-p2p/deluge/files/deluge-2.1.1-ayatana.patch @@ -0,0 +1,17 @@ +Index: deluge/ui/gtk3/preferences.py +=================================================================== +--- a/deluge/ui/gtk3/preferences.py (revision 930cf87103284941514283c2a5f6c55cdc56294d) ++++ b/deluge/ui/gtk3/preferences.py (revision dbedf7f639931afb635c68ac42194b1816155b54) +@@ -31,6 +31,10 @@ + + try: +- require_version('AppIndicator3', '0.1') +- from gi.repository import AppIndicator3 # noqa: F401 ++ try: ++ require_version('AyatanaAppIndicator3', '0.1') ++ from gi.repository import AyatanaAppIndicator3 # noqa: F401 ++ except (ValueError, ImportError): ++ require_version('AppIndicator3', '0.1') ++ from gi.repository import AppIndicator3 # noqa: F401 + except (ImportError, ValueError): + appindicator = False