From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/
Date: Fri, 19 May 2023 09:10:56 +0000 (UTC) [thread overview]
Message-ID: <1684487448.5eae2d2916a1257ab2e9f39538012c7fb26a08dc.pacho@gentoo> (raw)
commit: 5eae2d2916a1257ab2e9f39538012c7fb26a08dc
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 09:10:38 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri May 19 09:10:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eae2d29
net-p2p/deluge: drop 2.1.1-r2, 2.1.1-r3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-p2p/deluge/deluge-2.1.1-r2.ebuild | 173 ---------------------------------
net-p2p/deluge/deluge-2.1.1-r3.ebuild | 177 ----------------------------------
2 files changed, 350 deletions(-)
diff --git a/net-p2p/deluge/deluge-2.1.1-r2.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
deleted file mode 100644
index 9239e7a1126d..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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" )
-
-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/deluge-2.1.1-r3.ebuild b/net-p2p/deluge/deluge-2.1.1-r3.ebuild
deleted file mode 100644
index 2d6ade36c4d5..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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
-}
next reply other threads:[~2023-05-19 9:11 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 9:10 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 4:23 [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/ Sam James
2024-10-03 9:24 Sam James
2024-06-05 15:42 Michał Górny
2024-06-05 15:42 Michał Górny
2024-06-03 2:49 Sam James
2024-06-03 2:49 Sam James
2024-06-03 2:49 Sam James
2023-05-27 7:49 Joonas Niilola
2023-05-21 6:01 Joonas Niilola
2023-05-20 7:13 Sam James
2023-03-21 16:42 Craig Andrews
2022-11-03 23:42 Sam James
2022-10-14 5:49 Joonas Niilola
2022-10-14 1:28 Sam James
2022-10-10 23:40 Sam James
2022-09-30 23:24 Sam James
2022-09-16 2:52 Yixun Lan
2022-09-16 2:52 Yixun Lan
2022-08-26 15:42 Arthur Zamarin
2022-08-26 15:42 Arthur Zamarin
2022-08-26 11:40 Sam James
2022-08-26 9:58 Arthur Zamarin
2022-08-26 7:22 Sam James
2022-08-26 7:22 Sam James
2022-07-04 6:57 Michał Górny
2022-06-22 6:43 Michał Górny
2022-05-26 16:17 Joonas Niilola
2022-05-26 16:17 Joonas Niilola
2022-03-12 10:15 Arthur Zamarin
2022-01-31 18:50 Sam James
2022-01-27 9:21 Agostino Sarubbo
2021-12-17 0:54 Craig Andrews
2021-12-15 19:29 Craig Andrews
2021-12-13 16:56 Craig Andrews
2021-12-11 1:16 Sam James
2021-10-23 7:44 Agostino Sarubbo
2021-10-21 4:40 Agostino Sarubbo
2021-09-26 4:16 Sam James
2021-09-26 4:14 Sam James
2021-08-11 21:14 Sam James
2021-05-19 0:08 Craig Andrews
2021-03-20 8:25 Joonas Niilola
2021-02-19 12:07 Sam James
2021-02-19 2:41 Sam James
2020-10-16 21:49 Sam James
2020-07-01 13:58 Craig Andrews
2020-05-06 6:41 Sergei Trofimovich
2020-04-27 13:48 Mikle Kolyada
2020-04-27 11:40 Agostino Sarubbo
2020-04-17 14:43 Craig Andrews
2020-04-14 21:06 Sergei Trofimovich
2020-03-26 17:36 Michał Górny
2020-02-24 13:19 Agostino Sarubbo
2020-02-09 16:47 Michał Górny
2020-01-28 15:31 Craig Andrews
2020-01-27 11:41 Mikle Kolyada
2020-01-18 23:57 Richard Freeman
2019-12-26 17:29 Pacho Ramos
2019-10-16 21:20 Craig Andrews
2019-10-16 21:20 Craig Andrews
2019-10-15 16:18 Craig Andrews
2019-10-11 14:57 Craig Andrews
2019-03-31 8:30 Pacho Ramos
2019-01-24 23:22 Craig Andrews
2018-05-20 0:16 Aaron Bauman
2018-02-22 21:49 Andreas Sturmlechner
2018-02-11 11:12 Michał Górny
2018-02-04 17:41 Andreas Sturmlechner
2018-01-05 15:38 Ulrich Müller
2017-12-20 22:13 Kristian Fiskerstrand
2017-12-20 22:13 Kristian Fiskerstrand
2017-06-13 8:46 Kristian Fiskerstrand
2017-06-09 10:19 Agostino Sarubbo
2017-06-09 9:44 Agostino Sarubbo
2017-06-06 18:26 Kristian Fiskerstrand
2017-03-21 19:21 Kristian Fiskerstrand
2017-03-14 12:39 Kristian Fiskerstrand
2017-03-10 9:13 Agostino Sarubbo
2017-01-05 19:11 Kristian Fiskerstrand
2016-12-22 15:32 Kristian Fiskerstrand
2016-12-22 15:32 Kristian Fiskerstrand
2016-08-06 21:12 Kristian Fiskerstrand
2016-08-06 21:12 Kristian Fiskerstrand
2016-06-22 19:45 Kristian Fiskerstrand
2016-06-22 19:45 Kristian Fiskerstrand
2016-06-22 19:45 Kristian Fiskerstrand
2016-06-09 17:31 Mike Gilbert
2016-03-10 10:34 Patrice Clement
2016-03-10 10:34 Patrice Clement
2016-03-10 10:34 Patrice Clement
2016-03-04 8:44 Ian Delaney
2016-02-28 20:38 Kristian Fiskerstrand
2016-02-28 20:38 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-16 18:21 Kristian Fiskerstrand
2016-02-14 10:11 Agostino Sarubbo
2016-02-10 18:58 Kristian Fiskerstrand
2016-01-30 17:52 Pacho Ramos
2016-01-15 9:03 Agostino Sarubbo
2015-11-23 18:17 Robin H. Johnson
2015-11-23 13:22 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1684487448.5eae2d2916a1257ab2e9f39538012c7fb26a08dc.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox