[gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/

2017-09-01 Thread Justin Bronder 
commit: 4c6258d55124ef58d2e7979c2076c13a9ed11e92
Author: Justin Bronder  gentoo  org>
AuthorDate: Fri Sep  1 14:42:46 2017 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Fri Sep  1 14:42:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c6258d5

net-nntp/sabnzbd: bump 2.2.1

Fixes #628336

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-nntp/sabnzbd/Manifest  |  2 +-
 .../files/patches/0001-use-system-configobj.patch  | 10 -
 .../files/patches/0002-use-system-feedparser.patch |  6 +++---
 ...ch => 0003-cfg-disable-NtfOSD-by-default.patch} | 10 -
 .../sabnzbd/files/patches/0003-use-gntp-1.0.patch  | 25 --
 .../{sabnzbd-2.1.0.ebuild => sabnzbd-2.2.1.ebuild} | 16 +-
 6 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 2310c66af25..14e888f0744 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1 +1 @@
-DIST SABnzbd-2.1.0-src.tar.gz 2683475 SHA256 
bad49cc66381448e472280e143fbdd096788c51a9aada8317f12817ce7a855b6 SHA512 
1c52b3b15de6493ed956b40a02d9c87fdd8fb96fdc587cf694f61f04f50c7f76de936dd171045a6ae5d82f6e4df68cd07bd04d149b8a1e5c9c4ba587a373327f
 WHIRLPOOL 
c27b5ca8541f7d56a499b3467e02d734cff9a6511651f5bc7893ced77cc9238dde10a1ba33340b3a1635cf63203b6ed3a859d91396dd800f8424b56129f52d92
+DIST SABnzbd-2.2.1-src.tar.gz 2731050 SHA256 
5e29c44198d88245c6c8d0f78091c9a7915a07b464c1e66cf30eecf439c76a44 SHA512 
58c8a86358c0c993e6c62415393d4aba557dd093c52c8270604b9db5396afbb6d423b002b339cb2aa81a6fe66dbdde416a6834c57ca0efd7a1461294eb088af1
 WHIRLPOOL 
dad7e0d2bf99aeeafbbf0624374f0d58ce22e68441aa401707049e101a6f842819261b91f48e493957a1440bcbf26a282312126b009c8d578f9311de377f0c20

diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch 
b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
index 7da07926ca2..0f89dcd1341 100644
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
@@ -1,18 +1,18 @@
-From c12601b509ab66ac1b076679fe69fe7698455fb1 Mon Sep 17 00:00:00 2001
+From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Mon, 13 Feb 2017 18:20:39 -0500
-Subject: [PATCH 1/4] use system configobj
+Subject: [PATCH 1/3] 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 93dd9bb..aab1648 100644
+index 2f58ffd..04bfaab 100644
 --- a/sabnzbd/config.py
 +++ b/sabnzbd/config.py
-@@ -26,9 +26,10 @@ import threading
- import shutil
+@@ -30,9 +30,10 @@ from hashlib import md5
+ from urlparse import urlparse
  import sabnzbd.misc
  from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, 
DEFAULT_PRIORITY, MAX_WIN_DFOLDER
 -from sabnzbd.utils import configobj

diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch 
b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
index cb9d9310576..68e39a975e7 100644
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
@@ -1,14 +1,14 @@
-From 7095a430201d0a9ec28e2c8f7e05f76eea59431e Mon Sep 17 00:00:00 2001
+From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Mon, 13 Feb 2017 18:21:28 -0500
-Subject: [PATCH 2/4] use system feedparser
+Subject: [PATCH 2/3] 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 9987e91..8ee1552 100644
+index 0315fca..18ac828 100644
 --- a/sabnzbd/rss.py
 +++ b/sabnzbd/rss.py
 @@ -25,6 +25,8 @@ import time

diff --git 
a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch 
b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
similarity index 71%
rename from 
net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch
rename to 
net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
index 25856801af7..064d523a1e1 100644
--- a/net-nntp/sabnzbd/files/patches/0004-cfg-disable-NtfOSD-by-default.patch
+++ b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
@@ -1,25 +1,25 @@
-From 31eec0d37bcb962afb1b0f0974411dae728dcd9f Mon Sep 17 00:00:00 2001
+From 459111cb4f6937d58de480cf06743474f5c1dd3d Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Sat, 5 Aug 2017 17:38:03 -0400
-Subject: [PATCH 4/4] cfg:  disable NtfOSD by default
+Subject: [PATCH 3/3] cfg: disable NtfOSD by default
 
 ---
  sabnzbd/cfg.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
-index baf5678..f9646fb 100644
+index

[gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/

2017-06-07 Thread Justin Bronder 
commit: c04c5c0fb843fe64313fba9e409ecb06bbe3c1ce
Author: Justin Bronder  gentoo  org>
AuthorDate: Wed Jun  7 21:55:55 2017 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Wed Jun  7 21:56:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c5c0f

net-nntp/sabnzbd: bump 2.0.1

- Depend on dev-python/sabyenc
- Re-bundle rarfile due to upstream patches
- Add optional 7za support
- Add dependency on dev-python/cryptography
- Update pkg_postinst message for 2.x series

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-nntp/sabnzbd/Manifest  |  2 +-
 .../files/patches/0001-use-system-configobj.patch  | 10 +--
 .../files/patches/0002-use-system-feedparser.patch |  6 +-
 .../sabnzbd/files/patches/0003-use-gntp-1.0.patch  |  6 +-
 .../0004-cfg-disable-growl-by-default.patch| 10 +--
 .../files/patches/0005-use-system-rarfile.patch| 88 --
 net-nntp/sabnzbd/metadata.xml  |  3 +-
 ...abnzbd-1.2.3-r1.ebuild => sabnzbd-2.0.1.ebuild} | 22 +++---
 8 files changed, 30 insertions(+), 117 deletions(-)

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 51635e61cb9..4487dcf6c42 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1 +1 @@
-DIST SABnzbd-1.2.3-src.tar.gz 2725678 SHA256 
a0100d19edd9c6b528f79214a64690941281758048e4ead6671446070e1e9e24 SHA512 
80677df12a278a12a20405812f4f434625fa3a9dd769d8734b92771436a82ec6810fbc180e2b9b4ca9e15efc14b79d217b1392ff2a43785b803966afb9e3eb80
 WHIRLPOOL 
