commit ad328a500390854bf6cbdd468651bbb99a1df8f2 Author: Alexander Kapshuna Date: Mon Aug 12 16:45:21 2019 +0300 deluge: version bump to 2.0.3 Python 2 is blacklisted (isn't checked everywhere in upstream, but only Python 3 is documented). Ported to GTK+ 3 - related option renamed to gui. diff --git a/packages/net-p2p/deluge/deluge-1.3.15-r3.exheres-0 b/packages/net-p2p/deluge/deluge-2.0.3.exheres-0 similarity index 100% copy from packages/net-p2p/deluge/deluge-1.3.15-r3.exheres-0 copy to packages/net-p2p/deluge/deluge-2.0.3.exheres-0 diff --git a/packages/net-p2p/deluge/deluge-1.3.15-r3.exheres-0 b/packages/net-p2p/deluge/deluge-scm.exheres-0 similarity index 65% rename from packages/net-p2p/deluge/deluge-1.3.15-r3.exheres-0 rename to packages/net-p2p/deluge/deluge-scm.exheres-0 index a7a9f2d..c33a1b0 100644 --- a/packages/net-p2p/deluge/deluge-1.3.15-r3.exheres-0 +++ b/packages/net-p2p/deluge/deluge-scm.exheres-0 @@ -1,4 +1,4 @@ -# Copyright 2009 Marvin Schmidt +# Copyright 2009, 2011 Marvin Schmidt # Distributed under the terms of the GNU General Public License v2 require deluge diff --git a/packages/net-p2p/deluge/deluge.exlib b/packages/net-p2p/deluge/deluge.exlib index 332dd82..1dbf68d 100644 --- a/packages/net-p2p/deluge/deluge.exlib +++ b/packages/net-p2p/deluge/deluge.exlib @@ -1,53 +1,81 @@ # Copyright 2009, 2011 Marvin Schmidt # Distributed under the terms of the GNU General Public License v2 -require setup-py [ import=setuptools blacklist=3 multibuild=false ] +if ever is_scm; then + require github [ user=deluge-torrent tag=${PNV} ] +else + require pypi # won't build from github autogenerated tarball +fi +require setup-py [ import=setuptools blacklist=2 multibuild=false test=pytest ] +require option-renames [ renames=[ "gtk gui" ] ] +require gtk-icon-cache +require freedesktop-desktop + +export_exlib_phases pkg_postinst pkg_postrm SUMMARY="BitTorrent client with a client/server model" -HOMEPAGE="http://www.deluge-torrent.org/" -DOWNLOADS="http://download.deluge-torrent.org/source/${PNV}.tar.bz2" +HOMEPAGE="https://deluge.readthedocs.io/" SLOT="0" LICENCES="GPL-2" MYOPTIONS=" - gtk libnotify webinterface - - gtk [[ description = [ Install GTK based client for the deluge daemon ] ]] - webinterface [[ description = [ Allows controlling the deluge daemon from web ] ]] - - libnotify [[ requires = gtk ]] + gui [[ description = [ Install GTK+ based client for the deluge daemon ] ]] + libnotify [[ requires = gui ]] " -# GTK and webinterface are automagic +# GUI and webinterface are automagic +# TODO libnotify? ( dev-python/pygame[python_abis:*(-)?] [[ note = [ Play sounds ] ]] ) DEPENDENCIES=" build: dev-util/intltool sys-devel/gettext build+run: dev-python/chardet[python_abis:*(-)?] + dev-python/Mako[python_abis:*(-)?] + dev-python/Pillow[python_abis:*(-)?] + dev-python/pyasn1[python_abis:*(-)?] dev-python/pyopenssl[python_abis:*(-)?] dev-python/pyxdg[python_abis:*(-)?] - net-p2p/libtorrent-rasterbar[>=0.16.0][python] [[ - description = [ 0.16 is required because of fixing patch and api incompatibility ] - ]] - net-twisted/Twisted[>=8.1][python_abis:*(-)?] - gtk? ( - dev-python/dbus-python[python_abis:*(-)?] - gnome-bindings/pygtk:2[>=2.12][glade][python_abis:*(-)?] + dev-python/rencode[python_abis:*(-)?] + dev-python/setproctitle[python_abis:*(-)?] + dev-python/six[python_abis:*(-)?] + dev-python/zopeinterface[python_abis:*(-)?] + net-p2p/libtorrent-rasterbar[>=1.1.2][python][python_abis:*(-)?] + net-twisted/Twisted[>=17.1][python_abis:*(-)?] + run: + gui? ( + dev-python/pycairo[python_abis:*(-)?] + gnome-bindings/pygobject:3[python_abis:*(-)?] gnome-desktop/librsvg:2 x11-apps/xdg-utils - libnotify? ( dev-python/notify-python[python_abis:*(-)?] ) + x11-libs/gdk-pixbuf:2.0[gobject-introspection] + x11-libs/gtk+:3[>=3.10][gobject-introspection] ) - webinterface? ( dev-python/Mako[python_abis:*(-)?] ) + libnotify? ( + x11-libs/libnotify[gobject-introspection] + ) + test: + dev-python/pytest-twisted[python_abis:*(-)?] " +# Requires unpackaged pytest-twisted +RESTRICT="test" + BUGS_TO="marv@exherbo.org" -UPSTREAM_CHANGELOG="http://dev.deluge-torrent.org/wiki/ChangeLog" -UPSTREAM_DOCUMENTATION="http://dev.deluge-torrent.org/wiki/UserGuide" -UPSTREAM_RELEASE_NOTES="http://dev.deluge-torrent.org/wiki/ReleaseNotes" +UPSTREAM_DOCUMENTATION=" + ${HOMEPAGE}/en/latest/how-to/index.html + http://dev.deluge-torrent.org/wiki/UserGuide +" +UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/en/latest/releases/index.html" -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}/0001-GTKUI-Fix-keyerror-showing-prefs.patch" -) +deluge_pkg_postinst() { + freedesktop-desktop_pkg_postinst + gtk-icon-cache_pkg_postinst +} + +deluge_pkg_postrm() { + freedesktop-desktop_pkg_postrm + gtk-icon-cache_pkg_postrm +} diff --git a/packages/net-p2p/deluge/files/0001-GTKUI-Fix-keyerror-showing-prefs.patch b/packages/net-p2p/deluge/files/0001-GTKUI-Fix-keyerror-showing-prefs.patch deleted file mode 100644 index be7b19e..0000000 --- a/packages/net-p2p/deluge/files/0001-GTKUI-Fix-keyerror-showing-prefs.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream: https://dev.deluge-torrent.org/ticket/3039 (should be included in 1.3.16) -Reason: without this preferences windows in gtkui is inaccessible - -From 38d7b7cdfde3c50d6263602ffb03af92fcbfa52e Mon Sep 17 00:00:00 2001 -From: Calum Lind -Date: Sat, 13 May 2017 00:05:48 +0100 -Subject: [PATCH 01/14] [GTKUI] Fix keyerror showing prefs - - * Fix the single_proxy ui to True as unlikely any users using <=0.15 - and need to have different proxy type settings. ---- - deluge/ui/gtkui/preferences.py | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py -index 645ad26..efcd93d 100644 ---- a/deluge/ui/gtkui/preferences.py -+++ b/deluge/ui/gtkui/preferences.py -@@ -318,11 +318,8 @@ def _show(self): - } - # Add proxy stuff - -- # Display workaround for single proxy in libtorrent >v0.16 -- try: -- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY -- except AttributeError: -- lt_single_proxy = False -+ # Display workaround for single proxy in libtorrent >= v0.16 -+ lt_single_proxy = True - - for t in ("peer", "web_seed", "tracker", "dht"): - if lt_single_proxy and not t == "peer": --- -2.17.0 -