* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/
@ 2017-02-14 0:21 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2017-02-14 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 3ac80fb90578304a918f5566eec04102ee641f01
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 00:21:09 2017 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 00:21:36 2017 +0000
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..0000000000
--- 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 0000000000..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 <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 0000000000..fef142ec68
--- /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
similarity index 75%
rename from net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch
rename to net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
index 4e0674aa1f..d8e2d82df3 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
similarity index 89%
rename from net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch
rename to net-nntp/sabnzbd/files/patches/0004-cfg-disable-growl-by-default.patch
index 384fb336f8..695ace4f6b 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 2fcbf28099..0000000000
--- 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 0000000000..28b9fed106
--- /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 df0a94b99a..decc9a37d5 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
similarity index 94%
rename from net-nntp/sabnzbd/sabnzbd-1.1.1-r1.ebuild
rename to net-nntp/sabnzbd/sabnzbd-1.2.0.ebuild
index f95a022967..f5c0f1965b 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 )
"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/
@ 2017-06-07 21:56 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2017-06-07 21:56 UTC (permalink / raw
To: gentoo-commits
commit: c04c5c0fb843fe64313fba9e409ecb06bbe3c1ce
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 21:55:55 2017 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 21:56:10 2017 +0000
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 <jsbronder@gmail.com>
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 <jsbronder@gmail.com>
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 <jsbronder@gmail.com>
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 >=gntp-1.0
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sabnzbd/notifier.py b/sabnzbd/notifier.py
-index 5732f03..b1dc9d6 100644
+index f99083f..581eda0 100644
--- a/sabnzbd/notifier.py
+++ b/sabnzbd/notifier.py
@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS
@@ -21,5 +21,5 @@ index 5732f03..b1dc9d6 100644
try:
import Growl
--
-2.7.3
+2.10.2
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
index 695ace4f6b0..072c3d01462 100644
--- 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
@@ -1,4 +1,4 @@
-From 395378c67bbae92fcbb450a2353bb44e157e51e2 Mon Sep 17 00:00:00 2001
+From 6574da3da07b789a6cdbeebc8e36da8a0559924b Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@gmail.com>
Date: Tue, 14 Jun 2016 08:38:54 -0400
Subject: [PATCH 4/5] cfg: disable growl by default
@@ -8,10 +8,10 @@ Subject: [PATCH 4/5] cfg: disable growl by default
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
-index ecfc544..115e46e 100644
+index f06b79e..c66fe91 100644
--- a/sabnzbd/cfg.py
+++ b/sabnzbd/cfg.py
-@@ -291,7 +291,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
+@@ -277,7 +277,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
# [ntfosd]
@@ -20,7 +20,7 @@ index ecfc544..115e46e 100644
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)
-@@ -305,7 +305,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True)
+@@ -291,7 +291,7 @@ ntfosd_prio_queue_done = OptionBool('ntfosd', 'ntfosd_prio_queue_done', True)
ntfosd_prio_other = OptionBool('ntfosd', 'ntfosd_prio_other', False)
# [growl]
@@ -30,5 +30,5 @@ index ecfc544..115e46e 100644
growl_password = OptionPassword('growl', 'growl_password')
growl_prio_startup = OptionBool('growl', 'growl_prio_startup', True)
--
-2.7.3
+2.10.2
diff --git a/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch
deleted file mode 100644
index 28b9fed106f..00000000000
--- a/net-nntp/sabnzbd/files/patches/0005-use-system-rarfile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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 09a69c40cb4..1bd96f540af 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -5,12 +5,11 @@
<email>jsbronder@gentoo.org</email>
</maintainer>
<use>
+ <flag name="7za">Add support for extracting 7za files</flag>
<flag name="rar">Add support for extracting rar files</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>
<upstream>
- <remote-id type="sourceforge">sabnzbdplus</remote-id>
<remote-id type="github">sabnzbd/sabnzbd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-2.0.1.ebuild
similarity index 84%
rename from net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild
rename to net-nntp/sabnzbd/sabnzbd-2.0.1.ebuild
index d51ad295cec..67204542978 100644
--- a/net-nntp/sabnzbd/sabnzbd-1.2.3-r1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-2.0.1.ebuild
@@ -19,7 +19,7 @@ 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 unzip +yenc"
+IUSE="+7za +rar unzip"
# 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
@@ -28,6 +28,9 @@ IUSE="+rar unzip +yenc"
# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
# pynewsleecher
#
+# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
+# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
+#
# Also note that cherrypy is still bundled. It's near impossible to find
# out where the bundled and heavily patched version came from (pulled from
# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
@@ -39,14 +42,15 @@ RDEPEND="
>=app-arch/par2cmdline-0.4
>=dev-python/cheetah-2.0.1
dev-python/configobj
+ dev-python/cryptography
dev-python/feedparser
dev-python/gntp
dev-python/pythonutils
- dev-python/rarfile
+ dev-python/sabyenc
net-misc/wget
+ 7za? ( app-arch/p7zip )
rar? ( || ( app-arch/unrar app-arch/rar ) )
unzip? ( >=app-arch/unzip-5.5.2 )
- yenc? ( dev-python/yenc )
"
DEPEND="${PYTHON_DEPS}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -67,9 +71,9 @@ src_prepare() {
eapply "${FILESDIR}"/patches
# remove bundled modules
- rm -r sabnzbd/utils/{feedparser,configobj,rarfile}.py || die
+ rm -r sabnzbd/utils/{feedparser,configobj}.py || die
rm -r gntp || die
- rm licenses/License-{feedparser,configobj,gntp,rarfile}.txt || die
+ rm licenses/License-{feedparser,configobj,gntp}.txt || die
eapply_user
}
@@ -117,13 +121,11 @@ pkg_postinst() {
local replacing
for replacing in ${REPLACING_VERSIONS}; do
- if [ "$(get_major_version ${replacing})" == "0" ]; then
- ewarn
- ewarn "Upgrading from ${PN}-0.x.y to ${PN}-1.x.y introduces incompatible changes, see:"
+ if [ "$(get_major_version ${replacing})" == "1" ]; then
ewarn
- ewarn " https://sabnzbd.org/wiki/introducing-1-0-0"
+ ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
+ ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
ewarn
- ewarn "In particular, you need to let your queue complete before restarting SABnzbd+."
break
fi
done
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/
@ 2017-09-01 14:43 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2017-09-01 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 4c6258d55124ef58d2e7979c2076c13a9ed11e92
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 14:42:46 2017 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 14:42:46 2017 +0000
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 <jsbronder@gmail.com>
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 <jsbronder@gmail.com>
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 <jsbronder@gmail.com>
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 d8867db..59a341c 100644
--- a/sabnzbd/cfg.py
+++ b/sabnzbd/cfg.py
-@@ -270,7 +270,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
+@@ -322,7 +322,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_cats = OptionList('ntfosd', 'ntfosd_cats', ['*'])
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)
--
2.13.0
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
deleted file mode 100644
index da87c01a6bd..00000000000
--- a/net-nntp/sabnzbd/files/patches/0003-use-gntp-1.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1530dc98302cd8a57cf8c3a4616341a7f2c08e50 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 13 Feb 2017 18:23:46 -0500
-Subject: [PATCH 3/4] 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 38d0678..4742b3d 100644
---- a/sabnzbd/notifier.py
-+++ b/sabnzbd/notifier.py
-@@ -39,7 +39,7 @@ from sabnzbd.constants import NOTIFY_KEYS
- from sabnzbd.misc import split_host, make_script_path
- from sabnzbd.newsunpack import external_script
-
--from gntp import GNTPRegister
-+from gntp.core import GNTPRegister
- from gntp.notifier import GrowlNotifier
- try:
- import Growl
---
-2.13.0
-
diff --git a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild
similarity index 86%
rename from net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild
rename to net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild
index 67204542978..b08b1d3c549 100644
--- a/net-nntp/sabnzbd/sabnzbd-2.1.0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-2.2.1.ebuild
@@ -120,13 +120,27 @@ pkg_postinst() {
einfo "As Growl is not the default notification system on Gentoo, we disable it."
local replacing
+ local major
+ local minor
for replacing in ${REPLACING_VERSIONS}; do
- if [ "$(get_major_version ${replacing})" == "1" ]; then
+ major=$(get_major_version ${replacing})
+ minor=$(get_version_component_range 2 ${replacing})
+
+ if [ "${major}" == "1" ]; then
ewarn
ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
ewarn
break
+ elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
+ ewarn
+ ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+ ewarn "is started for the first time. Job order, settings and data will be"
+ ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+ ewarn "fetching before the upgrade will be lost!"
+ ewarn
+ break
fi
+
done
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-01 14:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-07 21:56 [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/files/patches/, net-nntp/sabnzbd/ Justin Bronder
-- strict thread matches above, loose matches on Subject: below --
2017-09-01 14:43 Justin Bronder
2017-02-14 0:21 Justin Bronder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox