Version bump.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x5C350883

3 files changed, 91 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index f109629fdfda..cf1ee0dd59a7 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.14 2013/05/04 23:11:34 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.15 2013/05/11 01:02:48 chutzpah Exp $
+
+*salt-0.15.1 (11 May 2013)
+
+  11 May 2013; Patrick McLean <chutz@gentoo.org> +salt-0.15.1.ebuild:
+  Version bump.
 
   04 May 2013; Patrick McLean <chutzpah@gentoo.org> salt-9999.ebuild:
   Migrate config file fix over to 9999 ebuild
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index bc714d9031df..b90c411cac79 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -10,25 +10,27 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-1 390 SHA256 c9f76eadde7ab72728810dcefcf482f7e06afa398080b9866dd3424b924ac92e SHA512 b91a423031555a810c343f49eafc1e95b3a48f1491c42b5979240f73998b6c4cde679a886234020de7136df83b3da7f92590f9dee345f694678f4b386e5defb2 WHIRLPOOL 1d5feb3915a4986a66dce3ef84fd235cbcfdbd5611e5edb51005d97de81dfd1ad2998e252c0b48276983037c8faf39f40d3880a87c55fb9f42f62c7822c9cd61
 DIST salt-0.14.1.tar.gz 3366334 SHA256 615fb644da111c8e7c500ac23cd258edec24d7db7bd4f5a40a465b56e54e0fd1 SHA512 7c8624274e4247ad8d4153c1ed4185504daac1557e2dc0bde1ac49d6090130467bf478408a962f745d5ff80a9e6453e0c40fc26bc3161c26a087bd7a67f223e4 WHIRLPOOL 692b5ee28c5cfafc02dbdf9028b60fe3f3d1431b952ac9ba1998f43f0df2beb137c421aafc20e5f99d753ba987b6e065559b2b9d265d3924c5e614ea3b878454
 DIST salt-0.15.0.tar.gz 3411308 SHA256 7d7d8c372571e0d3f36eea8e04a692ac566197030dffeb145e5b7282e56bd3d5 SHA512 08805f10e0101090f8fa67c9dfa3190ed81ff5754f29235e0b8aae45ba55233c0a80559d5975bf0a16880820b349dbe6e2136b3469690b7b691fd153aaa26b29 WHIRLPOOL a2c7037d703546efe3f39b8b293152180d63634a4a190e4c1de3d5f7f9d3ece804b59827567c2f423240fd953b774d5772f152b98a640384e2c4deb0c05b3034
+DIST salt-0.15.1.tar.gz 5752766 SHA256 2bd3bdb38bb7aefebdfaddfef70ebce29e7fa2dc9806e87115a9c6f0915b4f95 SHA512 187361a141c202faaeb6588973760b4a785e1ad91d699b75d50aedc0987f9129982d12c26ab88520b9712113319f6a56db010f60dfeda4349e3808f94f9b24a1 WHIRLPOOL c420082785335a002cd47b7a358b62c7bee3519993df129f98137e7f766c2c3fb81808b0cc32154f97061af584cc7f54314061244801fc59eddbac7993673352
 EBUILD salt-0.14.1.ebuild 1570 SHA256 0ef297802e0a47168927f371f748c38dfa5ced49698516c93efa87bd1883d6c1 SHA512 666f6d1fe4c30341608165a71856c027eb891768902a21ce328652a1ab6bf0c725296578f736554b3aeee75994c25148ee8439e9e0d46c9304f12baef076f59e WHIRLPOOL 6aba94b362dab0909de1f0da47bb521d3c0a67997e44ce4b50186e34c647a3011df5e87a6e86d4aafcd0452481d3210157424f04ac9f3fbc0aa159a589e4144d
 EBUILD salt-0.15.0-r1.ebuild 1922 SHA256 319e70db750b8cb9b0de4e2a3b18bee5f1d5d0bc35806ad94f4af7a211980ebd SHA512 1dd6bac88ed42add39c9bfd20c24aa2396c8ac6b76cd0270441152e1b402e2ae23c102984b5812bf82dbaaa497b02bbc6d23f2556c44393737bd30b7e52f12ec WHIRLPOOL bc9cd50e570dc477f443bab64aae11b8625fe91a65028134f15c91cd388b739c917ce3b8215e6bc316d542a0f93573872bba3c4b4a223da5d4f8343c6cfd6da2
