diff options
Diffstat (limited to 'net-p2p/deluge')
-rw-r--r-- | net-p2p/deluge/Manifest | 5 | ||||
-rw-r--r-- | net-p2p/deluge/deluge-2.1.1-r1.ebuild | 170 | ||||
-rw-r--r-- | net-p2p/deluge/deluge-2.1.1-r5.ebuild (renamed from net-p2p/deluge/deluge-2.1.1-r4.ebuild) | 11 | ||||
-rw-r--r-- | net-p2p/deluge/deluge-9999.ebuild | 11 |
4 files changed, 10 insertions, 187 deletions
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index c9bd7ccd905c..95fae576ae72 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -11,7 +11,6 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455 -EBUILD deluge-2.1.1-r1.ebuild 5761 BLAKE2B d299070fa825cc2d8078682d65128f589f79c041cb65763929b1137700e47b6aacb2709d3e2c92a1808837303771bb75be805df6a261c75b493dddef2bfe7c1c SHA512 f65a0673d17733238c57c0d91e9cb92d2e85e261d44cf29e63d5139c8320b948635e5e920597bd1ca26209d058e73d577531b1c4e22196a08a3a89b13b6b9967 -EBUILD deluge-2.1.1-r4.ebuild 6033 BLAKE2B 33e14686d141666665640623130cb2358a9d1482741625dc69457c0b76941789e0cd9d4220a5c2ecf557b0e07b5f5acf15b246bf710ed458da3326f87ec62cc4 SHA512 c5e894341778266d9b5bc45a56f84d083cafcf534385b750f01f81bb618e5845e1953a3122e5ad44fa2dc43fc3e459a1796236d37d108647ea4e974be66caffd -EBUILD deluge-9999.ebuild 5706 BLAKE2B 0af07cee0677367e8932330ccdf2649beefd8ccfa3f73c68462660e882a8028ec889d6173dfd231af48370a8d8e05163e2f250c90cf3bf0a529fa22843b05c8b SHA512 d3c03135968209fe1fa6d52ce3d543f3d44c7d5edc2a2e6491cc88a06b4aec6ad3571874d36e8986a47722986598f30b58f125d3ca072aee550ed150045bed03 +EBUILD deluge-2.1.1-r5.ebuild 5959 BLAKE2B 2061a623009669b778c127fa01df70ba35b0d3387a67b8f5ac41ff399a38b6fd5204b280ff3d14a4127aa225bdcea4ba4a0a9fdc6330ac168a9902e5773c9ead SHA512 8de3aed13e65ab5fb99099614a2d3f2587359f2256c6b80a0ac6efa13f65a07841f019c0185dacb2deef59bacfda832d4f3a0c24ba9b47b4422555d1b65c642f +EBUILD deluge-9999.ebuild 5632 BLAKE2B 8a48e523583a95d946d08be33f04b2fb01a1705f077f8cb1070e70e56918a814a1ede274bdf4eeddad7ead2ef39d83ef40127f5ec961298d3fb9e47de97d7537 SHA512 7466329831a20d77fe9de327e4b0fa8cca5a57a5105eb29854e1ce505e6e4f379aa42c1dccbd3bfab9b2a2ea6ffd58c51208cd7ae89d6fbe9c18b7cf7b074f1b MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06 diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild deleted file mode 100644 index 04ff97d96706..000000000000 --- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild +++ /dev/null @@ -1,170 +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=" - 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-3" 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" - 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-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild index 5f5ebcd7702f..c03f9d0f3185 100644 --- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild +++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 systemd xdg @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" fi LICENSE="GPL-2" @@ -54,10 +54,7 @@ RDEPEND=" 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/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}] >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] ') diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index f6ab3f627406..85901ef59e67 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 systemd xdg @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv" fi LICENSE="GPL-2" @@ -54,10 +54,7 @@ RDEPEND=" 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/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}] >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] ') |