1 |
commit: 3ac80fb90578304a918f5566eec04102ee641f01 |
2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 14 00:21:09 2017 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 14 00:21:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac80fb9 |
7 |
|
8 |
net-nntp/sabnzbd: bump 1.2.0 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
|
12 |
net-nntp/sabnzbd/Manifest | 2 +- |
13 |
.../0001-use-system-configobj-and-feedparser.patch | 52 ------------- |
14 |
.../files/patches/0001-use-system-configobj.patch | 28 +++++++ |
15 |
.../files/patches/0002-use-system-feedparser.patch | 34 +++++++++ |
16 |
...sume-gntp-1.0.patch => 0003-use-gntp-1.0.patch} | 10 +-- |
17 |
...tch => 0004-cfg-disable-growl-by-default.patch} | 8 +- |
18 |
.../files/patches/0004-use-system-rarfile.patch | 68 ----------------- |
19 |
.../files/patches/0005-use-system-rarfile.patch | 88 ++++++++++++++++++++++ |
20 |
net-nntp/sabnzbd/metadata.xml | 1 - |
21 |
...abnzbd-1.1.1-r1.ebuild => sabnzbd-1.2.0.ebuild} | 9 +-- |
22 |
10 files changed, 164 insertions(+), 136 deletions(-) |
23 |
|
24 |
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest |
25 |
index 3068fca584..d0ef2189c8 100644 |
26 |
--- a/net-nntp/sabnzbd/Manifest |
27 |
+++ b/net-nntp/sabnzbd/Manifest |
28 |
@@ -1 +1 @@ |
29 |
-DIST SABnzbd-1.1.1-src.tar.gz 2736427 SHA256 001f19c5a98de641da9fc69cff8ee885f3422d511a73e923dcb713aaca763d44 SHA512 77deebbbdb2286791d0d0615a1f438874bb85735279a7d8e1d553909ca1dba5ea84c66ed276023e7ccf9676fc13c25760f2bc191483195e7c47e2c03bd5c636a WHIRLPOOL 0693ecd8778ca9f47f89528b17ddeef0d9fa1c635acdcff881a4aac239834a4d14c0287e992f212b6be8e993f28a7c774d4a47b5beb716b7ebbc64dcd635f2a8 |
30 |
+DIST SABnzbd-1.2.0-src.tar.gz 2721490 SHA256 0639b6e8086ee46e8d876effc2d466725e8b33e6b65e0538518f36986e4405b9 SHA512 e04d310e1743dd64bd6a500393e088a184ff2cebd8791cba49754941c4431ffd17b0c1c97c477697a1b68c621ea8aa92b4f3beff183cf84e1f4d751cf05d2ba7 WHIRLPOOL 9738bfb7713f5c0afe1a00f0a2c1cc95e43c074360eb2db5b63a4f612e492893361df50c622449e94d75aaba6226ed03a7cdb8c2da042c7b7baa9aafa1522460 |
31 |
|
32 |
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 |
33 |
deleted file mode 100644 |
34 |
index ef1a6fc894..0000000000 |
35 |
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch |
36 |
+++ /dev/null |
37 |
@@ -1,52 +0,0 @@ |
38 |
-From af041fe9945276db0716a5342609b48aa2ac4363 Mon Sep 17 00:00:00 2001 |
39 |
-From: Justin Bronder <jsbronder@×××××.com> |
40 |
-Date: Wed, 21 Sep 2016 19:35:16 -0400 |
41 |
-Subject: [PATCH 1/4] use system configobj and feedparser |
42 |
- |
43 |
---- |
44 |
- sabnzbd/config.py | 4 +++- |
45 |
- sabnzbd/rss.py | 3 ++- |
46 |
- 2 files changed, 5 insertions(+), 2 deletions(-) |
47 |
- |
48 |
-diff --git a/sabnzbd/config.py b/sabnzbd/config.py |
49 |
-index a59b265..36cc12c 100644 |
50 |
---- a/sabnzbd/config.py |
51 |
-+++ b/sabnzbd/config.py |
52 |
-@@ -24,10 +24,12 @@ import re |
53 |
- import logging |
54 |
- import threading |
55 |
- import shutil |
56 |
-+ |
57 |
-+import configobj |
58 |
-+ |
59 |
- import sabnzbd.misc |
60 |
- from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER |
61 |
- from sabnzbd.utils import listquote |
62 |
--from sabnzbd.utils import configobj |
63 |
- from sabnzbd.decorators import synchronized |
64 |
- |
65 |
- CONFIG_LOCK = threading.Lock() |
66 |
-diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py |
67 |
-index fc29e26..a7cdee1 100644 |
68 |
---- a/sabnzbd/rss.py |
69 |
-+++ b/sabnzbd/rss.py |
70 |
-@@ -24,6 +24,8 @@ import logging |
71 |
- import time |
72 |
- import threading |
73 |
- |
74 |
-+import feedparser |
75 |
-+ |
76 |
- import sabnzbd |
77 |
- from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY |
78 |
- from sabnzbd.decorators import synchronized |
79 |
-@@ -34,7 +36,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \ |
80 |
- import sabnzbd.emailer as emailer |
81 |
- from sabnzbd.encoding import unicoder, xml_name |
82 |
- |
83 |
--import sabnzbd.utils.feedparser as feedparser |
84 |
- |
85 |
- __RSS = None # Global pointer to RSS-scanner instance |
86 |
- |
87 |
--- |
88 |
-2.4.10 |
89 |
- |
90 |
|
91 |
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
92 |
new file mode 100644 |
93 |
index 0000000000..32d4b27000 |
94 |
--- /dev/null |
95 |
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
96 |
@@ -0,0 +1,28 @@ |
97 |
+From 74213e601bdb299a18e6eda8d71d4df28d871286 Mon Sep 17 00:00:00 2001 |
98 |
+From: Justin Bronder <jsbronder@×××××.com> |
99 |
+Date: Mon, 13 Feb 2017 18:20:39 -0500 |
100 |
+Subject: [PATCH 1/5] use system configobj |
101 |
+ |
102 |
+--- |
103 |
+ sabnzbd/config.py | 3 ++- |
104 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
105 |
+ |
106 |
+diff --git a/sabnzbd/config.py b/sabnzbd/config.py |
107 |
+index ab5da99..1043298 100644 |
108 |
+--- a/sabnzbd/config.py |
109 |
++++ b/sabnzbd/config.py |
110 |
+@@ -27,9 +27,10 @@ import shutil |
111 |
+ import sabnzbd.misc |
112 |
+ from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER |
113 |
+ from sabnzbd.utils import listquote |
114 |
+-from sabnzbd.utils import configobj |
115 |
+ from sabnzbd.decorators import synchronized |
116 |
+ |
117 |
++import configobj |
118 |
++ |
119 |
+ CONFIG_LOCK = threading.Lock() |
120 |
+ SAVE_CONFIG_LOCK = threading.Lock() |
121 |
+ |
122 |
+-- |
123 |
+2.7.3 |
124 |
+ |
125 |
|
126 |
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
127 |
new file mode 100644 |
128 |
index 0000000000..fef142ec68 |
129 |
--- /dev/null |
130 |
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
131 |
@@ -0,0 +1,34 @@ |
132 |
+From 04a18875d34f677a89bdf1bf57db7f236216e70e Mon Sep 17 00:00:00 2001 |
133 |
+From: Justin Bronder <jsbronder@×××××.com> |
134 |
+Date: Mon, 13 Feb 2017 18:21:28 -0500 |
135 |
+Subject: [PATCH 2/5] use system feedparser |
136 |
+ |
137 |
+--- |
138 |
+ sabnzbd/rss.py | 4 ++-- |
139 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
140 |
+ |
141 |
+diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py |
142 |
+index 73ec2b4..069aed0 100644 |
143 |
+--- a/sabnzbd/rss.py |
144 |
++++ b/sabnzbd/rss.py |
145 |
+@@ -25,6 +25,8 @@ import time |
146 |
+ import datetime |
147 |
+ import threading |
148 |
+ |
149 |
++import feedparser |
150 |
++ |
151 |
+ import sabnzbd |
152 |
+ from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY |
153 |
+ from sabnzbd.decorators import synchronized |
154 |
+@@ -35,8 +37,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \ |
155 |
+ import sabnzbd.emailer as emailer |
156 |
+ from sabnzbd.encoding import unicoder, xml_name |
157 |
+ |
158 |
+-import sabnzbd.utils.feedparser as feedparser |
159 |
+- |
160 |
+ __RSS = None # Global pointer to RSS-scanner instance |
161 |
+ |
162 |
+ |
163 |
+-- |
164 |
+2.7.3 |
165 |
+ |
166 |
|
167 |
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 |
168 |
similarity index 75% |
169 |
rename from net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch |
170 |
rename to net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
171 |
index 4e0674aa1f..d8e2d82df3 100644 |
172 |
--- a/net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch |
173 |
+++ b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
174 |
@@ -1,14 +1,14 @@ |
175 |
-From 7ffaea52e44a3fbea1ac0aa186a48b2033b409a2 Mon Sep 17 00:00:00 2001 |
176 |
+From 94ce3d83c9d921be01015b06881e79097aca3f82 Mon Sep 17 00:00:00 2001 |
177 |
From: Justin Bronder <jsbronder@×××××.com> |
178 |
-Date: Wed, 21 Sep 2016 19:39:30 -0400 |
179 |
-Subject: [PATCH 2/4] assume >=gntp-1.0 |
180 |
+Date: Mon, 13 Feb 2017 18:23:46 -0500 |
181 |
+Subject: [PATCH 3/5] use >=gntp-1.0 |
182 |
|
183 |
--- |
184 |
sabnzbd/notifier.py | 2 +- |
185 |
1 file changed, 1 insertion(+), 1 deletion(-) |
186 |
|
187 |
diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py |
188 |
-index 777f93a..514da75 100644 |
189 |
+index 5732f03..b1dc9d6 100644 |
190 |
--- a/sabnzbd/notifier.py |
191 |
+++ b/sabnzbd/notifier.py |
192 |
@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS |
193 |
@@ -21,5 +21,5 @@ index 777f93a..514da75 100644 |
194 |
try: |
195 |
import Growl |
196 |
-- |
197 |
-2.4.10 |
198 |
+2.7.3 |
199 |
|
200 |
|
201 |
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 |
202 |
similarity index 89% |
203 |
rename from net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch |
204 |
rename to net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch |
205 |
index 384fb336f8..695ace4f6b 100644 |
206 |
--- a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch |
207 |
+++ b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch |
208 |
@@ -1,14 +1,14 @@ |
209 |
-From d969db7d407d21ea73b9ca96ff81b1846cbaff8e Mon Sep 17 00:00:00 2001 |
210 |
+From 395378c67bbae92fcbb450a2353bb44e157e51e2 Mon Sep 17 00:00:00 2001 |
211 |
From: Justin Bronder <jsbronder@×××××.com> |
212 |
Date: Tue, 14 Jun 2016 08:38:54 -0400 |
213 |
-Subject: [PATCH 3/4] cfg: disable growl by default |
214 |
+Subject: [PATCH 4/5] cfg: disable growl by default |
215 |
|
216 |
--- |
217 |
sabnzbd/cfg.py | 4 ++-- |
218 |
1 file changed, 2 insertions(+), 2 deletions(-) |
219 |
|
220 |
diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py |
221 |
-index 8172646..53b75f3 100644 |
222 |
+index ecfc544..115e46e 100644 |
223 |
--- a/sabnzbd/cfg.py |
224 |
+++ b/sabnzbd/cfg.py |
225 |
@@ -291,7 +291,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) |
226 |
@@ -30,5 +30,5 @@ index 8172646..53b75f3 100644 |
227 |
growl_password = OptionPassword('growl', 'growl_password') |
228 |
growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True) |
229 |
-- |
230 |
-2.4.10 |
231 |
+2.7.3 |
232 |
|
233 |
|
234 |
diff --git a/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch |
235 |
deleted file mode 100644 |
236 |
index 2fcbf28099..0000000000 |
237 |
--- a/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch |
238 |
+++ /dev/null |
239 |
@@ -1,68 +0,0 @@ |
240 |
-From a63aed271c34eb81f0bf6aa9c62b9825d1c4929c Mon Sep 17 00:00:00 2001 |
241 |
-From: Justin Bronder <jsbronder@×××××.com> |
242 |
-Date: Tue, 14 Jun 2016 08:43:37 -0400 |
243 |
-Subject: [PATCH 4/4] use system rarfile |
244 |
- |
245 |
---- |
246 |
- sabnzbd/assembler.py | 3 ++- |
247 |
- sabnzbd/dirscanner.py | 3 ++- |
248 |
- sabnzbd/newsunpack.py | 3 ++- |
249 |
- 3 files changed, 6 insertions(+), 3 deletions(-) |
250 |
- |
251 |
-diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py |
252 |
-index 7c69c68..0789540 100644 |
253 |
---- a/sabnzbd/assembler.py |
254 |
-+++ b/sabnzbd/assembler.py |
255 |
-@@ -33,6 +33,8 @@ except: |
256 |
- import md5 |
257 |
- new_md5 = md5.new |
258 |
- |
259 |
-+from rarfile import RarFile, is_rarfile |
260 |
-+ |
261 |
- import sabnzbd |
262 |
- from sabnzbd.misc import get_filepath, sanitize_filename, get_unique_filename, renamer, \ |
263 |
- set_permissions, flag_file, long_path, clip_path |
264 |
-@@ -41,7 +43,6 @@ import sabnzbd.cfg as cfg |
265 |
- from sabnzbd.articlecache import ArticleCache |
266 |
- from sabnzbd.postproc import PostProcessor |
267 |
- import sabnzbd.downloader |
268 |
--from sabnzbd.utils.rarfile import RarFile, is_rarfile |
269 |
- from sabnzbd.encoding import unicoder, is_utf8 |
270 |
- from sabnzbd.rating import Rating |
271 |
- |
272 |
-diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py |
273 |
-index c573435..dcb2859 100644 |
274 |
---- a/sabnzbd/dirscanner.py |
275 |
-+++ b/sabnzbd/dirscanner.py |
276 |
-@@ -27,9 +27,10 @@ import gzip |
277 |
- import bz2 |
278 |
- import threading |
279 |
- |
280 |
-+from rarfile import is_rarfile, RarFile |
281 |
-+ |
282 |
- import sabnzbd |
283 |
- from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES |
284 |
--from sabnzbd.utils.rarfile import is_rarfile, RarFile |
285 |
- from sabnzbd.encoding import platform_encode |
286 |
- from sabnzbd.newsunpack import is_sevenfile, SevenZip |
287 |
- import sabnzbd.nzbstuff as nzbstuff |
288 |
-diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py |
289 |
-index 7f223d9..b7fbd4f 100644 |
290 |
---- a/sabnzbd/newsunpack.py |
291 |
-+++ b/sabnzbd/newsunpack.py |
292 |
-@@ -28,10 +28,11 @@ from time import time |
293 |
- import binascii |
294 |
- import shutil |
295 |
- |
296 |
-+from rarfile import RarFile, is_rarfile |
297 |
-+ |
298 |
- import sabnzbd |
299 |
- from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, \ |
300 |
- reliable_unpack_names, unicoder, platform_encode, deunicode |
301 |
--from sabnzbd.utils.rarfile import RarFile, is_rarfile |
302 |
- from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \ |
303 |
- flag_file, real_path, globber, globber_full, short_path |
304 |
- from sabnzbd.tvsort import SeriesSorter |
305 |
--- |
306 |
-2.4.10 |
307 |
- |
308 |
|
309 |
diff --git a/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch |
310 |
new file mode 100644 |
311 |
index 0000000000..28b9fed106 |
312 |
--- /dev/null |
313 |
+++ b/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch |
314 |
@@ -0,0 +1,88 @@ |
315 |
+From a55087bb61e68c9a14663d0c52c68b6afef51ce5 Mon Sep 17 00:00:00 2001 |
316 |
+From: Justin Bronder <jsbronder@×××××.com> |
317 |
+Date: Mon, 13 Feb 2017 18:27:00 -0500 |
318 |
+Subject: [PATCH 5/5] use system rarfile |
319 |
+ |
320 |
+--- |
321 |
+ sabnzbd/assembler.py | 2 +- |
322 |
+ sabnzbd/dirscanner.py | 2 +- |
323 |
+ sabnzbd/newsunpack.py | 2 +- |
324 |
+ sabnzbd/postproc.py | 2 +- |
325 |
+ 4 files changed, 4 insertions(+), 4 deletions(-) |
326 |
+ |
327 |
+diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py |
328 |
+index 71d02a5..068ef95 100644 |
329 |
+--- a/sabnzbd/assembler.py |
330 |
++++ b/sabnzbd/assembler.py |
331 |
+@@ -24,6 +24,7 @@ import Queue |
332 |
+ import logging |
333 |
+ import struct |
334 |
+ import re |
335 |
++import rarfile |
336 |
+ from threading import Thread |
337 |
+ from time import sleep |
338 |
+ try: |
339 |
+@@ -41,7 +42,6 @@ import sabnzbd.cfg as cfg |
340 |
+ from sabnzbd.articlecache import ArticleCache |
341 |
+ from sabnzbd.postproc import PostProcessor |
342 |
+ import sabnzbd.downloader |
343 |
+-import sabnzbd.utils.rarfile as rarfile |
344 |
+ from sabnzbd.encoding import unicoder, deunicode, is_utf8 |
345 |
+ from sabnzbd.rating import Rating |
346 |
+ |
347 |
+diff --git a/sabnzbd/dirscanner.py b/sabnzbd/dirscanner.py |
348 |
+index 8408c64..56e6365 100644 |
349 |
+--- a/sabnzbd/dirscanner.py |
350 |
++++ b/sabnzbd/dirscanner.py |
351 |
+@@ -26,10 +26,10 @@ import zipfile |
352 |
+ import gzip |
353 |
+ import bz2 |
354 |
+ import threading |
355 |
++import rarfile |
356 |
+ |
357 |
+ import sabnzbd |
358 |
+ from sabnzbd.constants import SCAN_FILE_NAME, VALID_ARCHIVES |
359 |
+-import sabnzbd.utils.rarfile as rarfile |
360 |
+ from sabnzbd.encoding import platform_encode |
361 |
+ from sabnzbd.newsunpack import is_sevenfile, SevenZip |
362 |
+ import sabnzbd.nzbstuff as nzbstuff |
363 |
+diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py |
364 |
+index 27730bd..15adc4a 100644 |
365 |
+--- a/sabnzbd/newsunpack.py |
366 |
++++ b/sabnzbd/newsunpack.py |
367 |
+@@ -27,11 +27,11 @@ import logging |
368 |
+ from time import time |
369 |
+ import binascii |
370 |
+ import shutil |
371 |
++import rarfile |
372 |
+ |
373 |
+ import sabnzbd |
374 |
+ from sabnzbd.encoding import TRANS, UNTRANS, unicode2local, \ |
375 |
+ reliable_unpack_names, unicoder, platform_encode, deunicode |
376 |
+-import sabnzbd.utils.rarfile as rarfile |
377 |
+ from sabnzbd.misc import format_time_string, find_on_path, make_script_path, int_conv, \ |
378 |
+ flag_file, real_path, globber, globber_full, short_path, get_all_passwords |
379 |
+ from sabnzbd.tvsort import SeriesSorter |
380 |
+diff --git a/sabnzbd/postproc.py b/sabnzbd/postproc.py |
381 |
+index c13025d..f016d93 100644 |
382 |
+--- a/sabnzbd/postproc.py |
383 |
++++ b/sabnzbd/postproc.py |
384 |
+@@ -26,6 +26,7 @@ import sabnzbd |
385 |
+ import xml.sax.saxutils |
386 |
+ import time |
387 |
+ import re |
388 |
++import rarfile |
389 |
+ |
390 |
+ from sabnzbd.newsunpack import unpack_magic, par2_repair, external_processing, \ |
391 |
+ sfv_check, build_filelists, rar_sort |
392 |
+@@ -48,7 +49,6 @@ import sabnzbd.cfg as cfg |
393 |
+ import sabnzbd.nzbqueue |
394 |
+ import sabnzbd.database as database |
395 |
+ import sabnzbd.notifier as notifier |
396 |
+-import sabnzbd.utils.rarfile as rarfile |
397 |
+ |
398 |
+ |
399 |
+ class PostProcessor(Thread): |
400 |
+-- |
401 |
+2.7.3 |
402 |
+ |
403 |
|
404 |
diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml |
405 |
index df0a94b99a..decc9a37d5 100644 |
406 |
--- a/net-nntp/sabnzbd/metadata.xml |
407 |
+++ b/net-nntp/sabnzbd/metadata.xml |
408 |
@@ -6,7 +6,6 @@ |
409 |
</maintainer> |
410 |
<use> |
411 |
<flag name="rar">Add support for extracting rar files</flag> |
412 |
- <flag name="ssl">Add support for SSL web interface</flag> |
413 |
<flag name="unzip">Add support for extracting zip files</flag> |
414 |
<flag name="yenc">Use yenc to speed up nntp encoding and decoding</flag> |
415 |
</use> |
416 |
|
417 |
diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild |
418 |
similarity index 94% |
419 |
rename from net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild |
420 |
rename to net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild |
421 |
index f95a022967..f5c0f1965b 100644 |
422 |
--- a/net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild |
423 |
+++ b/net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild |
424 |
@@ -1,4 +1,4 @@ |
425 |
-# Copyright 1999-2016 Gentoo Foundation |
426 |
+# Copyright 1999-2017 Gentoo Foundation |
427 |
# Distributed under the terms of the GNU General Public License v2 |
428 |
# $Id$ |
429 |
|
430 |
@@ -20,13 +20,13 @@ SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src. |
431 |
LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1" |
432 |
SLOT="0" |
433 |
KEYWORDS="~amd64" |
434 |
-IUSE="+rar +ssl unzip +yenc" |
435 |
+IUSE="+rar unzip +yenc" |
436 |
|
437 |
# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not |
438 |
# be in python's sitedir. See: http://wiki.sabnzbd.org/unix-packaging |
439 |
|
440 |
-# TODO: still bundled but not in protage: |
441 |
-# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt |
442 |
+# TODO: still bundled but not in portage: |
443 |
+# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs |
444 |
# pynewsleecher |
445 |
# |
446 |
# Also note that cherrypy is still bundled. It's near impossible to find |
447 |
@@ -46,7 +46,6 @@ RDEPEND=" |
448 |
dev-python/rarfile |
449 |
net-misc/wget |
450 |
rar? ( || ( app-arch/unrar app-arch/rar ) ) |
451 |
- ssl? ( dev-python/pyopenssl ) |
452 |
unzip? ( >=app-arch/unzip-5.5.2 ) |
453 |
yenc? ( dev-python/yenc ) |
454 |
" |