gentoo resync : 13.10.2019

3 files changed, 0 insertions, 109 deletions

diff --git a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
deleted file mode 100644
index 6d3f3c83004e..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix compatibility with Python 3.7 since async has become a reserved word
-Author: Josue Ortega <josue@debian.org>
-Last-Update: 2018-07-29
-
---- a/yowsup/demos/cli/layer.py
-+++ b/yowsup/demos/cli/layer.py
-@@ -559,7 +559,7 @@
-             mediaUploader = MediaUploader(jid, self.getOwnJid(), filePath,
-                                       resultRequestUploadIqProtocolEntity.getUrl(),
-                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
--                                      successFn, self.onUploadError, self.onUploadProgress, async=False)
-+                                      successFn, self.onUploadError, self.onUploadProgress, asyncronous=False)
-             mediaUploader.start()
- 
-     def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity):
---- a/yowsup/layers/interface/interface.py
-+++ b/yowsup/layers/interface/interface.py
-@@ -125,7 +125,7 @@
-             mediaUploader = MediaUploader(builder.jid, self.getOwnJid(), builder.getFilepath(),
-                                       resultRequestUploadIqProtocolEntity.getUrl(),
-                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
--                                      successFn, errorFn, progress, async=True)
-+                                      successFn, errorFn, progress, asyncronous=True)
-             mediaUploader.start()
- 
-     def __onRequestUploadError(self, errorEntity, requestUploadEntity, builder, error = None):
---- a/yowsup/layers/protocol_media/mediauploader.py
-+++ b/yowsup/layers/protocol_media/mediauploader.py
-@@ -9,10 +9,11 @@
- logger = logging.getLogger(__name__)
- 
- class MediaUploader(WARequest, threading.Thread):
--    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset = 0, successClbk = None, errorClbk = None, progressCallback = None, async = True):
-+    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset=0, successClbk=None,
-+                 errorClbk=None, progressCallback=None, asyncronous=True):
-         WARequest.__init__(self)
- 
--        self.async = async
-+        self.asyncronous = asyncronous
-         self.jid = jid
-         self.accountJid = accountJid
-         self.sourcePath = sourcePath
-@@ -30,7 +31,7 @@
-         self.sock = socket.socket()
- 
-     def start(self):
--        if self.async:
-+        if self.asyncronous:
-             threading.Thread.__init__(self)
-             super(MediaUploader, self).start()
-         else:
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
deleted file mode 100644
index 63b0fbfc91c9..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fixes wrong installation of mime.types file.
-Author: Josue Ortega <josue@debian.org>
-Last-Update: 2016-09-04
-
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,7 @@
-     #long_description=long_description,
-     packages= find_packages(),
-     include_package_data=True,
--    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
-+    #data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
-     platforms='any',
-     #test_suite='',
-     classifiers = [
---- a/yowsup/common/tools.py
-+++ b/yowsup/common/tools.py
-@@ -150,7 +150,9 @@
-         return preview
- 
- class MimeTools:
--    MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
-+    # Replaces mime.types path for the debian path installation
-+    # MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
-+    MIME_FILE = os.path.join('/usr/share/yowsup/common', 'mime.types')
-     mimetypes.init() # Load default mime.types
-     try:
-         mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
deleted file mode 100644
index d1bfb27ce295..000000000000
--- a/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/setup.py	2018-04-29 20:51:23.000000000 +0200
-@@ -5,7 +5,7 @@
- import platform
- import sys
- 
--deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
-+deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
- 
- if sys.version_info < (2,7):
-     deps += ['importlib', "protobuf==3.4.0"]
---- a/yowsup/env/env.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/yowsup/env/env.py	2018-04-29 20:51:44.000000000 +0200
-@@ -13,7 +13,6 @@
-         super(YowsupEnvType, cls).__init__(name, bases, dct)
- 
- class YowsupEnv(with_metaclass(YowsupEnvType, object)):
--    __metaclass__ = YowsupEnvType
-     __ENVS = {}
-     __CURR = None
- 
---- a/yowsup/layers/protocol_media/picture.py	2017-12-30 00:12:35.000000000 +0100
-+++ b/yowsup/layers/protocol_media/picture.py	2018-04-29 20:52:30.000000000 +0200
-@@ -1,5 +1,5 @@
- from yowsup.layers import YowLayer
--from yowsup import ProtocolTreeNode
-+from yowsup.structs import ProtocolTreeNode
- from .mediadownloader import MediaDownloader
- import shutil, os, logging
- logger = logging.getLogger(__name__)