From 4d3b8f8b38eda2e6cfa39c2efcf4f9c4055c2d7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 Jan 2023 17:46:56 +0000 Subject: gentoo auto-resync : 12:01:2023 - 17:46:56 --- net-p2p/Manifest.gz | Bin 7435 -> 7433 bytes net-p2p/deluge/Manifest | 3 +- net-p2p/deluge/deluge-2.1.1-r2.ebuild | 173 ++++++++++++++++++++++++++++++ net-p2p/deluge/deluge-2.1.1.ebuild | 169 ----------------------------- net-p2p/deluge/files/deluge-web.service-4 | 10 ++ 5 files changed, 185 insertions(+), 170 deletions(-) create mode 100644 net-p2p/deluge/deluge-2.1.1-r2.ebuild delete mode 100644 net-p2p/deluge/deluge-2.1.1.ebuild create mode 100644 net-p2p/deluge/files/deluge-web.service-4 (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index ee31395831ad..751a74275ce0 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index b684a749f420..1e5492739f3d 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -2,6 +2,7 @@ AUX deluge-2.1.1-twisted-22.10.patch 1166 BLAKE2B 000c3e3bb63edcadb17c373d899557 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999 AUX deluge-web.init-2 1500 BLAKE2B 2e4d551f9fb106f03b4c28414cf8e03369226fe9e6a3e2b1f6619ed409c96084072ad97f9681407abb00df54133456bc57420781748cb16a3de175d1e1beb0f1 SHA512 9f8d8d7a0ecc8d320cd484006d28d0aee2f7053c8cb68d9b08aad5f77a0c817ca15663a13e4d6535920bf18d8dae5bca61cc9cf790c9d1d2103b54aebe01fd27 AUX deluge-web.service-3 200 BLAKE2B cddc255dda99d26d603c20d2d5e6ab15b46a81fd1865734e9b77df82580788938fd2f343c1f3bc5e57062c5089c3244b7e1950451912bdc460c2bba28dd6da89 SHA512 50791884fe84c39784b6350cc38dbca116ae5e4505a6cae6a3833167014861d51fdce7902ad1ca74bbe0b580438d850cc7a8f4f2d065f495c6e7864e360577fa +AUX deluge-web.service-4 206 BLAKE2B 1916c30abeba6f84dd42941768b13aff10c9a3c10266edf838def329a6f424f908f8d2937f2f5c902d85c58952e06b42e1d2569eb38d66369bd537f816586e82 SHA512 8e404770197ff05d8d9d34bec25e0e9976b44d82a7721cbf24b7be31649185c88091cad29ec237a8a626346c6da5a0d041804a2e542c17f3690511e19f17e007 AUX deluge-web.service.conf 100 BLAKE2B 2ed6ce80fb88d19f50911940ca5092617b55670228354cb5c7c38b7fb23801e3880ecea4d2326bb2ce1b496ba484242ed109ef6149b712f3fe6cd4b356eccdf5 SHA512 aaf493b3f614558c762ffea3219eda7045e739eeeb826a19df456ef9a94a0894302695bd96490eb4fb44e16039126170ec31ba6e0a0a2f6ae69669e2b9f4cda9 AUX deluged.conf-2 228 BLAKE2B e498f2d8b232ce40fee847079608750a58e15bb88e5918cf9325a44258a1ae73d114db8d6ff80bcf093a956ed33d592bf76748015a14803c3a380c415a805a0e SHA512 3005478b48c6c4c67f0eb8d9ee44ea1310ccd209fe6364f7bbc37ec296111e50462296d678cd4098bb63472ade190fdaf38ded39c3e8a73cbb4cede4860978c1 AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aae1f61677f0f2fd763c3d7686d4fcb5a583884f560906bf75917fddd4ebbe379cdb2d839dfba80e9e SHA512 a2514306b14712c7b31e64baccb65080101314e5f81e01702caf0f030afa40d98c1d3898c90fb66f55092bb27c48f0a6bd5a4db215ac68e352602000b700164a @@ -9,6 +10,6 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7 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 5785 BLAKE2B 2930d8630dda9a4a942088dbd1c8c75c7e2cf91879f2cc8fc49d78ad9558f4acbf8381a155e75264151de2668e616957581b6a64f6257b1bb48d80112adfdb03 SHA512 3e1a00f1c744626d56da900822e483eecd205ee3258a112fbe342db1478ecf467d92a2f92d9fc7b99415b16219104c347dd92e01c81212f9d41912f1698b4d62 -EBUILD deluge-2.1.1.ebuild 5733 BLAKE2B 2489d7d9d94cb12cac664991e779c58ecd35a6b911dc0019b3d2963a1b48d7f7306bd7a850e5cb6aca072e598c496f5d93d7404c1ab278baeaec8f81addd12d0 SHA512 723f3380a2942df924bd43010dff8fc3672fd59e264c76eba0d56d9d509975ba48b0b5edccc54ad6f3d7cbc070a522f2175f811e8cb3e4502ab63f1d2b040fa3 +EBUILD deluge-2.1.1-r2.ebuild 5887 BLAKE2B a90db2caac6bcbe54c335b423560793d2655e1e4c44c8bf8af0119b2641b9335bfe70d33840bf97424fb5671ea31c831998efd18565f667f0cefe2a7fdc175c7 SHA512 4c5faf1c0138a13bbbda68b6e977e64ef8e28f7d1f85687a8283cc892b89e79616c2f365c6866030b8d713833c11c175653755b1ad7bad3ea6c8d73068233192 EBUILD deluge-9999.ebuild 5730 BLAKE2B 01949be06bdb0460438c418dfe428115b412b36516eede367510f531e9a5dd2eeaa8a39e8691fe28b082d4712c0ec32570826c6b3936f0e09eb9bf5c15663d2a SHA512 dc2e2c9bc09ea8c6e3c0fae62efd003e8c9604f36c0cf60a53ba651dcc73437173a860a0e6551fe1a21b3b812231f567cded16db16b18f12bd771ba02b6c783d MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06 diff --git a/net-p2p/deluge/deluge-2.1.1-r2.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild new file mode 100644 index 000000000000..e30912c37127 --- /dev/null +++ b/net-p2p/deluge/deluge-2.1.1-r2.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +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.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild deleted file mode 100644 index 6e8715c9404e..000000000000 --- a/net-p2p/deluge/deluge-2.1.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -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}] - ') -" - -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/files/deluge-web.service-4 b/net-p2p/deluge/files/deluge-web.service-4 new file mode 100644 index 000000000000..9ebfcbc84745 --- /dev/null +++ b/net-p2p/deluge/files/deluge-web.service-4 @@ -0,0 +1,10 @@ +[Unit] +Description=Deluge WebUI +Documentation=man:deluge-web +After=deluged.service + +[Service] +ExecStart=/usr/bin/deluge-web -d -c ${DELUGE_WEB_HOME} ${DELUGE_WEB_OPTS} + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3