diff options
| -rw-r--r-- | net-nntp/sabnzbd/Manifest | 2 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch | 52 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch | 28 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch | 34 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch (renamed from net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch) | 10 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch (renamed from net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch) | 8 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch | 68 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch | 88 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/metadata.xml | 1 | ||||
| -rw-r--r-- | net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild (renamed from net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild) | 9 |
10 files changed, 164 insertions, 136 deletions
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest index 3068fca5847d..d0ef2189c811 100644 --- a/net-nntp/sabnzbd/Manifest +++ b/net-nntp/sabnzbd/Manifest @@ -1 +1 @@ -DIST SABnzbd-1.1.1-src.tar.gz 2736427 SHA256 001f19c5a98de641da9fc69cff8ee885f3422d511a73e923dcb713aaca763d44 SHA512 77deebbbdb2286791d0d0615a1f438874bb85735279a7d8e1d553909ca1dba5ea84c66ed276023e7ccf9676fc13c25760f2bc191483195e7c47e2c03bd5c636a WHIRLPOOL 0693ecd8778ca9f47f89528b17ddeef0d9fa1c635acdcff881a4aac239834a4d14c0287e992f212b6be8e993f28a7c774d4a47b5beb716b7ebbc64dcd635f2a8 +DIST SABnzbd-1.2.0-src.tar.gz 2721490 SHA256 0639b6e8086ee46e8d876effc2d466725e8b33e6b65e0538518f36986e4405b9 SHA512 e04d310e1743dd64bd6a500393e088a184ff2cebd8791cba49754941c4431ffd17b0c1c97c477697a1b68c621ea8aa92b4f3beff183cf84e1f4d751cf05d2ba7 WHIRLPOOL 9738bfb7713f5c0afe1a00f0a2c1cc95e43c074360eb2db5b63a4f612e492893361df50c622449e94d75aaba6226ed03a7cdb8c2da042c7b7baa9aafa1522460 diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch deleted file mode 100644 index ef1a6fc894e9..000000000000 --- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch +++ /dev/null @@ -1,52 +0,0 @@ -From af041fe9945276db0716a5342609b48aa2ac4363 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Wed, 21 Sep 2016 19:35:16 -0400 -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 a59b265..36cc12c 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 fc29e26..a7cdee1 100644 ---- a/sabnzbd/rss.py -+++ b/sabnzbd/rss.py -@@ -24,6 +24,8 @@ import logging - import time - import threading - -+import feedparser -+ - import sabnzbd - from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY - from sabnzbd.decorators import synchronized -@@ -34,7 +36,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \ - 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/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch new file mode 100644 index 000000000000..32d4b27000a5 --- /dev/null +++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch @@ -0,0 +1,28 @@ +From 74213e601bdb299a18e6eda8d71d4df28d871286 Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 13 Feb 2017 18:20:39 -0500 +Subject: [PATCH 1/5] use system configobj + +--- + sabnzbd/config.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sabnzbd/config.py b/sabnzbd/config.py +index ab5da99..1043298 100644 +--- a/sabnzbd/config.py ++++ b/sabnzbd/config.py +@@ -27,9 +27,10 @@ import shutil + 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 + ++import configobj ++ + CONFIG_LOCK = threading.Lock() + SAVE_CONFIG_LOCK = threading.Lock() + +-- +2.7.3 + diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch new file mode 100644 index 000000000000..fef142ec6898 --- /dev/null +++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch @@ -0,0 +1,34 @@ +From 04a18875d34f677a89bdf1bf57db7f236216e70e Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 13 Feb 2017 18:21:28 -0500 +Subject: [PATCH 2/5] use system feedparser + +--- + sabnzbd/rss.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py +index 73ec2b4..069aed0 100644 +--- a/sabnzbd/rss.py ++++ b/sabnzbd/rss.py +@@ -25,6 +25,8 @@ import time + import datetime + import threading + ++import feedparser ++ + import sabnzbd + from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY + from sabnzbd.decorators import synchronized +@@ -35,8 +37,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \ + 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.7.3 + diff --git a/net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch index 4e0674aa1f63..d8e2d82df311 100644 --- a/net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch +++ b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch @@ -1,14 +1,14 @@ -From 7ffaea52e44a3fbea1ac0aa186a48b2033b409a2 Mon Sep 17 00:00:00 2001 +From 94ce3d83c9d921be01015b06881e79097aca3f82 Mon Sep 17 00:00:00 2001 From: Justin Bronder <jsbronder@gmail.com> -Date: Wed, 21 Sep 2016 19:39:30 -0400 -Subject: [PATCH 2/4] assume >=gntp-1.0 +Date: Mon, 13 Feb 2017 18:23:46 -0500 +Subject: [PATCH 3/5] use >=gntp-1.0 --- sabnzbd/notifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py -index 777f93a..514da75 100644 +index 5732f03..b1dc9d6 100644 --- a/sabnzbd/notifier.py +++ b/sabnzbd/notifier.py @@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS @@ -21,5 +21,5 @@ index 777f93a..514da75 100644 try: import Growl -- -2.4.10 +2.7.3 diff --git a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch index 384fb336f801..695ace4f6b09 100644 --- a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch +++ b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch @@ -1,14 +1,14 @@ -From d969db7d407d21ea73b9ca96ff81b1846cbaff8e Mon Sep 17 00:00:00 2001 +From 395378c67bbae92fcbb450a2353bb44e157e51e2 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 +Subject: [PATCH 4/5] 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 8172646..53b75f3 100644 +index ecfc544..115e46e 100644 --- a/sabnzbd/cfg.py +++ b/sabnzbd/cfg.py @@ -291,7 +291,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) @@ -30,5 +30,5 @@ index 8172646..53b75f3 100644 growl_password = OptionPassword('growl', 'growl_password') growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True) -- -2.4.10 +2.7.3 diff --git a/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch deleted file mode 100644 index 2fcbf2809911..000000000000 --- a/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a63aed271c34eb81f0bf6aa9c62b9825d1c4929c 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 7c69c68..0789540 100644 ---- a/sabnzbd/assembler.py -+++ b/sabnzbd/assembler.py -@@ -33,6 +33,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 -@@ -41,7 +43,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 c573435..dcb2859 100644 ---- a/sabnzbd/dirscanner.py -+++ b/sabnzbd/dirscanner.py -@@ -27,9 +27,10 @@ import gzip - import bz2 - import threading - -+from rarfile import is_rarfile, RarFile -+ - import sabnzbd - from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES --from sabnzbd.utils.rarfile import is_rarfile, RarFile - from sabnzbd.encoding import platform_encode - from sabnzbd.newsunpack import is_sevenfile, SevenZip - import sabnzbd.nzbstuff as nzbstuff -diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py -index 7f223d9..b7fbd4f 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, \ - 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 - diff --git a/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch new file mode 100644 index 000000000000..28b9fed106f5 --- /dev/null +++ b/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch @@ -0,0 +1,88 @@ +From a55087bb61e68c9a14663d0c52c68b6afef51ce5 Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 13 Feb 2017 18:27:00 -0500 +Subject: [PATCH 5/5] use system rarfile + +--- + sabnzbd/assembler.py | 2 +- + sabnzbd/dirscanner.py | 2 +- + sabnzbd/newsunpack.py | 2 +- + sabnzbd/postproc.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py +index 71d02a5..068ef95 100644 +--- a/sabnzbd/assembler.py ++++ b/sabnzbd/assembler.py +@@ -24,6 +24,7 @@ import Queue + import logging + import struct + import re ++import rarfile + from threading import Thread + from time import sleep + try: +@@ -41,7 +42,6 @@ import sabnzbd.cfg as cfg + from sabnzbd.articlecache import ArticleCache + from sabnzbd.postproc import PostProcessor + import sabnzbd.downloader +-import sabnzbd.utils.rarfile as rarfile + from sabnzbd.encoding import unicoder, deunicode, is_utf8 + from sabnzbd.rating import Rating + +diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py +index 8408c64..56e6365 100644 +--- a/sabnzbd/dirscanner.py ++++ b/sabnzbd/dirscanner.py +@@ -26,10 +26,10 @@ import zipfile + import gzip + import bz2 + import threading ++import rarfile + + import sabnzbd + from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES +-import sabnzbd.utils.rarfile as rarfile + from sabnzbd.encoding import platform_encode + from sabnzbd.newsunpack import is_sevenfile, SevenZip + import sabnzbd.nzbstuff as nzbstuff +diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py +index 27730bd..15adc4a 100644 +--- a/sabnzbd/newsunpack.py ++++ b/sabnzbd/newsunpack.py +@@ -27,11 +27,11 @@ import logging + from time import time + import binascii + import shutil ++import rarfile + + import sabnzbd + from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, \ + reliable_unpack_names, unicoder, platform_encode, deunicode +-import sabnzbd.utils.rarfile as 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, get_all_passwords + from sabnzbd.tvsort import SeriesSorter +diff --git a/sabnzbd/postproc.py b/sabnzbd/postproc.py +index c13025d..f016d93 100644 +--- a/sabnzbd/postproc.py ++++ b/sabnzbd/postproc.py +@@ -26,6 +26,7 @@ import sabnzbd + import xml.sax.saxutils + import time + import re ++import rarfile + + from sabnzbd.newsunpack import unpack_magic, par2_repair, external_processing, \ + sfv_check, build_filelists, rar_sort +@@ -48,7 +49,6 @@ import sabnzbd.cfg as cfg + import sabnzbd.nzbqueue + import sabnzbd.database as database + import sabnzbd.notifier as notifier +-import sabnzbd.utils.rarfile as rarfile + + + class PostProcessor(Thread): +-- +2.7.3 + diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml index df0a94b99a17..decc9a37d5f9 100644 --- a/net-nntp/sabnzbd/metadata.xml +++ b/net-nntp/sabnzbd/metadata.xml @@ -6,7 +6,6 @@ </maintainer> <use> <flag name="rar">Add support for extracting rar files</flag> - <flag name="ssl">Add support for SSL web interface</flag> <flag name="unzip">Add support for extracting zip files</flag> <flag name="yenc">Use yenc to speed up nntp encoding and decoding</flag> </use> diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild index f95a022967ce..f5c0f1965b9c 100644 --- a/net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild +++ b/net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,13 +20,13 @@ SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src. LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1" SLOT="0" KEYWORDS="~amd64" -IUSE="+rar +ssl unzip +yenc" +IUSE="+rar unzip +yenc" # Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not # be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging -# TODO: still bundled but not in protage: -# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt +# TODO: still bundled but not in portage: +# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs # pynewsleecher # # Also note that cherrypy is still bundled. It's near impossible to find @@ -46,7 +46,6 @@ RDEPEND=" dev-python/rarfile net-misc/wget rar? ( || ( app-arch/unrar app-arch/rar ) ) - ssl? ( dev-python/pyopenssl ) unzip? ( >=app-arch/unzip-5.5.2 ) yenc? ( dev-python/yenc ) " |