gentoo resync : 20.03.2022

2 files changed, 7 insertions, 16 deletions

diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index 77bad8317c8c..460826ac0c8c 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,4 +1,4 @@
 AUX yowsup-3.2.3_p20190905-fix-install-path.patch 819 BLAKE2B c1b30327dc0e56eb2516d4c397779a129d04ff1727b9c0b2a41f971a0ca27d855c59a58abf5d05c3a832756c951b281bda4c50bcec7bc75a44fe02a618a651b4 SHA512 2ee5d15f48d891f05c567e4bdf3b2b249963241dfdb825fab7c9dbce9d71007ed4f947a57a9565f6a4b49a79a4edf5043f9b651b6ba194a8761bc5a4d973c02d
-DIST yowsup-3.2.3_p20190905.tar.gz 150149 BLAKE2B 149c49df1a3b4df9163abcb1625b7e15e41d81f6a1a649c08d8cca88cce6cf10488778301fc96af3b2fe9e668e855023e56da6e6e8b3b9038994273f19404b78 SHA512 4b59a30bf73797750b92aecf45bf2e551fcbb249688efac631400bf532e21b739e9a6628ed01da4d520ed9296657ae8c5463c3560b165c5d696fd18f1e700be7
-EBUILD yowsup-3.2.3_p20190905.ebuild 1595 BLAKE2B 19fc0ac44fd1a15b218f44fa0f6a9c0fe8d519b2d88c842ee68109350412be62c960d38e6f1ed9e2049a29be8232daca6a76a633a7fe99543e30a006314557f2 SHA512 4db85ddff8449513af7482c359e44996a7233b05e9a2cc14dddb9c96a2657b36ff8445f0ba848850365895bbe57042c99ae2e13b9092942566bb268d6fbf6802
+DIST yowsup-3.3.0.tar.gz 155950 BLAKE2B 7ade7f7e05aff14d5154d35d5c2a1841ee66893059bd995facb8297d7e6f1dde4468105dc3f03b5462efbf92cbd079c457440bb1580235bbbcfaddeab2244b56 SHA512 304409f02aa3720b0f70a83fe4dbe288fa1c5659642878d7bd1354359524a66c39b9f5baa9899224497f61f974d9b64ba67e07d866fda2589413070bb9ef1aad
+EBUILD yowsup-3.3.0.ebuild 1228 BLAKE2B 705f9313872049d62c475fa59475fb4f2c7172ab0eee707105669567ac1a457ed9ede39254065cc03d08f0931c3b3a32e1e790c474721107dff69ce0fb903350 SHA512 fc8399b919dec4402223319d67e68b524f8d1326e3a163b42ee3037ed9d23c69761edc5f077b99acff7e2a7fcae6553359f3611e2c431bfb5d54a57e54a36369
 MISC metadata.xml 756 BLAKE2B d0513b15622bb24f287bc5b987d3865ef2681a183edd7d2d1fb725c2d953124cc5341e08fc5811ef049fd78bb60225607490cf81c8e534e6830ac7b55081c6b7 SHA512 c28211cb67f9fa1ce01508dcdf0193e62cbd11266c2a0b9c5f2cd5d01dfaf330991ed8ac5451fe1034d9f9e32dc331f750aea206275e4c1548ae260b1f01568d
diff --git a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild
index 05be23ec4c12..8c23695dc49f 100644
--- a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
+++ b/net-im/yowsup/yowsup-3.3.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="bdepend"
-EGIT_COMMIT="2adc067f306d9e7d8b634f66e96c52d80a42e1ff"
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="readline"
 
@@ -12,8 +11,7 @@ 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"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+SRC_URI="https://github.com/tgalal/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -34,19 +32,12 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PF}-fix-install-path.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.2.3_p20190905-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."
+	sed -e 's/==0.1.5//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/>=3.6.0//' -e 's/argparse//' -i setup.py || die
 }