Version bump. Update 9999 to match current release. Add "use logger" to init script (bug #502550). Clean out old versions.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

10 files changed, 57 insertions, 265 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index b4d7bd8759cd..5ac7445d8362 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.31 2014/01/22 20:40:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.32 2014/02/27 00:02:32 chutzpah Exp $
+
+*salt-2014.1.0 (26 Feb 2014)
+
+  26 Feb 2014; Patrick McLean <chutzpah@gentoo.org> -salt-0.16.4.ebuild,
+  -salt-0.17.2.ebuild, -salt-0.17.4.ebuild, -salt-0.17.4-r1.ebuild,
+  +salt-2014.1.0.ebuild, salt-9999.ebuild, -files/master-initd-1,
+  -files/minion-initd-1, -files/syndic-initd-1, +files/master-initd-3,
+  +files/minion-initd-3, +files/syndic-initd-3, metadata.xml:
+  Version bump. Update 9999 to match current release. Add "use logger" to init
+  script (bug #502550). Clean out old versions.
 
 *salt-0.17.4-r2 (22 Jan 2014)
 
diff --git a/app-admin/salt/files/master-initd-1 b/app-admin/salt/files/master-initd-3
index b39afff05c92..f9b10219841b 100644
--- a/app-admin/salt/files/master-initd-1
+++ b/app-admin/salt/files/master-initd-3
@@ -1,13 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/master-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
 
 command="/usr/bin/salt-master"
-command_args="--daemon ${SALT_OPTS}"
+command_args="${SALT_OPTS}"
+command_background="1"
 pidfile="/var/run/salt-master.pid"
 name="SALT master daemon"
 
 depend() {
-	use net
+	use net logger
 }
diff --git a/app-admin/salt/files/minion-initd-1 b/app-admin/salt/files/minion-initd-3
index a7f1e37ceb5c..bf57cbd5c72d 100644
--- a/app-admin/salt/files/minion-initd-1
+++ b/app-admin/salt/files/minion-initd-3
@@ -1,13 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/minion-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
 
 command="/usr/bin/salt-minion"
-command_args="--daemon ${SALT_OPTS}"
+command_args="${SALT_OPTS}"
+command_background="1"
 pidfile="/var/run/salt-minion.pid"
 name="SALT minion daemon"
 
 depend() {
 	need net
+	use logger
 }
diff --git a/app-admin/salt/files/syndic-initd-1 b/app-admin/salt/files/syndic-initd-3
index d8fdd7757492..712432f90168 100644
--- a/app-admin/salt/files/syndic-initd-1
+++ b/app-admin/salt/files/syndic-initd-3
@@ -1,13 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-3,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
 
 command="/usr/bin/salt-syndic"
-command_args="--daemon ${SALT_OPTS}"
+command_args="${SALT_OPTS}"
+command_background="1"
 pidfile="/var/run/salt-syndic.pid"
 name="SALT syndic daemon"
 
 depend() {
-	use net
+	use net logger
 }
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 4ca0d061a448..160dea7e8aaa 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -26,6 +26,7 @@ backbone of cloud and data center management.
 		<flag name="mongodb">Support returning data to a mongodb server.</flag>
 		<flag name="redis">Support returning data to a redis database.</flag>
 		<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
+		<flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/app-admin/salt/salt-0.16.4.ebuild b/app-admin/salt/salt-0.16.4.ebuild
deleted file mode 100644
index 021ba1dfb07b..000000000000
--- a/app-admin/salt/salt-0.16.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.16.4.ebuild,v 1.3 2013/12/09 23:19:32 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS=""
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/virtualenv
-			${RDEPEND}
-		)"
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc README.rst AUTHORS
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.17.2.ebuild b/app-admin/salt/salt-0.17.2.ebuild
deleted file mode 100644
index fa593072d0f0..000000000000
--- a/app-admin/salt/salt-0.17.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.17.2.ebuild,v 1.2 2013/12/03 18:43:12 cardoe Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/SaltTesting
-			${RDEPEND}
-		)"
-
-PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.17.4.ebuild b/app-admin/salt/salt-0.17.4.ebuild
deleted file mode 100644
index 36f4854fee5e..000000000000
--- a/app-admin/salt/salt-0.17.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.17.4.ebuild,v 1.1 2013/12/12 23:26:17 chutzpah Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
-
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		sys-apps/pciutils
-		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-		libvirt? ( || (
-			dev-python/libvirt-python[${PYTHON_USEDEP}]
-			app-emulation/libvirt[python,${PYTHON_USEDEP}]
-			)
-		)
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/SaltTesting
-			${RDEPEND}
-		)"
-
-PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	insinto /etc/${PN}
-	doins conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.17.4-r1.ebuild b/app-admin/salt/salt-2014.1.0.ebuild
index 446407967231..2c73b7a738bb 100644
--- a/app-admin/salt/salt-0.17.4-r1.ebuild
+++ b/app-admin/salt/salt-2014.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.17.4-r1.ebuild,v 1.1 2013/12/26 10:56:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.0.ebuild,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
 
 EAPI=5
 
@@ -24,9 +24,9 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako mongodb mysql openssl redis timelib test"
 
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/msgpack[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/m2crypto[${PYTHON_USEDEP}]
@@ -34,6 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
 		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
@@ -45,7 +46,8 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		)
 		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
 DEPEND="test? (
 			dev-python/pip
 			dev-python/virtualenv
@@ -58,13 +60,16 @@ DOCS=(README.rst AUTHORS)
 
 python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py
 }
 
 python_install_all() {
-	distutils-r1_python_install_all
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
 
 	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
 		systemd_dounit "${FILESDIR}"/salt-${s}.service
 	done
@@ -76,5 +81,5 @@ python_install_all() {
 python_test() {
 	# testsuite likes lots of files
 	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
 }
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index 3ff15599176c..f1f61ea1f5e2 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.8 2013/12/03 18:43:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.9 2014/02/27 00:02:32 chutzpah Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=(python{2_6,2_7})
 
-inherit eutils distutils-r1
+inherit eutils distutils-r1 systemd
 
 DESCRIPTION="Salt is a remote execution and configuration manager."
 HOMEPAGE="http://saltstack.org/"
@@ -24,9 +24,9 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako mongodb mysql openssl redis timelib test"
 
-RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/msgpack[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/m2crypto[${PYTHON_USEDEP}]
@@ -34,6 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
 		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
@@ -45,32 +46,37 @@ RDEPEND=">=dev-python/pyzmq-2.1.9[${PYTHON_USEDEP}]
 		)
 		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
 DEPEND="test? (
+			dev-python/pip
 			dev-python/virtualenv
+			dev-python/SaltTesting
 			${RDEPEND}
 		)"
 
+PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
+DOCS=(README.rst AUTHORS)
+
 python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
 }
 
 python_install_all() {
-	distutils-r1_python_install_all
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
 
 	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+		systemd_dounit "${FILESDIR}"/salt-${s}.service
 	done
 
 	insinto /etc/${PN}
 	doins conf/*
-
-	dodoc README.rst AUTHORS
 }
 
 python_test() {
 	# testsuite likes lots of files
 	ulimit -n 3072
-	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
 }