From 9968734964dbe0eb14e87d323ef816415d9ad065 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 28 Feb 2012 15:34:30 +0100
Subject: [PATCH] Added new version of salt ebuild

---
 app-admin/salt/Manifest             |  4 +++
 app-admin/salt/files/salt.confd     | 10 +++++++
 app-admin/salt/files/salt.master    | 19 +++++++++++++
 app-admin/salt/files/salt.minion    | 19 +++++++++++++
 app-admin/salt/salt-0.9.7-r1.ebuild | 44 +++++++++++++++++++++++++++++
 5 files changed, 96 insertions(+)
 create mode 100644 app-admin/salt/files/salt.confd
 create mode 100644 app-admin/salt/files/salt.master
 create mode 100644 app-admin/salt/files/salt.minion
 create mode 100644 app-admin/salt/salt-0.9.7-r1.ebuild

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 89d47a3..4874aef 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,2 +1,6 @@
+AUX salt.confd 246 RMD160 971f14d187b7e29222316f7383e139a9384b4113 SHA1 784a1329ff6cbbc69645b42735a238af65c7eb3b SHA256 d327aef19ad00c4b497fe3c24f4631f005a517c79e5e02bdd5b5cb51219fe607
+AUX salt.master 413 RMD160 a4a70574f4787c9ea722f9e88f23e8c508a4f616 SHA1 d27671657d3030296a5a65da0098318c482545f1 SHA256 19aa60995b9b4cf8fdc3af4c47f2def6405254825f5753f3a81147fd2d8756c8
+AUX salt.minion 413 RMD160 b5ce5a8ab9093f7e03eae83f1fc3d169166b6756 SHA1 54db59af13b6ef7740348b35c9b1d102838d4b5c SHA256 78d21d4fd2458f371073bf5cf899b2915a656f33fbf06305b1587db67660ba5b
 DIST salt-0.9.7.tar.gz 245299 RMD160 ec2e338f3d459e8dc4d804761fc3d52a9f4fd0a8 SHA1 7fa34c23e952d8216c8b4634e0804f45fe368ad6 SHA256 f3562d5e92b896ac36e417c785436e3697736d56153bcace957f641e2a5dbc20
+EBUILD salt-0.9.7-r1.ebuild 1074 RMD160 bdd3f6c3f5b5bf3463d28eaa59f479921cd11576 SHA1 5b65ee3864213d50938212608a78ac8ebedd5e80 SHA256 1c255194e267ebcc160c8934817a3462172c57b28dd465d9282ac88e238fa174
 EBUILD salt-0.9.7.ebuild 684 RMD160 623fdb6aa3a6f1a86e1b104619454d2e7c4cd889 SHA1 0f8ff220b285d03d17bd0a2687f4caa42ad5de5c SHA256 010d9daebc8a17bf7355cf5881c6e9e0e6053531b9c87cca48b990297df0e56e
diff --git a/app-admin/salt/files/salt.confd b/app-admin/salt/files/salt.confd
new file mode 100644
index 0000000..1411a66
--- /dev/null
+++ b/app-admin/salt/files/salt.confd
@@ -0,0 +1,10 @@
+#
+# This options are passed to salt-master:
+#    (e.g. --log-level=trace, see salt-master --help)
+#SALT_MASTER_OPTIONS=""
+
+#
+# This options are passed to salt-minion:
+#    (e.g. --log-level=trace, see salt-minion --help)
+#SALT_MINION_OPTIONS=""
+
diff --git a/app-admin/salt/files/salt.master b/app-admin/salt/files/salt.master
new file mode 100644
index 0000000..47470d2
--- /dev/null
+++ b/app-admin/salt/files/salt.master
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+depend() {
+	use clock
+	need net netmount
+}
+
+start() {
+	ebegin "Starting salt master"
+	start-stop-daemon --start --pidfile /var/run/salt-master.pid --exec /usr/bin/salt-master -- --daemon ${SALT_MASTER_OPTIONS}
+	eend $? "Failed to start salt master"
+}
+
+stop() {
+	ebegin "Stopping salt master"
+	start-stop-daemon --stop --pidfile /var/run/salt-master.pid
+	eend $? "Failed to stop salt master"
+}
+
diff --git a/app-admin/salt/files/salt.minion b/app-admin/salt/files/salt.minion
new file mode 100644
index 0000000..6e10fac
--- /dev/null
+++ b/app-admin/salt/files/salt.minion
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+depend() {
+	use clock
+	need net netmount
+}
+
+start() {
+	ebegin "Starting salt minion"
+	start-stop-daemon --start --pidfile /var/run/salt-minion.pid --exec /usr/bin/salt-minion -- --daemon ${SALT_MINION_OPTIONS}
+	eend $? "Failed to start salt minion"
+}
+
+stop() {
+	ebegin "Stopping salt minion"
+	start-stop-daemon --stop --pidfile /var/run/salt-minion.pid
+	eend $? "Failed to stop salt minion"
+}
+
diff --git a/app-admin/salt/salt-0.9.7-r1.ebuild b/app-admin/salt/salt-0.9.7-r1.ebuild
new file mode 100644
index 0000000..f7b52b0
--- /dev/null
+++ b/app-admin/salt/salt-0.9.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+RESTRICT="nomirror"
+
+inherit distutils
+
+DESCRIPTION="A powerful remote execution manager that can be used to administer servers in a fast and efficient way"
+HOMEPAGE="http://saltstack.org/"
+SRC_URI="http://github.com/downloads/saltstack/salt/salt-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pyyaml
+		dev-python/m2crypto
+        dev-python/msgpack
+		dev-python/pycrypto
+		dev-python/jinja
+		dev-python/pyzmq
+	"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS LICENSE PKG-INFO README.rst"
+
+src_install() {
+
+	distutils_src_install
+	python_clean_installation_image
+
+	# Writing /var/tmp/portage/app-admin/salt-0.9.7-r1/temp/images/2.7/usr/lib64/python2.7/site-packages/salt-0.9.7-py2.7.egg-info
+
+	newinitd "${FILESDIR}/salt.master" salt.master || die
+	newinitd "${FILESDIR}/salt.minion" salt.minion || die
+	newconfd "${FILESDIR}/salt.confd" salt || die
+}
+
-- 
2.39.5