diff options
Diffstat (limited to 'net-p2p/deluge')
| -rw-r--r-- | net-p2p/deluge/Manifest | 6 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-2.0.3-r8.ebuild | 4 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-2.0.3-r9.ebuild | 143 | ||||
| -rw-r--r-- | net-p2p/deluge/deluge-9999.ebuild | 8 | ||||
| -rw-r--r-- | net-p2p/deluge/files/deluge-2.0.3-log.patch | 13 |
5 files changed, 169 insertions, 5 deletions
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index 8117900949d1..761342eaba45 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -1,6 +1,7 @@ AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8 AUX deluge-2.0.3-fix-pickle.patch 3843 BLAKE2B d4b15eac2d0f114f4efbbf21d94164bd2ec3cb1819f02e3cc48af8fc7c5a02abc3d8c40e1a46d02680bd4d63c1a8167405b57ed312ecaceb513050bd95fc4661 SHA512 b4507292eb47ad054f0a0fef716951aae305bd0a4c0ec8f26cf0ababda5b181c1ba9eff1c977ac374d6740928bd1e5bde1488a4a183b5f9af81b753ad212aef0 AUX deluge-2.0.3-gettext.patch 483 BLAKE2B 5c0c4462a27c9e8339979593c7868cca6a3f56549cba094d7f3932b76fe65c5f6d50390db7bbfc39268de05ebaa92bf1a22caffe6ae858e6adf222f17cec15d4 SHA512 122127744960786d7c3b247feb69fa4397ceb70bb1a4f2d30be4a683f163096f120cc5a0f72602cab39374eae5351bd5b3cf8bfd527bf036cc8e5e7f0700cf32 +AUX deluge-2.0.3-log.patch 538 BLAKE2B df9b242bbecfb7e4960bd5e2a50826154c776cd21f29ecd6de0c468ad47906fe0afc9e31a9dea3d0f850e8a7f14f9a18aab4e6228705f77730435d532eb93f94 SHA512 63c6e5a7005f2ad323c3724a89bcb9cc35458f75bda57da9004903fbe45eb111dc7e690fa8b00d2db9b2a0fc24ef8c8b6ee4ac383bebe18533a14cfa83250936 AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c887d89b239d39f67aa3757434dd2f3e384531733ceb332b8b57d62b56f34244caa592a279aa812269cde6106b1cc SHA512 d2f23dd8a27aa5537610c34b6197962b986f4811a89dffbfc82fade0dc8c0942a8f58480e0235d11d049f89dd38c48da43bbf1dc8a66f26cbc16db764b672af5 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef @@ -12,6 +13,7 @@ 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.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480 -EBUILD deluge-2.0.3-r8.ebuild 4480 BLAKE2B 8aed7e23112c258e9ecf7c378dffb016ff392873068817d12c64ad7957ca6bf18823e4459d0f97ec11eb18023a153ce4866feacb3d619395b2b81637250ce46d SHA512 58c0244a396a22ea473792b1df328a5d86a343f6acd1ba04232a3f9f9619ef975e8642e5e64543d385f1512020c8ef7f707c51f0e4cb30557cdb585f57a2113d -EBUILD deluge-9999.ebuild 4440 BLAKE2B f6ab56b0b6b5c19729cec6c39dbf6863aebae433e540ab66301345a3a876122f0ec41361430fde9dfb1bc661c2966c503335864bd6b48d33f4a02fb6245801a3 SHA512 39dcb2a3706929fa51111abe1572c02110748d267d1db56834972351de3518d7d954d98d4c87f86e1deeaf510e74b9b9d315bdf28dfb4345b3baf222ab89fe45 +EBUILD deluge-2.0.3-r8.ebuild 4503 BLAKE2B 1df878622e276d8f195ac4dbcec94c6d3363db2fd6d2f946c898cc7331a62af91a3b92dd0d0ef07d8eddd5b673321c8e6c36d47765717c60d945654fb4a3e5e3 SHA512 f660a0f90acec654e72d7acb98e16cffb30776ace3ade819841dff22dd448c05a280ca3d1ed59330bb98883311bd63a94eec0fc6e24b9eb4b89d92919d9e8095 +EBUILD deluge-2.0.3-r9.ebuild 4512 BLAKE2B 9e17b7849b0caed5d4bbd2a55a4b356464f56466190b1402feb7ddbf301cd0b16f4ee7e3c4531b78227b8cc71104a912dd2b34781f30743fb7123a69b8559eec SHA512 2a0f697404637ecb45ec33fdcb2b2484af3f3c940cdadf0e253f2cf720987357810d57b4968e8c34984bf503b6a3ecca4d6a4602a0f20ab33f9e9131d020b80b +EBUILD deluge-9999.ebuild 4535 BLAKE2B ba15c2eec0b6c51b4f549a83468fcbaf9d39d2f31b0a16d9b132caa979f411bd2e201e448feef1a3f9bc8b85ee3ff74da8e07cc1e64796155aeff9c33b5a92b6 SHA512 48e8dfaa7ca6592ec59219bf809f57f038400d09a87e7ea57984ceb8e67ad769c9c06ee26a7f9758bebfcc0a3e839c74ba49a8f577051aba171ade8f9d50bdf3 MISC metadata.xml 674 BLAKE2B 95f9759f521dd343d3b89dc944b39ed0b9bb34aabe1f046e27609a9a458ae0b6215dc032dc791ca47a84e0d1d8a6850fa0a97cdb2e567a91b0d467843e2425a5 SHA512 2035e01ea705109af45be1c62e8afeb374b4c2ca91f7a6050b0ed3b08d048a8f38f8ead075fb4a46790710b025b721efa4c41ea11522456dd9fa7bfe4354ca02 diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild index 99e877d5e202..19ea2735dafa 100644 --- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild +++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild @@ -5,7 +5,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{8,9} ) DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 systemd +inherit xdg distutils-r1 systemd DESCRIPTION="BitTorrent client with a client/server model" HOMEPAGE="https://deluge-torrent.org/" @@ -122,6 +122,8 @@ python_install_all() { } pkg_postinst() { + xdg_pkg_postinst + elog elog "If, after upgrading, deluge doesn't work, please remove the" elog "'~/.config/deluge' directory and try again, but make a backup" diff --git a/net-p2p/deluge/deluge-2.0.3-r9.ebuild b/net-p2p/deluge/deluge-2.0.3-r9.ebuild new file mode 100644 index 000000000000..6878f1f82c5f --- /dev/null +++ b/net-p2p/deluge/deluge-2.0.3-r9.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8,9} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 systemd + +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/2.0/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="console geoip gtk libnotify sound webinterface" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + libnotify? ( gtk ) + sound? ( gtk ) +" + +DEPEND=" + $(python_gen_cond_dep ' + net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ') + dev-util/intltool + acct-group/deluge + acct-user/deluge" +RDEPEND=" + $(python_gen_cond_dep ' + 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/six[${PYTHON_USEDEP}] + >=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] + geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] ) + gtk? ( + sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) + dev-python/pygobject:3[${PYTHON_USEDEP}] + gnome-base/librsvg + libnotify? ( x11-libs/libnotify ) + ) + net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}] + dev-python/mako[${PYTHON_USEDEP}] + ')" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.3-setup.py.patch" + "${FILESDIR}/${PN}-2.0.3-UI-status.patch" + "${FILESDIR}/${PN}-2.0.3-gettext.patch" + "${FILESDIR}/${P}-fix-pickle.patch" + "${FILESDIR}/${P}-log.patch" +) + +python_prepare_all() { + local args=( + -e "/Compiling po file/a \\\tuptoDate = False" + ) + sed -i "${args[@]}" -- 'setup.py' || die + 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 +} + +esetup.py() { + # bug 531370: deluge has its own plugin system. No need to relocate its egg info files. + # Override this call from the distutils-r1 eclass. + # This does not respect the distutils-r1 API. DONOT copy this example. + set -- "${PYTHON}" setup.py "$@" + echo "$@" + "$@" || die +} + +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 gtk ; 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 + rm "${ED}/usr/share/applications/deluge.desktop" || 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() { + elog + elog "If, after upgrading, deluge doesn't work, please remove the" + elog "'~/.config/deluge' directory and try again, but make a backup" + elog "first!" + 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 look at https://dev.deluge-torrent.org/wiki/Faq" + elog +} diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index bdb0681318ce..0d7b3a317c07 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -5,7 +5,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{8,9} ) DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 systemd +inherit xdg distutils-r1 systemd DESCRIPTION="BitTorrent client with a client/server model" HOMEPAGE="https://deluge-torrent.org/" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}" else SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" fi LICENSE="GPL-2" @@ -62,6 +62,8 @@ PATCHES=( "${FILESDIR}/${PN}-2.0.3-setup.py.patch" "${FILESDIR}/${PN}-2.0.3-UI-status.patch" "${FILESDIR}/${PN}-2.0.3-gettext.patch" + "${FILESDIR}/${P}-fix-pickle.patch" + "${FILESDIR}/${P}-log.patch" ) python_prepare_all() { @@ -121,6 +123,8 @@ python_install_all() { } pkg_postinst() { + xdg_pkg_postinst + elog elog "If, after upgrading, deluge doesn't work, please remove the" elog "'~/.config/deluge' directory and try again, but make a backup" diff --git a/net-p2p/deluge/files/deluge-2.0.3-log.patch b/net-p2p/deluge/files/deluge-2.0.3-log.patch new file mode 100644 index 000000000000..45dd9896a915 --- /dev/null +++ b/net-p2p/deluge/files/deluge-2.0.3-log.patch @@ -0,0 +1,13 @@ +https://dev.deluge-torrent.org/changeset/351664ec071daa04 +https://dev.deluge-torrent.org/ticket/3327 +Index: deluge/log.py +=================================================================== +--- a/deluge/log.py ++++ b/deluge/log.py +@@ -87,5 +87,5 @@ + yield LoggingLoggerClass.exception(self, msg, *args, **kwargs) + +- def findCaller(self, stack_info=False): # NOQA: N802 ++ def findCaller(self, *args, **kwargs): # NOQA: N802 + f = logging.currentframe().f_back + rv = '(unknown file)', 0, '(unknown function)' |