summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2012-11-16 18:25:06 +0000
committerPatrick McLean <chutzpah@gentoo.org>2012-11-16 18:25:06 +0000
commitc66a5711c158ed61a211303f99c54e20ae9bf652 (patch)
treeaf5fe4097c904db4c346d4bc48e72bc2f00ed971 /app-admin
parentStable for amd64, wrt bug #442478 (diff)
downloadgentoo-2-c66a5711c158ed61a211303f99c54e20ae9bf652.tar.gz
gentoo-2-c66a5711c158ed61a211303f99c54e20ae9bf652.tar.bz2
gentoo-2-c66a5711c158ed61a211303f99c54e20ae9bf652.zip
Version bump.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/salt/ChangeLog8
-rw-r--r--app-admin/salt/metadata.xml1
-rw-r--r--app-admin/salt/salt-0.10.5.ebuild62
3 files changed, 70 insertions, 1 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index dc7a4030990a..8ab1f9afadda 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +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.2 2012/07/06 23:16:24 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.3 2012/11/16 18:25:06 chutzpah Exp $
+
+*salt-0.10.5 (16 Nov 2012)
+
+ 16 Nov 2012; Patrick McLean <chutzpah@gentoo.org> +salt-0.10.5.ebuild,
+ metadata.xml:
+ Version bump.
*salt-0.10.0 (06 Jul 2012)
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 8dab74766ed8..15e057f05bbe 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -21,6 +21,7 @@ Between the remote execution system, and state management Salt addresses the
backbone of cloud and data center management.
</longdescription>
<use>
+ <flag name="openssl">Add support for using TLS via OpenSSL.</flag>
<flag name="jinja">Add support to use dev-python/jinja to parse Salt
states.</flag>
<flag name="libvirt">Support managing virtual machines with
diff --git a/app-admin/salt/salt-0.10.5.ebuild b/app-admin/salt/salt-0.10.5.ebuild
new file mode 100644
index 000000000000..bde478f6a767
--- /dev/null
+++ b/app-admin/salt/salt-0.10.5.ebuild
@@ -0,0 +1,62 @@
+# 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.10.5.ebuild,v 1.1 2012/11/16 18:25:06 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 ldap libvirt mongodb mysql openssl 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
+ ldap? ( dev-python/python-ldap )
+ openssl? ( dev-python/pyopenssl )
+ 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() {
+ 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
+
+ # install the config template files
+ dodir /etc/${PN}
+ for conf in conf/*.template; do
+ sed '1 d' ${conf} > "${D}"/etc/${PN}/"$(basename "${conf%.template}")" \
+ || die "sed failed"
+ done
+
+ dodoc README.rst AUTHORS
+}
+
+python_test() {
+ ./setup.py test || die
+}