From 5e59c9a6bf0ee6b3aeea0c6b9bc6226896ecc5c5 Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Sat, 15 Oct 2022 09:44:49 +0300 Subject: net-p2p/deluge: drop 2.0.5-r2 Bug: https://bugs.gentoo.org/866842 Signed-off-by: Joonas Niilola --- net-p2p/deluge/Manifest | 1 - net-p2p/deluge/deluge-2.0.5-r2.ebuild | 144 ---------------------- net-p2p/deluge/files/deluge-2.0.3-UI-status.patch | 31 ----- net-p2p/deluge/files/deluge-2.0.3-setup.py.patch | 11 -- 4 files changed, 187 deletions(-) delete mode 100644 net-p2p/deluge/deluge-2.0.5-r2.ebuild delete mode 100644 net-p2p/deluge/files/deluge-2.0.3-UI-status.patch delete mode 100644 net-p2p/deluge/files/deluge-2.0.3-setup.py.patch (limited to 'net-p2p') diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest index 1304a7562619..640b58957ce0 100644 --- a/net-p2p/deluge/Manifest +++ b/net-p2p/deluge/Manifest @@ -1,2 +1 @@ -DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455 diff --git a/net-p2p/deluge/deluge-2.0.5-r2.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild deleted file mode 100644 index f7144d94500d..000000000000 --- a/net-p2p/deluge/deluge-2.0.5-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8,9,10} ) -DISTUTILS_SINGLE_IMPL=1 -inherit xdg 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/$(ver_cut 1-2)/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="console gtk libnotify sound webinterface" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - libnotify? ( gtk ) - sound? ( gtk ) -" - -DEPEND=" - net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/wheel[${PYTHON_USEDEP}] - ') - dev-util/intltool - acct-group/deluge - acct-user/deluge" -RDEPEND=" - net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}] - $(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[ssl(-),${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}] - ) - >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}] - gtk? ( - sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) - dev-python/pygobject:3[${PYTHON_USEDEP}] - gnome-base/librsvg - libnotify? ( x11-libs/libnotify ) - ) - dev-python/mako[${PYTHON_USEDEP}] - ')" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.3-setup.py.patch" - "${FILESDIR}/${PN}-2.0.3-UI-status.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() { - 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" - 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/files/deluge-2.0.3-UI-status.patch b/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch deleted file mode 100644 index bef102062a04..000000000000 --- a/net-p2p/deluge/files/deluge-2.0.3-UI-status.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 53391b513f96ce3b8e9cc55f63e5db0c57b6e839 Mon Sep 17 00:00:00 2001 -From: Andrew Stone -Date: Wed, 3 Jul 2019 16:55:40 -0700 -Subject: [PATCH] [GTK] Fix ordering in status tab - ---- - deluge/ui/gtk3/glade/main_window.tabs.ui | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/deluge/ui/gtk3/glade/main_window.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui -index 30bd395bd..e9a4b60a1 100644 ---- a/deluge/ui/gtk3/glade/main_window.tabs.ui -+++ b/deluge/ui/gtk3/glade/main_window.tabs.ui -@@ -112,7 +112,7 @@ - - - 1 -- 0 -+ 3 - - - -@@ -312,7 +312,7 @@ - - - 1 -- 3 -+ 0 - - - diff --git a/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch b/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch deleted file mode 100644 index dba520f61c01..000000000000 --- a/net-p2p/deluge/files/deluge-2.0.3-setup.py.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur deluge-2.0.3.orig/setup.py deluge-2.0.3/setup.py ---- deluge-2.0.3.orig/setup.py 2019-07-25 18:19:04.624650797 +0200 -+++ deluge-2.0.3/setup.py 2019-07-25 18:19:42.984276752 +0200 -@@ -221,7 +221,6 @@ - ) - - print('Compiling po files from %s...' % po_dir) -- uptoDate = False - for path, names, filenames in os.walk(po_dir): - for f in filenames: - upto_date = False -- cgit v1.2.3-65-gdbad