1 |
commit: 6afc5aa840f0b9d83d484b4a66242f14b66488cf |
2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 9 14:24:13 2017 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 9 14:24:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6afc5aa8 |
7 |
|
8 |
net-nntp/sabnzbd: bump 2.1.0 |
9 |
|
10 |
Fixes #621540 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
net-nntp/sabnzbd/Manifest | 2 +- |
15 |
.../files/patches/0001-use-system-configobj.patch | 6 ++-- |
16 |
.../files/patches/0002-use-system-feedparser.patch | 6 ++-- |
17 |
.../sabnzbd/files/patches/0003-use-gntp-1.0.patch | 8 ++--- |
18 |
.../0004-cfg-disable-NtfOSD-by-default.patch | 25 ++++++++++++++++ |
19 |
.../0004-cfg-disable-growl-by-default.patch | 34 ---------------------- |
20 |
.../{sabnzbd-2.0.1.ebuild => sabnzbd-2.1.0.ebuild} | 0 |
21 |
7 files changed, 36 insertions(+), 45 deletions(-) |
22 |
|
23 |
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest |
24 |
index 4487dcf6c42..2310c66af25 100644 |
25 |
--- a/net-nntp/sabnzbd/Manifest |
26 |
+++ b/net-nntp/sabnzbd/Manifest |
27 |
@@ -1 +1 @@ |
28 |
-DIST SABnzbd-2.0.1-src.tar.gz 2715648 SHA256 62619aab1c741e5d9088bfa177418da2961b82e58f93a763154514fb9d94880f SHA512 d23d5848fc69d1e2f9ddce266af3dabc3e6fb746177fdc87cf376e2fda5ff17c60caf65af74440a5dafb23435a32c7061da92e82e2608a750a7102aa802fe748 WHIRLPOOL 2a93830067e45b4862aa13d81de9e61802f52dc230a9d578c5af0796ae943f05ea3ab00a0249bd9681010c4ab7fb95e06b08077607cbba23ce306c8bdb09979c |
29 |
+DIST SABnzbd-2.1.0-src.tar.gz 2683475 SHA256 bad49cc66381448e472280e143fbdd096788c51a9aada8317f12817ce7a855b6 SHA512 1c52b3b15de6493ed956b40a02d9c87fdd8fb96fdc587cf694f61f04f50c7f76de936dd171045a6ae5d82f6e4df68cd07bd04d149b8a1e5c9c4ba587a373327f WHIRLPOOL c27b5ca8541f7d56a499b3467e02d734cff9a6511651f5bc7893ced77cc9238dde10a1ba33340b3a1635cf63203b6ed3a859d91396dd800f8424b56129f52d92 |
30 |
|
31 |
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
32 |
index bca7f1eb2ef..7da07926ca2 100644 |
33 |
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
34 |
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch |
35 |
@@ -1,7 +1,7 @@ |
36 |
-From 55328c07986010fd7c91c7da42bca136fc4cd2e9 Mon Sep 17 00:00:00 2001 |
37 |
+From c12601b509ab66ac1b076679fe69fe7698455fb1 Mon Sep 17 00:00:00 2001 |
38 |
From: Justin Bronder <jsbronder@×××××.com> |
39 |
Date: Mon, 13 Feb 2017 18:20:39 -0500 |
40 |
-Subject: [PATCH 1/5] use system configobj |
41 |
+Subject: [PATCH 1/4] use system configobj |
42 |
|
43 |
--- |
44 |
sabnzbd/config.py | 3 ++- |
45 |
@@ -24,5 +24,5 @@ index 93dd9bb..aab1648 100644 |
46 |
SAVE_CONFIG_LOCK = threading.Lock() |
47 |
|
48 |
-- |
49 |
-2.10.2 |
50 |
+2.13.0 |
51 |
|
52 |
|
53 |
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
54 |
index 790e86f3c55..cb9d9310576 100644 |
55 |
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
56 |
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch |
57 |
@@ -1,7 +1,7 @@ |
58 |
-From 6a28d8ba51e902e9d49ad6c18fa2de6511908119 Mon Sep 17 00:00:00 2001 |
59 |
+From 7095a430201d0a9ec28e2c8f7e05f76eea59431e Mon Sep 17 00:00:00 2001 |
60 |
From: Justin Bronder <jsbronder@×××××.com> |
61 |
Date: Mon, 13 Feb 2017 18:21:28 -0500 |
62 |
-Subject: [PATCH 2/5] use system feedparser |
63 |
+Subject: [PATCH 2/4] use system feedparser |
64 |
|
65 |
--- |
66 |
sabnzbd/rss.py | 4 ++-- |
67 |
@@ -30,5 +30,5 @@ index 9987e91..8ee1552 100644 |
68 |
|
69 |
|
70 |
-- |
71 |
-2.10.2 |
72 |
+2.13.0 |
73 |
|
74 |
|
75 |
diff --git a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
76 |
index d4d97fe208e..da87c01a6bd 100644 |
77 |
--- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
78 |
+++ b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch |
79 |
@@ -1,14 +1,14 @@ |
80 |
-From 821a02104149aa65a6581730457eddbe082153cc Mon Sep 17 00:00:00 2001 |
81 |
+From 1530dc98302cd8a57cf8c3a4616341a7f2c08e50 Mon Sep 17 00:00:00 2001 |
82 |
From: Justin Bronder <jsbronder@×××××.com> |
83 |
Date: Mon, 13 Feb 2017 18:23:46 -0500 |
84 |
-Subject: [PATCH 3/5] use >=gntp-1.0 |
85 |
+Subject: [PATCH 3/4] use >=gntp-1.0 |
86 |
|
87 |
--- |
88 |
sabnzbd/notifier.py | 2 +- |
89 |
1 file changed, 1 insertion(+), 1 deletion(-) |
90 |
|
91 |
diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py |
92 |
-index f99083f..581eda0 100644 |
93 |
+index 38d0678..4742b3d 100644 |
94 |
--- a/sabnzbd/notifier.py |
95 |
+++ b/sabnzbd/notifier.py |
96 |
@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS |
97 |
@@ -21,5 +21,5 @@ index f99083f..581eda0 100644 |
98 |
try: |
99 |
import Growl |
100 |
-- |
101 |
-2.10.2 |
102 |
+2.13.0 |
103 |
|
104 |
|
105 |
diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch |
106 |
new file mode 100644 |
107 |
index 00000000000..25856801af7 |
108 |
--- /dev/null |
109 |
+++ b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch |
110 |
@@ -0,0 +1,25 @@ |
111 |
+From 31eec0d37bcb962afb1b0f0974411dae728dcd9f Mon Sep 17 00:00:00 2001 |
112 |
+From: Justin Bronder <jsbronder@×××××.com> |
113 |
+Date: Sat, 5 Aug 2017 17:38:03 -0400 |
114 |
+Subject: [PATCH 4/4] cfg: disable NtfOSD by default |
115 |
+ |
116 |
+--- |
117 |
+ sabnzbd/cfg.py | 2 +- |
118 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
119 |
+ |
120 |
+diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py |
121 |
+index baf5678..f9646fb 100644 |
122 |
+--- a/sabnzbd/cfg.py |
123 |
++++ b/sabnzbd/cfg.py |
124 |
+@@ -270,7 +270,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) |
125 |
+ acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False) |
126 |
+ |
127 |
+ # [ntfosd] |
128 |
+-ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN) |
129 |
++ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False) |
130 |
+ ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True) |
131 |
+ ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False) |
132 |
+ ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False) |
133 |
+-- |
134 |
+2.13.0 |
135 |
+ |
136 |
|
137 |
diff --git a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch |
138 |
deleted file mode 100644 |
139 |
index 072c3d01462..00000000000 |
140 |
--- a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch |
141 |
+++ /dev/null |
142 |
@@ -1,34 +0,0 @@ |
143 |
-From 6574da3da07b789a6cdbeebc8e36da8a0559924b Mon Sep 17 00:00:00 2001 |
144 |
-From: Justin Bronder <jsbronder@×××××.com> |
145 |
-Date: Tue, 14 Jun 2016 08:38:54 -0400 |
146 |
-Subject: [PATCH 4/5] cfg: disable growl by default |
147 |
- |
148 |
---- |
149 |
- sabnzbd/cfg.py | 4 ++-- |
150 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
151 |
- |
152 |
-diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py |
153 |
-index f06b79e..c66fe91 100644 |
154 |
---- a/sabnzbd/cfg.py |
155 |
-+++ b/sabnzbd/cfg.py |
156 |
-@@ -277,7 +277,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True) |
157 |
- acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False) |
158 |
- |
159 |
- # [ntfosd] |
160 |
--ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN) |
161 |
-+ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False) |
162 |
- ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True) |
163 |
- ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False) |
164 |
- ntfosd_prio_pp = OptionBool('ntfosd', 'ntfosd_prio_pp', False) |
165 |
-@@ -291,7 +291,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True) |
166 |
- ntfosd_prio_other = OptionBool('ntfosd', 'ntfosd_prio_other', False) |
167 |
- |
168 |
- # [growl] |
169 |
--growl_enable = OptionBool('growl', 'growl_enable', sabnzbd.DARWIN and sabnzbd.DARWIN_VERSION < 8) |
170 |
-+growl_enable = OptionBool('growl', 'growl_enable', False) |
171 |
- growl_server = OptionStr('growl', 'growl_server') |
172 |
- growl_password = OptionPassword('growl', 'growl_password') |
173 |
- growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True) |
174 |
--- |
175 |
-2.10.2 |
176 |
- |
177 |
|
178 |
diff --git a/net-nntp/sabnzbd/sabnzbd-2.0.1.ebuild b/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild |
179 |
similarity index 100% |
180 |
rename from net-nntp/sabnzbd/sabnzbd-2.0.1.ebuild |
181 |
rename to net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild |