Version bump, clean up some old stuff in files.

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

6 files changed, 97 insertions, 56 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index c35924e150bc..1b53c3cb678f 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2014/08/29 22:49:52 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.48 2014/10/10 01:12:19 chutzpah Exp $
+
+*salt-2014.1.11 (10 Oct 2014)
+
+  10 Oct 2014; Patrick McLean <chutzpah@gentoo.org> +salt-2014.1.11.ebuild,
+  -files/salt-0.17.1-tests-nonroot.patch, -files/master-initd-2,
+  -files/minion-initd-2, -files/syndic-initd-2:
+  Version bump, clean up some old stuff in files.
 
   29 Aug 2014; Patrick McLean <chutzpah@gentoo.org> -salt-0.17.4-r2.ebuild,
   -salt-2014.1.5.ebuild, -salt-2014.1.5-r1.ebuild, -salt-2014.1.7.ebuild:
diff --git a/app-admin/salt/files/master-initd-2 b/app-admin/salt/files/master-initd-2
deleted file mode 100644
index 61380096cf9f..000000000000
--- a/app-admin/salt/files/master-initd-2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# 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-2,v 1.1 2014/01/22 20:40:48 radhermit Exp $
-
-command="/usr/bin/salt-master"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-master.pid"
-name="SALT master daemon"
-
-depend() {
-	use net
-}
diff --git a/app-admin/salt/files/minion-initd-2 b/app-admin/salt/files/minion-initd-2
deleted file mode 100644
index 9f6c65b49d9e..000000000000
--- a/app-admin/salt/files/minion-initd-2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# 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-2,v 1.1 2014/01/22 20:40:48 radhermit Exp $
-
-command="/usr/bin/salt-minion"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-minion.pid"
-name="SALT minion daemon"
-
-depend() {
-	need net
-}
diff --git a/app-admin/salt/files/salt-0.17.1-tests-nonroot.patch b/app-admin/salt/files/salt-0.17.1-tests-nonroot.patch
deleted file mode 100644
index a7eb1e128b80..000000000000
--- a/app-admin/salt/files/salt-0.17.1-tests-nonroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tests/unit/utils/verify_test.py	2013-10-17 04:48:57.000000000 +0000
-+++ b/tests/unit/utils/verify_test.py	2013-11-12 18:39:01.439026280 +0000
-@@ -79,8 +79,8 @@
-         self.assertEqual(dir_stat.st_uid, os.getuid())
-         self.assertEqual(dir_stat.st_gid, os.getgid())
-         self.assertEqual(dir_stat.st_mode & stat.S_IRWXU, stat.S_IRWXU)
--        self.assertEqual(dir_stat.st_mode & stat.S_IRWXG, 40)
--        self.assertEqual(dir_stat.st_mode & stat.S_IRWXO, 5)
-+        #self.assertEqual(dir_stat.st_mode & stat.S_IRWXG, 40)
-+        #self.assertEqual(dir_stat.st_mode & stat.S_IRWXO, 5)
- 
-     @requires_network(only_local_network=True)
-     def test_verify_socket(self):
diff --git a/app-admin/salt/files/syndic-initd-2 b/app-admin/salt/files/syndic-initd-2
deleted file mode 100644
index 2f3227a6df1f..000000000000
--- a/app-admin/salt/files/syndic-initd-2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# 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-2,v 1.1 2014/01/22 20:40:48 radhermit Exp $
-
-command="/usr/bin/salt-syndic"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-syndic.pid"
-name="SALT syndic daemon"
-
-depend() {
-	use net
-}
diff --git a/app-admin/salt/salt-2014.1.11.ebuild b/app-admin/salt/salt-2014.1.11.ebuild
new file mode 100644
index 000000000000..a18787e0122d
--- /dev/null
+++ b/app-admin/salt/salt-2014.1.11.ebuild
@@ -0,0 +1,89 @@
+# 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.11.ebuild,v 1.1 2014/10/10 01:12:19 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"
+)
+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
+}