+EBUILD salt-0.15.1.ebuild 1919 SHA256 25a9b350bd0d5d31123c768938fdbe4bb3022251a89e8f7f69e06a9a7e09eb62 SHA512 09d6f4d06a0fac91e37d031fd343e7dfe1a7cd66a8a834dcc06891d72ee247edb70719d72b0e1dc23356b0b4d47192e1f5fb4a0e6bc75b98e45dc749f3f757ac WHIRLPOOL c38db53c55c253a3e325093a08729c5a0e06f6b8dfe1643f9e01ac42318cbbcb1926af78cbf07bd9f537c495f9ff11c3aafbe980d64490941a73b73b1b7246cd
 EBUILD salt-9999.ebuild 1917 SHA256 2dad2d0ac5b758f8e60c58d7d25e9a52067aa70b59879abbc13c12a9dc66ce2e SHA512 239e63ecf56ab045767f606370afe5ad770c299b90bae29179a1809c3ecbd6fd8ca7685a09b61f1436edaaf3e662e445d2709421d526d2f3bdf5d884ab223ba1 WHIRLPOOL a5114dbe6e804d7551984a83ef3bbbfc38ac59ba997e179412a6cefdb98bf4f17789278d1f418112a5838ad510ac59d88db9128e54f21e0729630b43c0a6a4c6
-MISC ChangeLog 2624 SHA256 1d744cc8191d101c349dcd86dc481d8341ac6368623a10d7fba4291b57198ecb SHA512 4a0d118af2096e93c601bd17dd81d6612600d79e3b9a9c985e6537da5167764ac2bde012c883567849aab4cba8715de534539a77bdf54503ce1b6897956e127c WHIRLPOOL cbc8b5369863ca265879e9e0e6f39798f7707f866d40d8eb3d6447e93821b9113dbd9365d31902b1568385506e1c066202087240a0638bd3da87a5bbb4f1b3d5
+MISC ChangeLog 2739 SHA256 518e0936039dab872af6f94962fef2f239cf4f00a374647cf11703550827ae7e SHA512 c0ead147f48cabf30b354cdddd14bb18ff67428c84db9c43f44bea647b39b8146dd7723b6daae4972d01d7901629b18527cde93dc21cc46a5316df828d78c516 WHIRLPOOL f68285f0df67c62c450ab5e9a1c755e19ed335417b7576450a8b7dbc2b7087cc40b94273fd02092dc3edfa2caa96bc0f0ab6120307a4a00cd0eb8424e7ff5ba4
 MISC metadata.xml 1349 SHA256 c381390f62360f243ee210d099ddfddfc81632186db11964416e5faeb5ef0256 SHA512 dc7da5bb40585036807c1158bd50bdb72f51e4d4255fa1f6b07c2d91fb39cfeda50d288c3367b3e23ee8adfeaddb05840f276639ed045ff5696f4a5c2d5375b3 WHIRLPOOL f137a52155ad3d3f2a5deb5ba66ea7a986d77c1ea271072e63bba5070619e87ba0838412d466abb6fdac705d45bc5fc06ce1950a78d95a8bf5b8932f8c8504fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRhZWoAAoJEHy/RO9cNQiDRl4P+wYj1QIxV5KPBm6VzXjXz//0
