gentoo resync : 13.10.2019

6 files changed, 2 insertions, 152 deletions

diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index eaf8ad513e6d..f954cce3b681 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,9 +1,4 @@
-AUX yowsup-2.5.7-add-python3.7-support.patch 2535 BLAKE2B 261373abd08c5a3eb46267755c8f57000742c442074ee578db5f3f64f9def59e1aae3dc74722706d86bbad62f1cff8d2b7b54cf20153d04c7ce9522c4a9334b0 SHA512 b35b52a0f5e2e5a766b11f2360e6bd17e95ac9c8065a711a9cdad829fb2e5f2109e232a24dab9be1bfd4e2f082d1e20b2b799ea9c4f5987bfbf8f90d16450c60
-AUX yowsup-2.5.7-fix-install-path.patch 1006 BLAKE2B 984570abfac5056ddd3ac9d9dc89ebf75bd43f724f9f9278dde5099d09300588a7be7e8ce8aba5f1241f115d24e9405f55606ed729a0a2a379c606d494bab330 SHA512 53bdf45df4b09bc669e8a7edd413d77cd42258da653f6fbaea82e2d6cc10d1bf4ff0acfa8e463ad3c509fb59672e59995eb7f3351fb744386bfdc9f82bc56c08
-AUX yowsup-2.5.7-fix-newer-six.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
 AUX yowsup-3.2.3-fix-install-path.patch 819 BLAKE2B da850faf959e8d3fa1009c525fc5811d62a90f04a4e65585ac4926d9146125e0a8a3abfc1828513c3831df65c9964c80262d9e6173ccfc3cd1c07acd262ac53a SHA512 fcbee788e2e2d077b5bba3b301ae98603680542615079c1d248338a92fccec8548a5987599dc2923318f5bfb83904c97e8952f881ca18e3c2bbee0dd60e7d474
-DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
 DIST yowsup-3.2.3.tar.gz 140038 BLAKE2B 45df9151e897eea4f2997246d8c66409bc58160e01a84ee632f3e834058efcaed1d03047ddc6e8e7acbaa566d5fab2451fb21b30daf477bc83dfdd0bee7e6b59 SHA512 a1be36df5dc632071385cf0e252a208efb8982df98966d2c5a7b7558c626112e1ac2688be25fb6de1db9e9e04d36ab96784e589aeb90fcc6c6770edac791e568
-EBUILD yowsup-2.5.7-r2.ebuild 974 BLAKE2B d0438a3c6f3a3a84e94ae36ffa969325bbc34567ba60a739e146566cb3ca868a185971f4fa1e0f5abfda930718aae514b3097f3a6cf6bb012c5589cd3ad2317d SHA512 b9702cda815423840009e43d00ea6213526deef314cdcf7f6becfe25ae79fb043d8bdda51b4973f493a898a346bbf9b1d80b5de9b79a37d7dfed43a3606051fe
-EBUILD yowsup-3.2.3.ebuild 1207 BLAKE2B 876cffd9fcfb8aa71d5c3244c074c75cc253ef15a2d8104d314d64c6f793aace0263ef86d18e3a37b0038fa0c59ef9bcf587a61c3d3ec85b5c86df6667935786 SHA512 bacaa306fa370b579c5647b1b689d30018f866486f48e777ae0477e870a9e15682f70cb1a8fefc716758ab6868eccc5f3a3ae04d35e5ef7a942ab85a5a22b6f3
+EBUILD yowsup-3.2.3.ebuild 1205 BLAKE2B 17efa23d4f6da48ca7f9d6be30d567a939d4da463e4be732144a2618b2b971c4a6fbf276bbf90c44f8ec4bf2e7ce4662dcfea293ce01a0a9c90f192b1022f166 SHA512 1b1e2463b56133061bfc9e76ea8aeee2d052797c39d2fe9eaaa276e8b4d079b015a56bef2cee375731fb239d238132ebcd1ca7fa1ef84a4ee6d6ab736c5817e8
 MISC metadata.xml 874 BLAKE2B d27417813e16211b395c0680cb1342e4088d8d99c7b7ce904bcae5fce1ee479147cc8c8a3e82069c4fdea61df5ce774c3efc0b528af4080535d12a555e05469c SHA512 ac2e2d245d510785dec9a1979b49c60618815098f6baf1fbb097426ea7ce9c4131c3702d0dc43c5b02c4da4fe7595220a5f9626b6eb386c0f30fe6e1fb20a26f
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__)
diff --git a/net-im/yowsup/yowsup-2.5.7-r2.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
deleted file mode 100644
index 1b4eb9ea9533..000000000000
--- a/net-im/yowsup/yowsup-2.5.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="readline"
-
-inherit distutils-r1
-
-DESCRIPTION="A library that enables you to build applications which use the WhatsApp service"
-HOMEPAGE="https://github.com/tgalal/yowsup"
-SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/configargparse[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-python3.7-support.patch"
-	"${FILESDIR}/${P}-fix-install-path.patch"
-	"${FILESDIR}/${P}-fix-newer-six.patch"
-	)
diff --git a/net-im/yowsup/yowsup-3.2.3.ebuild b/net-im/yowsup/yowsup-3.2.3.ebuild
index 69b80264ed28..8616e38519ee 100644
--- a/net-im/yowsup/yowsup-3.2.3.ebuild
+++ b/net-im/yowsup/yowsup-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tgalal/yowsup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]