From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- net-im/yowsup/Manifest | 6 ++- net-im/yowsup/files/fix_newer_six_version.patch | 30 ------------- .../files/yowsup-2.5.7-add-python3.7-support.patch | 51 ++++++++++++++++++++++ .../files/yowsup-2.5.7-fix-install-path.patch | 28 ++++++++++++ .../yowsup/files/yowsup-2.5.7-fix-newer-six.patch | 30 +++++++++++++ net-im/yowsup/yowsup-2.5.7-r1.ebuild | 31 ------------- net-im/yowsup/yowsup-2.5.7-r2.ebuild | 36 +++++++++++++++ 7 files changed, 149 insertions(+), 63 deletions(-) delete mode 100644 net-im/yowsup/files/fix_newer_six_version.patch create mode 100644 net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch create mode 100644 net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch create mode 100644 net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch delete mode 100644 net-im/yowsup/yowsup-2.5.7-r1.ebuild create mode 100644 net-im/yowsup/yowsup-2.5.7-r2.ebuild (limited to 'net-im/yowsup') diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest index 49b8cfd4ecff..f635d6396bbc 100644 --- a/net-im/yowsup/Manifest +++ b/net-im/yowsup/Manifest @@ -1,4 +1,6 @@ -AUX fix_newer_six_version.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2 +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 DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495 -EBUILD yowsup-2.5.7-r1.ebuild 881 BLAKE2B 6ba4bf0b3e5a3d71bed129931e8e5f081080361f40a38fbe0685b0a13ae9867ecdfb2bd2aadc7179c17c411835859019776bcbde82e5b456d9540be95b8df0cf SHA512 61dfaff6714b18952c0c1d78dd6125de41e2b2a1bb3f5bbcfb7b5d87ebac61c6945741f3b4f66742087ffbbb4e03c0fb03cce34a17cc5e8cde27e80760fa65a0 +EBUILD yowsup-2.5.7-r2.ebuild 978 BLAKE2B 040dae0fce253e9c10059752759e31e2beb10760319b06d7bc38d10916e9b7ea60ddce6052affdb773f3ab1fa1ccbd5a43af7c3b069af1e71decab638c171b55 SHA512 583a084ed6b3a1dcd58a5676e53cae57c5a475bf6fe92b4e5cfa8e9f32902eaf4ef5a3fd5eaf826d43e20435822b6bbbffba24cfd7f9eac9e9844183f4b74abb MISC metadata.xml 874 BLAKE2B d27417813e16211b395c0680cb1342e4088d8d99c7b7ce904bcae5fce1ee479147cc8c8a3e82069c4fdea61df5ce774c3efc0b528af4080535d12a555e05469c SHA512 ac2e2d245d510785dec9a1979b49c60618815098f6baf1fbb097426ea7ce9c4131c3702d0dc43c5b02c4da4fe7595220a5f9626b6eb386c0f30fe6e1fb20a26f diff --git a/net-im/yowsup/files/fix_newer_six_version.patch b/net-im/yowsup/files/fix_newer_six_version.patch deleted file mode 100644 index d1bfb27ce295..000000000000 --- a/net-im/yowsup/files/fix_newer_six_version.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/files/yowsup-2.5.7-add-python3.7-support.patch b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch new file mode 100644 index 000000000000..6d3f3c83004e --- /dev/null +++ b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch @@ -0,0 +1,51 @@ +Description: Fix compatibility with Python 3.7 since async has become a reserved word +Author: Josue Ortega +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 new file mode 100644 index 000000000000..63b0fbfc91c9 --- /dev/null +++ b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch @@ -0,0 +1,28 @@ +Description: Fixes wrong installation of mime.types file. +Author: Josue Ortega +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 new file mode 100644 index 000000000000..d1bfb27ce295 --- /dev/null +++ b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch @@ -0,0 +1,30 @@ +--- 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-r1.ebuild b/net-im/yowsup/yowsup-2.5.7-r1.ebuild deleted file mode 100644 index 7c53464c30fc..000000000000 --- a/net-im/yowsup/yowsup-2.5.7-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -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/pycrypto[${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}/fix_newer_six_version.patch" ) diff --git a/net-im/yowsup/yowsup-2.5.7-r2.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild new file mode 100644 index 000000000000..48ac97225448 --- /dev/null +++ b/net-im/yowsup/yowsup-2.5.7-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{4,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" + ) -- cgit v1.2.3