dependencies updated, python2 version removed

2 files changed, 12 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 71e6d279d41c..b247b0be4069 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat May  4 19:05:39 UTC 2019
+# Mon Jul 22 07:38:19 UTC 2019
 pkgbase = python-yowsup
 	pkgdesc = The open source cross platform Whatsapp library powering Wazapp
 	pkgver = 3.2.0
@@ -7,30 +7,19 @@ pkgbase = python-yowsup
 	url = https://github.com/tgalal/yowsup
 	arch = any
 	license = GPL
-	makedepends = python2-setuptools
-	makedepends = python2-dateutil
-	makedepends = python2-argparse
-	makedepends = python2-axolotl
-	makedepends = python2-pillow
 	makedepends = python-setuptools
 	makedepends = python-six
-	makedepends = python2-six
-	conflicts = yowsup-client-git
-	conflicts = python-yowsup-git
-	source = python-yowsup-3.2.0.tag.gz::https://github.com/tgalal/yowsup/archive/v3.2.0.tar.gz
-	sha512sums = f2261b0e184be7eae83d21c5ee31d60f5078f2484bc32b93bcc4766447e98ba5bc76b5797422684570fdd446a1673fcf9b6db95fb1b7a272bfe7df38dec37d37
-
-pkgname = python-yowsup
 	depends = python
 	depends = python-dateutil
 	depends = python-argparse
 	depends = python-axolotl
 	depends = python-pillow
+	depends = python-consonance-git
+	depends = python-dissononce-git
+	conflicts = yowsup-client-git
+	conflicts = python-yowsup-git
+	source = python-yowsup-3.2.0.tag.gz::https://github.com/tgalal/yowsup/archive/v3.2.0.tar.gz
+	sha512sums = f2261b0e184be7eae83d21c5ee31d60f5078f2484bc32b93bcc4766447e98ba5bc76b5797422684570fdd446a1673fcf9b6db95fb1b7a272bfe7df38dec37d37
 
-pkgname = python2-yowsup
-	depends = python2
-	depends = python2-dateutil
-	depends = python2-argparse
-	depends = python2-axolotl
-	depends = python2-pillow
+pkgname = python-yowsup
 
diff --git a/PKGBUILD b/PKGBUILD
index a144e1dec462..96a85964ba18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Hugo Osvaldo Barrera <hugo@barrera.io>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
-pkgname=('python-yowsup' 'python2-yowsup')
+pkgname='python-yowsup'
 pkgdesc='The open source cross platform Whatsapp library powering Wazapp - Python 2'
 pkgver=3.2.0
 pkgrel=1
@@ -11,7 +11,8 @@ pkgdesc="The open source cross platform Whatsapp library powering Wazapp"
 url="https://github.com/tgalal/yowsup"
 arch=('any')
 license=('GPL')
-makedepends=('python2-setuptools' 'python2-dateutil' 'python2-argparse' 'python2-axolotl' 'python2-pillow' 'python-setuptools' 'python-six' 'python2-six')
+depends=('python' 'python-dateutil' 'python-argparse' 'python-axolotl' 'python-pillow' 'python-consonance-git' 'python-dissononce-git')
+makedepends=('python-setuptools' 'python-six')
 provide=('python-yowsup')
 conflicts=('yowsup-client-git' 'python-yowsup-git')
 source=("${pkgname}-${pkgver}.tag.gz::https://github.com/tgalal/yowsup/archive/v${pkgver}.tar.gz")
@@ -21,9 +22,8 @@ prepare() {
     sed -i "s/six==1.10/six>=1.10/" yowsup-${pkgver}/setup.py
 }
 
-package_python-yowsup() {
+package() {
     cd "${srcdir}/yowsup-${pkgver}"
-    depends=('python' 'python-dateutil' 'python-argparse' 'python-axolotl' 'python-pillow')
 
     cd "${srcdir}/yowsup-${pkgver}"
     python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
@@ -31,15 +31,6 @@ package_python-yowsup() {
     mv "$pkgdir"/usr/yowsup "$pkgdir"/usr/share/yowsup
 }
 
-package_python2-yowsup() {
-    depends=('python2' 'python2-dateutil' 'python2-argparse' 'python2-axolotl' 'python2-pillow')
-
-    cd "${srcdir}/yowsup-${pkgver}"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    mkdir -p "$pkgdir"/usr/share/
-    mv "$pkgdir"/usr/yowsup "$pkgdir"/usr/share/yowsup
-}
-
 check(){
     cd "${srcdir}/yowsup-${pkgver}"
     #python setup.py test