Version bump. Add requests dep to 9999 ebuild (bug #516708).

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

3 files changed, 103 insertions, 2 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 40dc39f24ee3..94128237cd14 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2014/06/19 01:34:13 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.40 2014/07/08 21:45:21 chutzpah Exp $
+
+*salt-2014.1.6 (08 Jul 2014)
+
+  08 Jul 2014; Patrick McLean <chutzpah@gentoo.org> +salt-2014.1.6.ebuild,
+  salt-9999.ebuild:
+  Version bump. Add requests dep to 9999 ebuild (bug #516708).
 
 *salt-2014.1.5-r1 (19 Jun 2014)
 
diff --git a/app-admin/salt/salt-2014.1.6.ebuild b/app-admin/salt/salt-2014.1.6.ebuild
new file mode 100644
index 000000000000..28c62a1e03c0
--- /dev/null
+++ b/app-admin/salt/salt-2014.1.6.ebuild
@@ -0,0 +1,90 @@
+# 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-2014.1.6.ebuild,v 1.1 2014/07/08 21:45:21 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit eutils distutils-r1 systemd
+
+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 libcloud libvirt mako mongodb mysql openssl redis timelib test"
+
+RDEPEND=">=dev-python/pyzmq-2.2.0[${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}]
+		libcloud? ( >=dev-python/libcloud-0.14.0[${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}] )
+		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+			dev-python/pip
+			dev-python/virtualenv
+			dev-python/timelib
+			>=dev-python/SaltTesting-2014.4.24
+			${RDEPEND}
+		)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
+	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
+	"${FILESDIR}/${PN}-2014.1.5-minion-error.patch"
+)
+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() {
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for s in minion master syndic; do
+		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/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+	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 1726b9ea0725..9806a144cfc5 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2014/06/13 01:23:37 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.11 2014/07/08 21:45:21 chutzpah Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
@@ -51,6 +52,7 @@ RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 DEPEND="test? (
 			dev-python/pip
 			dev-python/virtualenv
+			dev-python/timelib
 			>=dev-python/SaltTesting-2014.4.24
 			${RDEPEND}
 		)"
@@ -58,6 +60,9 @@ 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() {