public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/yowsup/files/, net-im/yowsup/
@ 2018-12-28 23:01 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2018-12-28 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     59102683bac0b71ebe69770078d1d0c783574b29
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Mon Dec 17 19:03:50 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 23:01:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59102683

net-im/yowsup: add python3.7 support

Also switch from dev-python/pycrpto to dev-python/pycrptodome, as it's more
modern. Besides, renamed six patch, to have a proper file name.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../files/yowsup-2.5.7-add-python3.7-support.patch | 51 ++++++++++++++++++++++
 .../files/yowsup-2.5.7-fix-install-path.patch      | 28 ++++++++++++
 ...sion.patch => yowsup-2.5.7-fix-newer-six.patch} |  0
 net-im/yowsup/yowsup-2.5.7-r1.ebuild               |  2 +-
 ...wsup-2.5.7-r1.ebuild => yowsup-2.5.7-r2.ebuild} | 11 +++--
 5 files changed, 88 insertions(+), 4 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
new file mode 100644
index 00000000000..6d3f3c83004
--- /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 <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
new file mode 100644
index 00000000000..63b0fbfc91c
--- /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 <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/fix_newer_six_version.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
similarity index 100%
rename from net-im/yowsup/files/fix_newer_six_version.patch
rename to net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch

diff --git a/net-im/yowsup/yowsup-2.5.7-r1.ebuild b/net-im/yowsup/yowsup-2.5.7-r1.ebuild
index 7c53464c30f..b3435a6d6ed 100644
--- a/net-im/yowsup/yowsup-2.5.7-r1.ebuild
+++ b/net-im/yowsup/yowsup-2.5.7-r1.ebuild
@@ -28,4 +28,4 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/fix_newer_six_version.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-newer-six.patch" )

diff --git a/net-im/yowsup/yowsup-2.5.7-r1.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
similarity index 76%
copy from net-im/yowsup/yowsup-2.5.7-r1.ebuild
copy to net-im/yowsup/yowsup-2.5.7-r2.ebuild
index 7c53464c30f..48ac9722544 100644
--- a/net-im/yowsup/yowsup-2.5.7-r1.ebuild
+++ b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline"
 
 inherit distutils-r1
@@ -20,12 +20,17 @@ RDEPEND="
 	dev-python/configargparse[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${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}/fix_newer_six_version.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-add-python3.7-support.patch"
+	"${FILESDIR}/${P}-fix-install-path.patch"
+	"${FILESDIR}/${P}-fix-newer-six.patch"
+	)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/yowsup/files/, net-im/yowsup/
@ 2019-08-02 18:16 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2019-08-02 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f7e529155909025558089340c0f828c4c22977b6
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Jul 26 21:18:08 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 18:14:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e52915

net-im/yowsup: bump to version 3.2.3

This is a new major release of net-im/yowsup,
which needs new dependencies:
dev-python/consonance
dev-python/dissononce
dev-python/transitions

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12550
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/yowsup/Manifest                             |  1 +
 .../files/yowsup-3.2.3-fix-install-path.patch      | 21 ++++++++++++
 net-im/yowsup/yowsup-3.2.3.ebuild                  | 40 ++++++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index e767fd6b519..e46ebc8f7b3 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1 +1,2 @@
 DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
+DIST yowsup-3.2.3.tar.gz 140038 BLAKE2B 45df9151e897eea4f2997246d8c66409bc58160e01a84ee632f3e834058efcaed1d03047ddc6e8e7acbaa566d5fab2451fb21b30daf477bc83dfdd0bee7e6b59 SHA512 a1be36df5dc632071385cf0e252a208efb8982df98966d2c5a7b7558c626112e1ac2688be25fb6de1db9e9e04d36ab96784e589aeb90fcc6c6770edac791e568

