Add app-admin/salt to portage

(Portage version: 2.1.10.57/cvs/Linux x86_64)

10 files changed, 183 insertions, 0 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
new file mode 100644
index 000000000000..fe207c8e0681
--- /dev/null
+++ b/app-admin/salt/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for app-admin/salt
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+
+*salt-0.9.8 (24 Apr 2012)
+
+  24 Apr 2012; Patrick McLean <chutzpah@gentoo.org> +salt-0.9.8.ebuild,
+  +files/salt-0.9.8-syndic-resolution-of-master.patch, +files/master-confd-1,
+  +files/master-initd-1, +files/minion-confd-1, +files/minion-initd-1,
+  +files/syndic-confd-1, +files/syndic-initd-1, +metadata.xml:
+  Add app-admin/salt to portage
+
diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/master-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/master-initd-1 b/app-admin/salt/files/master-initd-1
new file mode 100644
index 000000000000..b39afff05c92
--- /dev/null
+++ b/app-admin/salt/files/master-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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 $
+
+command="/usr/bin/salt-master"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+
+depend() {
+	use net
+}
diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/minion-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/minion-initd-1 b/app-admin/salt/files/minion-initd-1
new file mode 100644
index 000000000000..a7f1e37ceb5c
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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 $
+
+command="/usr/bin/salt-minion"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-minion.pid"
+name="SALT minion daemon"
+
+depend() {
+	need net
+}
diff --git a/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch b/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch
new file mode 100644
index 000000000000..b449ae38cea8
--- /dev/null
+++ b/app-admin/salt/files/salt-0.9.8-syndic-resolution-of-master.patch
@@ -0,0 +1,25 @@
+From 6c25bb24a250eaa41df02a0fe0ea696f227e8d18 Mon Sep 17 00:00:00 2001
+From: Thomas S Hatch <thatch45@gmail.com>
+Date: Sat, 24 Mar 2012 11:51:24 -0600
+Subject: [PATCH] fix issue with syndic resolution of master 1p
+
+---
+ salt/__init__.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/salt/__init__.py b/salt/__init__.py
+index 61b98e3..bce0065 100644
+--- a/salt/__init__.py
++++ b/salt/__init__.py
+@@ -223,7 +223,7 @@ class Syndic(object):
+             # Some of the opts need to be changed to match the needed opts
+             # in the minion class.
+             opts['master'] = opts['syndic_master']
+-            opts['master_ip'] = salt.config.dns_check(opts['master'])
++            opts['master_ip'] = salt.utils.dns_check(opts['master'])
+ 
+             opts['master_uri'] = ('tcp://' + opts['master_ip'] +
+                                   ':' + str(opts['master_port']))
+-- 
+1.7.8.5
+
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/syndic-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-1 b/app-admin/salt/files/syndic-initd-1
new file mode 100644
index 000000000000..d8fdd7757492
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-1
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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 $
+
+command="/usr/bin/salt-syndic"
+command_args="--daemon ${SALT_OPTS}"
+pidfile="/var/run/salt-syndic.pid"
+name="SALT syndic daemon"
+
+depend() {
+	use net
+}
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
new file mode 100644
index 000000000000..8dab74766ed8
--- /dev/null
+++ b/app-admin/salt/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>chutzpah@gentoo.org</email>
+<name>Patrick McLean</name>
+</maintainer>
+<longdescription lang="en">
+Salt is a powerful remote execution manager that can be used to administer
+servers in a fast and efficient way.
+
+Salt allows commands to be executed across large groups of servers. This means
+systems can be easily managed, but data can also be easily gathered. Quick
+introspection into running systems becomes a reality.
+
+Remote execution is usually used to set up a certain state on a remote system.
+Salt addresses this problem as well, the salt state system uses salt state
+files to define the state a server needs to be in.
+
+Between the remote execution system, and state management Salt addresses the
+backbone of cloud and data center management.
+</longdescription>
+	<use>
+		<flag name="jinja">Add support to use dev-python/jinja to parse Salt
+		states.</flag>
+		<flag name="libvirt">Support managing virtual machines with
+		app-emulation/libvirt.</flag>
+		<flag name="mongodb">Support returning data to a mongodb server.</flag>
+		<flag name="redis">Support returning data to a redis database.</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/app-admin/salt/salt-0.9.8.ebuild b/app-admin/salt/salt-0.9.8.ebuild
new file mode 100644
index 000000000000..3994ca4b9edb
--- /dev/null
+++ b/app-admin/salt/salt-0.9.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.1 2012/04/24 23:37:27 chutzpah Exp $
+
+EAPI=4
+
+PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
+
+inherit eutils python-distutils-ng
+
+DESCRIPTION="Salt is a remote execution and configuration manager."
+HOMEPAGE="http://saltstack.org/"
+SRC_URI="mirror://github/saltstack/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+jinja libvirt mongodb mysql redis"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		>=dev-python/pyzmq-2.1.9
+		dev-python/msgpack
+		dev-python/pyyaml
+		dev-python/m2crypto
+		dev-python/pycrypto
+		dev-python/pycryptopp
+		jinja? ( dev-python/jinja )
+		libvirt? ( app-emulation/libvirt[python] )
+		mongodb? ( dev-python/pymongo )
+		mysql? ( dev-python/mysql-python )
+		redis? ( dev-python/redis-py )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-syndic-resolution-of-master.patch
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+
+	python-distutils-ng_src_prepare
+}
+
+src_install() {
+	python-distutils-ng_src_install
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+	done
+
+	# rename the config templates to the actual config names
+	for c in "${D}"/etc/${PN}/*.template; do
+		mv -f "${c}" "${c%.template}"
+		sed -i '1 d' "${c%.template}"
+	done
+
+	dodoc README.rst AUTHORS
+}
+
+python_test() {
+	./setup.py test || die
+}