f9dd40f16fe3743a6e62d6dd4d7aa83855e0131b4a817af007f2319cb6845a604c61144f4f35a123d79d4633bbc2cee2616ebbe1e8cbf4e97729682a9e8eb436
+DIST SABnzbd-2.0.1-src.tar.gz 2715648 SHA256 
62619aab1c741e5d9088bfa177418da2961b82e58f93a763154514fb9d94880f SHA512 
d23d5848fc69d1e2f9ddce266af3dabc3e6fb746177fdc87cf376e2fda5ff17c60caf65af74440a5dafb23435a32c7061da92e82e2608a750a7102aa802fe748
 WHIRLPOOL 
2a93830067e45b4862aa13d81de9e61802f52dc230a9d578c5af0796ae943f05ea3ab00a0249bd9681010c4ab7fb95e06b08077607cbba23ce306c8bdb09979c

diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch 
b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
index 32d4b27000a..bca7f1eb2ef 100644
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
+++ b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
@@ -1,4 +1,4 @@
-From 74213e601bdb299a18e6eda8d71d4df28d871286 Mon Sep 17 00:00:00 2001
+From 55328c07986010fd7c91c7da42bca136fc4cd2e9 Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Mon, 13 Feb 2017 18:20:39 -0500
 Subject: [PATCH 1/5] use system configobj
@@ -8,13 +8,13 @@ Subject: [PATCH 1/5] use system configobj
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sabnzbd/config.py b/sabnzbd/config.py
-index ab5da99..1043298 100644
+index 93dd9bb..aab1648 100644
 --- a/sabnzbd/config.py
 +++ b/sabnzbd/config.py
-@@ -27,9 +27,10 @@ import shutil
+@@ -26,9 +26,10 @@ import threading
+ 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
  
@@ -24,5 +24,5 @@ index ab5da99..1043298 100644
  SAVE_CONFIG_LOCK = threading.Lock()
  
 -- 
-2.7.3
+2.10.2
 

diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch 
b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
index fef142ec689..790e86f3c55 100644
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
+++ b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
@@ -1,4 +1,4 @@
-From 04a18875d34f677a89bdf1bf57db7f236216e70e Mon Sep 17 00:00:00 2001
+From 6a28d8ba51e902e9d49ad6c18fa2de6511908119 Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Mon, 13 Feb 2017 18:21:28 -0500
 Subject: [PATCH 2/5] use system feedparser
@@ -8,7 +8,7 @@ Subject: [PATCH 2/5] use system feedparser
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
-index 73ec2b4..069aed0 100644
+index 9987e91..8ee1552 100644
 --- a/sabnzbd/rss.py
 +++ b/sabnzbd/rss.py
 @@ -25,6 +25,8 @@ import time
@@ -30,5 +30,5 @@ index 73ec2b4..069aed0 100644
  
  
 -- 
-2.7.3
+2.10.2
 

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
index d8e2d82df31..d4d97fe208e 100644
--- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
+++ b/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
@@ -1,4 +1,4 @@
-From 94ce3d83c9d921be01015b06881e79097aca3f82 Mon Sep 17 00:00:00 2001
+From 821a02104149aa65a6581730457eddbe082153cc Mon Sep 17 00:00:00 2001
 From: Justin Bronder 
 Date: Mon, 13 Feb 2017 18:23:46 -0500
 Subject: [PATCH 3/5] use >=gntp-1.0
@@ -8,7 +8,7 @@ Subject: [PATCH 3/5] use

[gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/

2017-02-13 Thread Justin Bronder 
commit: 3ac80fb90578304a918f5566eec04102ee641f01
Author: Justin Bronder  gentoo  org>
AuthorDate: Tue Feb 14 00:21:09 2017 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Tue Feb 14 00:21:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac80fb9

net-nntp/sabnzbd: bump 1.2.0

Package-Manager: portage-2.3.3

 net-nntp/sabnzbd/Manifest  |  2 +-
 .../0001-use-system-configobj-and-feedparser.patch | 52 -
 .../files/patches/0001-use-system-configobj.patch  | 28 +++
 .../files/patches/0002-use-system-feedparser.patch | 34 +
 ...sume-gntp-1.0.patch => 0003-use-gntp-1.0.patch} | 10 +--
 ...tch => 0004-cfg-disable-growl-by-default.patch} |  8 +-
 .../files/patches/0004-use-system-rarfile.patch| 68 -
 .../files/patches/0005-use-system-rarfile.patch| 88 ++
 net-nntp/sabnzbd/metadata.xml  |  1 -
 ...abnzbd-1.1.1-r1.ebuild => sabnzbd-1.2.0.ebuild} |  9 +--
 10 files changed, 164 insertions(+), 136 deletions(-)

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 3068fca584..d0ef2189c8 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 ef1a6fc894..00
--- 
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 
-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 00..32d4b27000
--- /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 
+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()
+ 
+--