add missing dependencies, separate build and package

2 files changed, 26 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7b6714288a4..68e0693db187 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,10 +9,18 @@ pkgbase = python-pystray
 	makedepends = python2
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
+	makedepends = python-sphinx
+	makedepends = python2-sphinx
 	source = https://github.com/moses-palmer/pystray/archive/v0.14.4.tar.gz
 	sha512sums = 8c0da713ce5314137015d23c156de22054a44d4720be36a41ad1917bc694ffaed0b254b9473f67a26bf630e12d7fa71744410723927318280768efcfb752cd81
 
 pkgname = python-pystray
+	depends = python-pillow
+	depends = python-six
+	depends = python-xlib
 
 pkgname = python2-pystray
+	depends = python2-pillow
+	depends = python2-six
+	depends = python2-xlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 994cbfb7fded..f8de2522332b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@ _pkgname=pystray
 pkgbase="python-${_pkgname}"
 pkgname=("python-${_pkgname}" "python2-${_pkgname}")
 pkgver=0.14.4
-pkgrel=1
+pkgrel=2
 arch=(any)
 license=('GPL')
 pkgdesc="Provides systray integration."
 url="https://github.com/moses-palmer/pystray"
-makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
+makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-sphinx' 'python2-sphinx')
 source=("https://github.com/moses-palmer/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha512sums=('8c0da713ce5314137015d23c156de22054a44d4720be36a41ad1917bc694ffaed0b254b9473f67a26bf630e12d7fa71744410723927318280768efcfb752cd81')
 
@@ -17,12 +17,24 @@ prepare() {
   cp -a ${_pkgname}-${pkgver}{,-py2}
 }
 
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py build
+
+  cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+  python2 setup.py build
+}
+
 package_python-pystray() {
-  cd ${_pkgname}-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
+  depends=('python-pillow' 'python-six' 'python-xlib')
+
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }
 
 package_python2-pystray() {
-  cd ${_pkgname}-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
+  depends=('python2-pillow' 'python2-six' 'python2-xlib')
+
+  cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }