summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2016-06-14 09:40:34 -0400
committerJustin Bronder <jsbronder@gentoo.org>2016-06-14 09:40:34 -0400
commit0ee47dab119883a5ba9bd5ef7ce95105afa47654 (patch)
tree4decad06a3e12a72f58cb1d726d32bbb24a91d63 /net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch
parentapp-text/jabref-bin: Drop dependency on virtual/jdk (diff)
downloadgentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.tar.gz
gentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.tar.bz2
gentoo-0ee47dab119883a5ba9bd5ef7ce95105afa47654.zip
net-nntp/sabnzbd: bump 1.0.3
Update patches and unbundle rarlib which is now in portage. Package-Manager: portage-2.2.26
Diffstat (limited to 'net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch')
-rw-r--r--net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch
new file mode 100644
index 000000000000..7d5f374e6e03
--- /dev/null
+++ b/net-nntp/sabnzbd/files/1.x/0004-use-system-rarfile.patch
@@ -0,0 +1,68 @@
+From 33ce1a3e3cce21feedc88cddf708173f826c57cb 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 7c4beb8..142678d 100644
+--- a/sabnzbd/assembler.py
++++ b/sabnzbd/assembler.py
+@@ -34,6 +34,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
+@@ -42,7 +44,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 6ada4bf..7a31920 100644
+--- a/sabnzbd/dirscanner.py
++++ b/sabnzbd/dirscanner.py
+@@ -27,9 +27,10 @@ import gzip
+ import bz2
+ import threading
+
++from rarfile import RarFile, is_rarfile
++
+ import sabnzbd
+ from sabnzbd.constants import *
+-from sabnzbd.utils.rarfile import is_rarfile, RarFile
+ from sabnzbd.newsunpack import is_sevenfile, SevenZip
+ import sabnzbd.nzbstuff as nzbstuff
+ import sabnzbd.misc as misc
+diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py
+index 6906aed..940879f 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, name_fixer, \
+ 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
+