fixed dependency hell

2 files changed, 28 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index becd3288c85f..f4fc890a21f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,40 @@
 pkgbase = virtualfish
 	pkgdesc = A virtualenv wrapper for the Fish shell
 	pkgver = 1.0.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/adambrenecki/virtualfish
 	install = virtualfish.install
 	arch = any
 	license = MIT
+	makedepends = python-setuptools
+	makedepends = python-setuptools_scm
+	makedepends = python-virtualenv
+	makedepends = python-pkgconfig
+	makedepends = python-psutil
+	makedepends = python-xdg
+	makedepends = python2-setuptools
+	makedepends = python2-setuptools_scm
+	makedepends = python2-virtualenv
+	makedepends = python2-pkgconfig
+	makedepends = python2-psutil
+	makedepends = python2-xdg
 	options = !emptydirs
 	source = virtualfish::git+https://github.com/adambrenecki/virtualfish.git#tag=1.0.6
 	sha256sums = SKIP
 
 pkgname = python-virtualfish
+	depends = python-setuptools
+	depends = python-setuptools_scm
 	depends = python-virtualenv
+	depends = python-pkgconfig
+	depends = python-psutil
+	depends = python-xdg
 
 pkgname = python2-virtualfish
+	depends = python2-setuptools
+	depends = python2-setuptools_scm
 	depends = python2-virtualenv
+	depends = python2-pkgconfig
+	depends = python2-psutil
+	depends = python2-xdg
 
diff --git a/PKGBUILD b/PKGBUILD
index c4cbbf78544a..7ae15d45c22b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
 pkgbase=virtualfish
 pkgname=('python-virtualfish' 'python2-virtualfish')
 pkgver=1.0.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A virtualenv wrapper for the Fish shell"
 arch=(any)
 url="https://github.com/adambrenecki/virtualfish"
 license=('MIT')
 options=(!emptydirs)
 install=virtualfish.install
+makedepends=('python-setuptools'  'python-setuptools_scm'  'python-virtualenv'  'python-pkgconfig'  'python-psutil'  'python-xdg'
+             'python2-setuptools' 'python2-setuptools_scm'  'python2-virtualenv' 'python2-pkgconfig' 'python2-psutil' 'python2-xdg')
 source=("${pkgbase}::git+https://github.com/adambrenecki/${pkgbase}.git#tag=${pkgver}")
 sha256sums=('SKIP')
 
@@ -17,17 +19,13 @@ prepare() {
 }
 
 package_python-virtualfish() {
-    depends=('python-virtualenv')
-    makedepends=('python-setuptools')
-
+    depends=('python-setuptools' 'python-setuptools_scm' 'python-virtualenv' 'python-pkgconfig' 'python-psutil' 'python-xdg')
     cd "${srcdir}/${pkgbase}"
     python setup.py install --root="$pkgdir/" --optimize=1
 }
 
 package_python2-virtualfish() {
-    depends=('python2-virtualenv')
-    makedepends=('python2-setuptools')
-
+    depends=('python2-setuptools' 'python2-setuptools_scm' 'python2-virtualenv' 'python2-pkgconfig' 'python2-psutil' 'python2-xdg')
     cd "${srcdir}/${pkgbase}-py2"
     python2 setup.py install --root="$pkgdir/" --optimize=1
 }