community/salt: upgrade to 2016.3.2, moved from testing

7 files changed, 12 insertions, 21 deletions

diff --git a/testing/salt/APKBUILD b/community/salt/APKBUILD
index b4e1b5c683..99721a66f4 100644
--- a/testing/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -1,16 +1,16 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=salt
-pkgver=2016.3.1
+pkgver=2016.3.2
 pkgrel=0
 pkgdesc="A remote execution and communication system built on zeromq"
 url="https://github.com/saltstack/salt"
 arch="noarch"
 license="ASL 2.0"
-depends=""
+depends="py-tornado py2-markupsafe py2-futures" 
 depends_dev=""
-makedepends="$depends_dev python-dev py-zmq py-m2crypto 
-	py-crypto py-psutil py-jinja2 py-yaml py-msgpack"
+makedepends="$depends_dev python2-dev py-zmq
+	py2-crypto py2-psutil py-jinja2 py-yaml py-msgpack"
 install=""
 subpackages="$pkgname-doc"
 source="https://github.com/saltstack/salt/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
@@ -21,25 +21,16 @@ source="https://github.com/saltstack/salt/releases/download/v$pkgver/$pkgname-$p
 		salt-syndic.initd
 		salt-syndic.confd"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
-	python setup.py build || return 1
+	cd "$builddir"
+	python2 setup.py build || return 1
 }
 
 package() {
-	cd "$_builddir"
-	python setup.py install --root=$pkgdir/ --optimize=1 || return 1
+	cd "$builddir"
+	python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1
 	mkdir -p ${pkgdir}/etc/rc.d/
 	cp ${srcdir}/salt-master.initd ${pkgdir}/etc/rc.d/salt-master
 	cp ${srcdir}/salt-minion.initd ${pkgdir}/etc/rc.d/salt-minion
@@ -53,21 +44,21 @@ package() {
 	cp ${srcdir}/${pkgname}-${pkgver}/conf/minion ${pkgdir}/etc/salt/
 }
 
-md5sums="04f763287fbcbb390ca53c6800e2eea7  salt-2016.3.1.tar.gz
+md5sums="27a9bb34c205ffe07e95b316e2131177  salt-2016.3.2.tar.gz
 0b40fd1b49ff4c2f34382fd69c341c34  salt-master.initd
 7bb58f256213aaaa23d86d5127c9ffe3  salt-master.confd
 c8326b9cff0df6065a1320eefea09b2c  salt-minion.initd
 75badf5042aa93a6da74659ca12bef70  salt-minion.confd
 dffce15d3a16a2dc40dd02d0c24fb4c6  salt-syndic.initd
 a24d13b018a35b31b34167bcaa749db5  salt-syndic.confd"
-sha256sums="e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75  salt-2016.3.1.tar.gz
+sha256sums="6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0  salt-2016.3.2.tar.gz
 40c9864ab001c00de60b52baff5c9cf7c2c0f248a1e02fb15260ae70287bce70  salt-master.initd
 383475b21261ac22c5930e99060d53630dfb35aac67aa03a18ec738e0f4dff50  salt-master.confd
 ae9236919c3fee3eef0ef8ad54334d6f833a51bbd4d42c40214614498acbe573  salt-minion.initd
 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1  salt-minion.confd
 6a453f63e51f2cc1ecb024ee8e7fa1beab7fbcea010f3eb10ea23bdb2383e7f5  salt-syndic.initd
 66a663c426e2fa157ea78f7f9b2f33f17b72dbc48e119f8dd2609aab8f8370e7  salt-syndic.confd"
-sha512sums="74122020a83df79171b9aa3bc311d1b16930140ec6b063c888d41e10fb8e696f69188b62cf925045b40d8b8fe713759de08978b08bc3b8e1f12722de3a8ddb7b  salt-2016.3.1.tar.gz
+sha512sums="608e2a43bc8c55eeb8c9e0f9207306e591151940ad1ffb869ada12963c0790f37653936e539c0b70439c13180909de2c763db6c30e7f9e2087068985d1b3ff91  salt-2016.3.2.tar.gz
 324e687e8b0eaccb799b4a719448341a4e09cda3add102890beddaf371ac42957bbc1622f145b2b86420061655bb27f27879302b5b34c6eee1987d2dcae6b8ef  salt-master.initd
 cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a  salt-master.confd
 c6634a592c6f3e65dd2b704cb500486bf8004c5b287d4a4d42b09af36ef129c59d6a89f005af058cf7911e8587d927b3db931186569084f13ebaca56f6ef93a0  salt-minion.initd
diff --git a/testing/salt/salt-master.confd b/community/salt/salt-master.confd
index e7fc8180a5..e7fc8180a5 100644
--- a/testing/salt/salt-master.confd
+++ b/community/salt/salt-master.confd
diff --git a/testing/salt/salt-master.initd b/community/salt/salt-master.initd
index f224f55bca..f224f55bca 100644
--- a/testing/salt/salt-master.initd
+++ b/community/salt/salt-master.initd
diff --git a/testing/salt/salt-minion.confd b/community/salt/salt-minion.confd
index d69d83fcd6..d69d83fcd6 100644
--- a/testing/salt/salt-minion.confd
+++ b/community/salt/salt-minion.confd
diff --git a/testing/salt/salt-minion.initd b/community/salt/salt-minion.initd
index 9cfac01e38..9cfac01e38 100644
--- a/testing/salt/salt-minion.initd
+++ b/community/salt/salt-minion.initd
diff --git a/testing/salt/salt-syndic.confd b/community/salt/salt-syndic.confd
index 534d3f527a..534d3f527a 100644
--- a/testing/salt/salt-syndic.confd
+++ b/community/salt/salt-syndic.confd
diff --git a/testing/salt/salt-syndic.initd b/community/salt/salt-syndic.initd
index cf7ec23d79..cf7ec23d79 100644
--- a/testing/salt/salt-syndic.initd
+++ b/community/salt/salt-syndic.initd