-Tt+LRoNLMNJoTYLKgXDIYOvPBzCYJYwJto/FrlU9xJkn//n3wzEEE3en7thqrv9v
-x6av5ElBQN6reBVEN/Uz6UO3r9SLnbbfEoq+zdKvnLJ0XUYxO+VTrzmGDPrdPZCK
-2lVb2XkAMDy0JQcQLnWesKhtZ85bTK+vgihUSy0ilXNhKA0IjzB+XRfH6KYfOOuK
-kVEdD8hYrs1JNFoqP9I74TwnY4Y7GZncZYsSeFyRLGU5FUFCg7N8TPqArDn2Mc5W
-hlZ54JEDGhL6C6EBl5kSWIhx7yHohprWBepVw9yc4Y2mfJ+URhoMW8xifd/oBwgh
-NZ1dJ+50sJGhcKaPWH2A3VMqzYSFfZ/wO3UcXpo2f4fsBQ9v5zvhSdM40o5SeHSE
-Unf0V2c8U/q9inqjkFC2Lp96shyHf8jEOiwP9SSlVwf6aNx3weNprVpcSw+fYxYB
-g6OB6Nem5yH/lkLBPNdAn+z70IspE4FXpTrdw0GQ1CoCSmsTpy2vPgnYXjNBcGkJ
-uSm6LloDz1xW0rRtNYXs/ibwfXwuHc69BTlQZWlahva5kVUXBw4DtzLwRGxl1qK8
-wtGLys0PkC/Yr/LoO+gar7ODafcHfYvzpRO/pPfZUVrTGUwp5DCVJxEOl3vlTOQR
-d40EmnL+U1mgRpZDAh+F
-=BzHS
+iQIcBAEBCAAGBQJRjZi5AAoJEHy/RO9cNQiDHLoP/1HZZ0+NPlzgja5duopG6WCp
+m5gnfEGAsUiL8CpMfYTE9eUFeQlGGJlytCvZj/TUQJjLOSDzc0ok4N34aXFWrPB8
+EQw9kvSrSBLmph+00EjFBxWMF4L8lcGhyk1Z3cifEUnFXcKtpcxsjyFdb3fN06te
+b+jF0W961iqVTR+YSyDSMHd+qrAex92xQgc12OxRoDrYgwY71xkJtQwIXwYd4h73
+yb8l+hpbUudgWd6WMXCTpCqufiq6MyJRAtgpBz6ayTpkgOP2caxyq89OoLU8ALwt
+7vJT82YVBsVQ443QDN0p6fi172LhLH4L9SCDiisd3lD4xSJ2rChzxbJ+JH7IuLmN
+k+Xi3F4U07jf65bgT10tZLcnTo/ZLoUTMWdgxxQzmfu0a+ONbL4HAq+oE5T6ATTr
+pPlxdbKDz4/4Fag08TNg1PbFD+hyFI+qI44OiZChsPfGJH1iG6E5FkvgriP4LBXA
+ND7EqV2ih1RV0pEmomwLflu0Q9WPlcWaqCgyhkJL0/F9ZTINvpY06zInylVtRb4z
+eYp1Q9m+kZ9oDwwheJD8LndRg+rXhobqhl/LHbiGnkXRAOTgLFJZFfZ34gEOOgmL
+CJd+6ZKI54raUFSKozUw9+8nvIp6e2CMbanrzluNWdiHk5oYaXWzEvcAm6bjQ968
+LCoj++0UuuFdMiq1o0ok
+=oKxO
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-0.15.1.ebuild b/app-admin/salt/salt-0.15.1.ebuild
new file mode 100644
index 000000000000..6287ef115a1b
--- /dev/null
+++ b/app-admin/salt/salt-0.15.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.15.1.ebuild,v 1.1 2013/05/11 01:02:48 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit eutils distutils-r1
+
+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 libvirt mako mongodb mysql openssl redis test"
+
+RDEPEND=">=dev-python/pyzmq-2.1.9[${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}]
+		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+		libvirt? ( app-emulation/libvirt[python] )
+		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+			dev-python/virtualenv
+			${RDEPEND}
+		)"
+
+python_prepare() {
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+}
+
+python_install_all() {
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+	done
+
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc README.rst AUTHORS
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+}