diff options
author | Justin Bronder <jsbronder@gentoo.org> | 2016-06-14 09:40:34 -0400 |
---|---|---|
committer | Justin Bronder <jsbronder@gentoo.org> | 2016-06-14 09:40:34 -0400 |
commit | 0ee47dab119883a5ba9bd5ef7ce95105afa47654 (patch) | |
tree | 4decad06a3e12a72f58cb1d726d32bbb24a91d63 /net-nntp/sabnzbd/files | |
parent | app-text/jabref-bin: Drop dependency on virtual/jdk (diff) | |
download | gentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.tar.gz gentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.tar.bz2 gentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.zip |
net-nntp/sabnzbd: bump 1.0.3
Update patches and unbundle rarlib which is now in portage.
Package-Manager: portage-2.2.26
Diffstat (limited to 'net-nntp/sabnzbd/files')
4 files changed, 185 insertions, 0 deletions
diff --git a/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch b/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch new file mode 100644 index 000000000000..3cc1c7c65db1 --- /dev/null +++ b/net-nntp/sabnzbd/files/1.x/0001-use-system-configobj-and-feedparser.patch @@ -0,0 +1,52 @@ +From 75608455ab239c8dd05280e858f10026a31a5eac Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Thu, 3 Jan 2013 04:10:37 -0500 +Subject: [PATCH 1/4] use system configobj and feedparser + +--- + sabnzbd/config.py | 4 +++- + sabnzbd/rss.py | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/sabnzbd/config.py b/sabnzbd/config.py +index 3bf777a..3e6551a 100644 +--- a/sabnzbd/config.py ++++ b/sabnzbd/config.py +@@ -24,10 +24,12 @@ import re + import logging + import threading + import shutil ++ ++import configobj ++ + import sabnzbd.misc + from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER + from sabnzbd.utils import listquote +-from sabnzbd.utils import configobj + from sabnzbd.decorators import synchronized + + CONFIG_LOCK = threading.Lock() +diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py +index 67ff94b..8b7d8c1 100644 +--- a/sabnzbd/rss.py ++++ b/sabnzbd/rss.py +@@ -26,6 +26,8 @@ import threading + import urllib + import os + ++import feedparser ++ + import sabnzbd + from sabnzbd.constants import * + from sabnzbd.decorators import synchronized +@@ -36,7 +38,6 @@ from sabnzbd.misc import cat_convert, sanitize_foldername, wildcard_to_re, cat_t + import sabnzbd.emailer as emailer + from sabnzbd.encoding import unicoder, xml_name + +-import sabnzbd.utils.feedparser as feedparser + + __RSS = None # Global pointer to RSS-scanner instance + +-- +2.4.10 + diff --git a/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch b/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch new file mode 100644 index 000000000000..845ab15e8e63 --- /dev/null +++ b/net-nntp/sabnzbd/files/1.x/0002-growler-support-gntp-1.0.patch @@ -0,0 +1,31 @@ +From 14eabdcd495be61bb14ecc8152058f92bd71a2db Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 24 Jun 2013 19:03:17 -0400 +Subject: [PATCH 2/4] growler: support >=gntp-1.0 + +Fixes Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=474540 +--- + sabnzbd/growler.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/sabnzbd/growler.py b/sabnzbd/growler.py +index 34d73c4..cd1ce91 100644 +--- a/sabnzbd/growler.py ++++ b/sabnzbd/growler.py +@@ -37,7 +37,12 @@ import sabnzbd.cfg + from sabnzbd.encoding import unicoder + from sabnzbd.constants import NOTIFY_KEYS + +-from gntp import GNTPRegister ++try: ++ # <= version 0.6 ++ from gntp import GNTPRegister ++except ImportError: ++ # >= version 1.0 ++ from gntp.core import GNTPRegister + from gntp.notifier import GrowlNotifier + try: + import Growl +-- +2.4.10 + diff --git a/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch new file mode 100644 index 000000000000..ab03fcf05df7 --- /dev/null +++ b/net-nntp/sabnzbd/files/1.x/0003-cfg-disable-growl-by-default.patch @@ -0,0 +1,34 @@ +From 93f2759ce13c3e93e4fe64bf632249d96eddb41b Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Tue, 14 Jun 2016 08:38:54 -0400 +Subject: [PATCH 3/4] cfg: disable growl by default + +--- + sabnzbd/cfg.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py +index 9d362df..a90cc03 100644 +--- a/sabnzbd/cfg.py ++++ b/sabnzbd/cfg.py +@@ -286,7 +286,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) + acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False) + + # [ntfosd] +-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN) ++ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False) + ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True) + ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False) + ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False) +@@ -299,7 +299,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True) + ntfosd_prio_other = OptionBool('ntfosd', 'ntfosd_prio_other', False) + + # [growl] +-growl_enable = OptionBool('growl', 'growl_enable', sabnzbd.DARWIN and sabnzbd.DARWIN_VERSION < 8) ++growl_enable = OptionBool('growl', 'growl_enable', False) + growl_server = OptionStr('growl', 'growl_server') + growl_password = OptionPassword('growl', 'growl_password') + growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True) +-- +2.4.10 + diff --git a/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch new file mode 100644 index 000000000000..7d5f374e6e03 --- /dev/null +++ b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch @@ -0,0 +1,68 @@ +From 33ce1a3e3cce21feedc88cddf708173f826c57cb Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Tue, 14 Jun 2016 08:43:37 -0400 +Subject: [PATCH 4/4] use system rarfile + +--- + sabnzbd/assembler.py | 3 ++- + sabnzbd/dirscanner.py | 3 ++- + sabnzbd/newsunpack.py | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py +index 7c4beb8..142678d 100644 +--- a/sabnzbd/assembler.py ++++ b/sabnzbd/assembler.py +@@ -34,6 +34,8 @@ except: + import md5 + new_md5 = md5.new + ++from rarfile import RarFile, is_rarfile ++ + import sabnzbd + from sabnzbd.misc import get_filepath, sanitize_filename, get_unique_filename, renamer, \ + set_permissions, flag_file, long_path, clip_path +@@ -42,7 +44,6 @@ import sabnzbd.cfg as cfg + from sabnzbd.articlecache import ArticleCache + from sabnzbd.postproc import PostProcessor + import sabnzbd.downloader +-from sabnzbd.utils.rarfile import RarFile, is_rarfile + from sabnzbd.encoding import unicoder, is_utf8 + from sabnzbd.rating import Rating + +diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py +index 6ada4bf..7a31920 100644 +--- a/sabnzbd/dirscanner.py ++++ b/sabnzbd/dirscanner.py +@@ -27,9 +27,10 @@ import gzip + import bz2 + import threading + ++from rarfile import RarFile, is_rarfile ++ + import sabnzbd + from sabnzbd.constants import * +-from sabnzbd.utils.rarfile import is_rarfile, RarFile + from sabnzbd.newsunpack import is_sevenfile, SevenZip + import sabnzbd.nzbstuff as nzbstuff + import sabnzbd.misc as misc +diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py +index 6906aed..940879f 100644 +--- a/sabnzbd/newsunpack.py ++++ b/sabnzbd/newsunpack.py +@@ -28,10 +28,11 @@ from time import time + import binascii + import shutil + ++from rarfile import RarFile, is_rarfile ++ + import sabnzbd + from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, name_fixer, \ + reliable_unpack_names, unicoder, platform_encode, deunicode +-from sabnzbd.utils.rarfile import RarFile, is_rarfile + from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \ + flag_file, real_path, globber, globber_full, short_path + from sabnzbd.tvsort import SeriesSorter +-- +2.4.10 + |