diff --git a/net-im/yowsup/files/yowsup-3.2.3-fix-install-path.patch b/net-im/yowsup/files/yowsup-3.2.3-fix-install-path.patch
new file mode 100644
index 00000000000..eba10fbced5
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-3.2.3-fix-install-path.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2019-05-07 18:52:38.000000000 +0200
++++ b/setup.py	2019-07-26 23:05:18.000000000 +0200
+@@ -33,7 +33,6 @@
+     #long_description=long_description,
+     packages= find_packages(),
+     include_package_data=True,
+-    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
+     platforms='any',
+     #test_suite='',
+     classifiers = [
+--- a/yowsup/common/tools.py	2019-05-07 18:52:38.000000000 +0200
++++ b/yowsup/common/tools.py	2019-07-26 23:05:38.000000000 +0200
+@@ -173,7 +173,7 @@
+         return preview
+ 
+ class MimeTools:
+-    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/yowsup-3.2.3.ebuild b/net-im/yowsup/yowsup-3.2.3.ebuild
new file mode 100644
index 00000000000..69b80264ed2
--- /dev/null
+++ b/net-im/yowsup/yowsup-3.2.3.ebuild
@@ -0,0 +1,40 @@
+# 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/appdirs[${PYTHON_USEDEP}]
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/consonance[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install-path.patch" )
+
+pkg_postinst() {
+	einfo "Warning: It seems that recently yowsup gets detected during registration"
+	einfo "resulting in an instant ban for your number right after registering"
+	einfo "with the code you receive by sms/voice."
+	einfo "See https://github.com/tgalal/yowsup/issues/2829 for more information."
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/yowsup/files/, net-im/yowsup/
@ 2019-10-07  5:20 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2019-10-07  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     7010a2cbb0c88f2f8a82db585cd867d287662282
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Oct  4 16:43:38 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 05:19:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7010a2cb

net-im/yowsup: drop old version

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/13142
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-im/yowsup/Manifest                             |  1 -
 .../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-r2.ebuild               | 36 ---------------
 5 files changed, 146 deletions(-)

diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index e46ebc8f7b3..2c2eb7f5be4 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,2 +1 @@
-DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
 DIST yowsup-3.2.3.tar.gz 140038 BLAKE2B 45df9151e897eea4f2997246d8c66409bc58160e01a84ee632f3e834058efcaed1d03047ddc6e8e7acbaa566d5fab2451fb21b30daf477bc83dfdd0bee7e6b59 SHA512 a1be36df5dc632071385cf0e252a208efb8982df98966d2c5a7b7558c626112e1ac2688be25fb6de1db9e9e04d36ab96784e589aeb90fcc6c6770edac791e568

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 6d3f3c83004..00000000000
--- 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 63b0fbfc91c..00000000000
--- 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 d1bfb27ce29..00000000000
--- 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 1b4eb9ea953..00000000000
--- 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"
-	)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/yowsup/files/, net-im/yowsup/
@ 2019-12-18 18:19 Conrad Kostecki
  0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2019-12-18 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     49c0bf602106b191f69a4732a6fd478046c226d7
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 18:06:18 2019 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 18:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c0bf60

net-im/yowsup: bump to version 3.2.3_p20190905

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-im/yowsup/Manifest                             |  1 +
 .../yowsup-3.2.3_p20190905-fix-install-path.patch  | 21 +++++++++
 net-im/yowsup/yowsup-3.2.3_p20190905.ebuild        | 50 ++++++++++++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index 2c2eb7f5be4..f8f9d7791a7 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1 +1,2 @@
 DIST yowsup-3.2.3.tar.gz 140038 BLAKE2B 45df9151e897eea4f2997246d8c66409bc58160e01a84ee632f3e834058efcaed1d03047ddc6e8e7acbaa566d5fab2451fb21b30daf477bc83dfdd0bee7e6b59 SHA512 a1be36df5dc632071385cf0e252a208efb8982df98966d2c5a7b7558c626112e1ac2688be25fb6de1db9e9e04d36ab96784e589aeb90fcc6c6770edac791e568
+DIST yowsup-3.2.3_p20190905.tar.gz 150149 BLAKE2B 149c49df1a3b4df9163abcb1625b7e15e41d81f6a1a649c08d8cca88cce6cf10488778301fc96af3b2fe9e668e855023e56da6e6e8b3b9038994273f19404b78 SHA512 4b59a30bf73797750b92aecf45bf2e551fcbb249688efac631400bf532e21b739e9a6628ed01da4d520ed9296657ae8c5463c3560b165c5d696fd18f1e700be7

diff --git a/net-im/yowsup/files/yowsup-3.2.3_p20190905-fix-install-path.patch b/net-im/yowsup/files/yowsup-3.2.3_p20190905-fix-install-path.patch
new file mode 100644
index 00000000000..54258dd754b
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-3.2.3_p20190905-fix-install-path.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2019-05-07 18:52:38.000000000 +0200
++++ b/setup.py	2019-12-18 18:30:40.509051347 +0100
+@@ -33,7 +33,6 @@
+     #long_description=long_description,
+     packages= find_packages(),
+     include_package_data=True,
+-    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
+     platforms='any',
+     #test_suite='',
+     classifiers = [
+--- a/yowsup/common/tools.py	2019-05-07 18:52:38.000000000 +0200
++++ b/yowsup/common/tools.py	2019-12-18 18:30:40.509051347 +0100
+@@ -165,7 +165,7 @@
+         return preview
+ 
+ class MimeTools:
+-    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/yowsup-3.2.3_p20190905.ebuild b/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
new file mode 100644
index 00000000000..47b8ef70794
--- /dev/null
+++ b/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+EGIT_COMMIT="2adc067f306d9e7d8b634f66e96c52d80a42e1ff"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+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/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/consonance[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}/${PF}-fix-install-path.patch" )
+
+src_prepare() {
+	default
+
+	# After talking to upstream, version restriction can be lifted
+	# and also 'argparse' needs to be removed.
+	sed -e 's/==0.1.3-1//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/argparse/' -i setup.py || die
+}
+
+pkg_postinst() {
+	einfo "Warning: It seems that recently yowsup gets detected during registration"
+	einfo "resulting in an instant ban for your number right after registering"
+	einfo "with the code you receive by sms/voice."
+	einfo "See https://github.com/tgalal/yowsup/issues/2829 for more information."
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-12-18 18:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-18 18:19 [gentoo-commits] repo/gentoo:master commit in: net-im/yowsup/files/, net-im/yowsup/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2019-10-07  5:20 Joonas Niilola
2019-08-02 18:16 Joonas Niilola
2018-12-28 23:01 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox