Version bump.

Package-Manager: portage-2.1.11.48/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

3 files changed, 88 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 2e83c398becb..d929a3ae6a03 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.7 2013/01/16 21:57:44 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.8 2013/01/22 21:51:46 chutzpah Exp $
+
+*salt-0.12.1 (22 Jan 2013)
+
+  22 Jan 2013; Patrick McLean <chutzpah@gentoo.org> +salt-0.12.1.ebuild:
+  Version bump.
 
 *salt-0.12.0 (16 Jan 2013)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index a65bc1e64938..1d09f289de05 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.11.0.tar.gz 846339 SHA256 d5ecc48ff6c9a81686db59921e1b24e1c876f889214e7865f95d646ab572a3de SHA512 53c8ef06b2387b5cceb661c2b4805f6cfe84e888668169eec035f1d9edbe8587d2ff9b079e2545ae3d01ffdcf35243ca27fdebef926c830a54c5ca5567f640a4 WHIRLPOOL 5363855ac0921e0316c5435f379cc4fa0e7414e479dd7e550e44e472a61e47d9edd9100556633b6ffea13d857e46210f6cfee6c6b6c89f545b33be8a982167a7
 DIST salt-0.12.0.tar.gz 943176 SHA256 854ab304c111f114b3a3c0089423cd2e022afdef43d4cd74b5b1a0016c3f64c5 SHA512 86f910e1d2b6f4fabb277de9b72a03ccaa7415915b313d38a3e0c493f982c9bf711a35409518759aab61122becf47f3a78833f83788f499aca587c5335d3191a WHIRLPOOL fd81d26f6e83997e9e1e0cab601b7b4474b11865a173ed31a1ee3d8fedd789b920c68251031f24e7988f0d8e7053e429e066a9930964b3ae696b0ef2ea75b682
+DIST salt-0.12.1.tar.gz 940994 SHA256 54ef4c4ce4c002a94e3f5f530f3115d09a1e8f28a3a11c18db5c7f70d5eeba23 SHA512 3b77472d131641df2ad228c424b3f445ecf6e5f91f44f5f928a1e375ad1a97811856bef4f181e14ccd4ff70a4e3f37175b260969317d471bf6853549aa21fb97 WHIRLPOOL 24d6dac1af88f9e9577fc0088557a65f1a49801042d115849e921098ce9163dd9c02becc41371039ad60e4631d19253e3051603b1c9b05f604c1d0fa917dfef4
 EBUILD salt-0.11.0.ebuild 1558 SHA256 f6abb5b0d49ad0444e1b9957b8d9c552b0559fbed26c82960a21f80136fd102f SHA512 0a17520df6365a62b9469e75d40f342d328190d086cce89b6a00f1d1ef7a0bf363ed74efc1844e1f2364c869109192873d5778703abe74910478e0fea2f228b1 WHIRLPOOL 22316e219fd828ad9c2632b10fb3f6cb9fb6a8a743381fca86c2b30fefb79f261d7d4783e6d49f1bc0f2929239e41afacfc530aba9ecbc229c3044b3976e4c48
 EBUILD salt-0.12.0.ebuild 1558 SHA256 83b3b335c4097e10ba1db178d45d361e911854b072dc52920ab55f2aab4b83c0 SHA512 39da70722803fb11d40e32b8bb81ab05653c823818a90c9b85da9754ea3622cb1fa4a86e2e8b4bf3b421940be829dbfce51feac69960d7c4d826a15011d58f1f WHIRLPOOL e1a2c0dba40157b060876bec4aa49b9e00915635624043f946a05e54452c754db2d96615771cce5944396e035b438f30cef673a2be4063382bedf81a68ecf831
+EBUILD salt-0.12.1.ebuild 1558 SHA256 d3bf76255da0d92a11da6fd3fda8e076e8387c1ce7756e4a4ca0ec89bce14055 SHA512 9e8997d374c8c7da78b9cc00e0835d4cc8f55a89d01aa374062ca760b25442a3c09d0aad69baf06298aacd4b4691ca0c7b1cfabcea26362a3e1d738eb26e2974 WHIRLPOOL 679e77ed1f337309868132f015b3fc9dcdcfc5143462066c3104b1f2b531d508c3dd11a47db2ab937458a47e2d7665fe07f487633fbeda00a1e5eb84b1920198
 EBUILD salt-9999.ebuild 1556 SHA256 11a888307545204fe280002463b102eecdbd14116c082f23c81876a811636612 SHA512 05e26f9b2da33442b6d4ca30fa47328f531cd60dbb2e642d0b323502c975cce6d8e05abb31710ace44c275a6727147d7f8d74efe46ef912af7c475e3b1aa4bd2 WHIRLPOOL ee934c7b9cb790c6322e24abd7a58d6fb9555bc45c5fb84eceabf4d222723098ffc2784f9dd042b11d61700e26dd953739b150b9ed328566a91ab8a2fe6e20c8
-MISC ChangeLog 1263 SHA256 d0e9733f67938431aabd6becd90e5993dba9a99075f0652a32c5091355247fac SHA512 350f3d85ef7b18118962ef1a15d8ebfcbd1facf09ee86d55e0c2f89f4e18141a5544e119dcc17da68112a985990fa4015097d0adb2e7a79f12ee4320ea4bf437 WHIRLPOOL 11886886c1e9a7e342d36caf96aa97f84b0bfe9af8fb5469edc5e9ccd13c25ce96a79aaba54c1a002e6ddba7972a268082f0232d4223aff6b931d94124f32400
+MISC ChangeLog 1381 SHA256 141628b6512f7548671467b46a7ef87a497c1b65237ead303a8a11e7a2e5396a SHA512 215b2ecf960aac8bb5e4088db7e6e1dfe16d55d4c9e669359c4439b839d5069ee650e7cba636793fdf7c14ff90eddb4a80619ee1b7931fa2f321ff24366029be WHIRLPOOL b8890e7b880d21c162437ce4fec57fc6d95f54ea440e7a3934740a1bce1dababfc3a80c8ce678e3c7e1968534b4abbd7dea64238b5f14e0f0a8a9b391e0ad349
 MISC metadata.xml 1250 SHA256 2218df87e9ce629ea3aec7f850b7e974b7433cc8bd6ff84be95afb3e79506902 SHA512 34b8afa6d5d85283deb8a6889b90a1b242ef6748596916951a8b917046cd6399141463a4caad747bdef3f5fadaead98a1c1e30979618ce6bbe0ad93c586ffb05 WHIRLPOOL aa1a26ad762d2dfa61ab104d6f91cd6706b7ac4a82f8bd448269a08af6bf0073507c72e84c9ffcb7c18d409d13f45b21ad6bdf95835ba83205337fdcc2d6e7c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9yJZAAoJEHy/RO9cNQiDklwP/ibhCtosMgmayC00S8Z9drxx
-oOtdG14JkPmPQ9QVHLPXPrEZQ7H35ByJiORcgFSRMJxzd24QTWA58iVaJfWFinT8
-56hZTyZqeCjm6SYMDzR8y19Vjb0isBldp8X58FRmgyAMMi7qiqbNbqQmsZElrvCA
-I/N/+85ZlPOkga6Z7whZD36jDH3glCtugwDQPAnmU6fPCTi8o69WYMA+bg/jki4r
-+Vj9l52xzXl1AR7LnbtlLOBpQDl3tCqHBU9XDXzmCKeZMa483Ind/CLyQOuELXXL
-IoziRW2no0MFfLk6HJEXAkuHBMmZUNfgt/bPuPLS252FWQNxEbHjt+ibA2AOqfZu
-YnF+XQ2HXOTnsLS8d9IGVahwvDZHCRBzgasUEtKeCgmqX3GckCQVJ8rIuG87SUsd
-TzzkrW+VaOdft6SZBVVLw9SdmQyIW8eoiBk5yLZzmhjEv7yZ1YW+Z8xJrSEpMj4s
-qJajyCkO2gAYxoOJUw4eTPQztaLmezyjqBx0EZxox8ugKEI70j5eQwXo9XzTnl01
-T3hXUcAnsTanuOIpCeOg2ABL9S0XNxVCgEc9zP/p2C4TwzbplCPNgWwptdQ2B4q4
-Y+/g7Uj4ywCjvJQUv3uI+CE9jHJps8mWnbgvx7TSISTr55UuszXbF3GH52Q27J06
-CwKuruk7BXP40+qxVf6u
-=we68
+iQIcBAEBCAAGBQJQ/wnzAAoJEHy/RO9cNQiDE+cP/230pSBWYhVpf1aJBfMrYh3P
+QIjh4b+bVW7aiPlDFFTa2c7zaXDN3S0OwnVaB7zAq+vC29sV48hp+Zg+3MOtWbaB
+wF/QKqrTxHGqYCDgvTuIJDH6J9kangRek5bC3BTp6K5pq8Fzkpq/pIA4mLnMbtCO
+yad71hVYGJFM1SY+ri1fDDCCMp8mvCoqlu8sSGm42VlXdebC37+PImO7F9D9TkWJ
+uNu+aucZsQ+f1/Kkb9VbhxVVQWF3fwkDYzir9yWuRAZ/IT3L2NaMov+hOmN+p+/W
+eSoutbk124Y7DfZ8d7QrquJIyXaP6XMESQFQZQ2mREMdymY9n4E9uuOuirknU4r9
+jp094XYTXl2TM4Gh/mUbkVSjGD6/voBHFWCxxcm+Tm3TMa04Ar1PMpEknpQW+HXm
+Qw/0oAuCBXAzM5CYF9erkmijPtqEfeahkHH0bigqXHSecHJHMnfjrkbLRvrG/86h
+adcKBEKGtNo2UHJS0u9OjythFegG2Iq+F65NtdyfsK3KleqBJjxQZbF8uKbtmscm
+iu+X4x2XUrZbhhggkste9rxSZpPYAHe21fQmAbmvyqPTLimLDMV/Jf8RwLcM5XsR
+Sy0K6R/TD5ntxMx+4Cjw6hkxaw5AFM6TRB0vfTHKWwX1BlXNgRTxax+azCv/T+tg
+GgKvnmX6lLZCYkPaSG0Q
+=2EDl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-0.12.1.ebuild b/app-admin/salt/salt-0.12.1.ebuild
new file mode 100644
index 000000000000..a8157a96ea00
--- /dev/null
+++ b/app-admin/salt/salt-0.12.1.ebuild
@@ -0,0 +1,66 @@
+# 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.12.1.ebuild,v 1.1 2013/01/22 21:51:46 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 mongodb mysql openssl redis test"
+
+RDEPEND=">=dev-python/pyzmq-2.1.9
+		dev-python/msgpack
+		dev-python/pyyaml
+		dev-python/m2crypto
+		dev-python/pycrypto
+		dev-python/pycryptopp
+		dev-python/jinja
+		ldap? ( dev-python/python-ldap )
+		openssl? ( dev-python/pyopenssl )
+		libvirt? ( app-emulation/libvirt[python] )
+		mongodb? ( dev-python/pymongo )
+		mysql? ( dev-python/mysql-python )
+		redis? ( dev-python/redis-py )"
+DEPEND="test? (
+			dev-python/virtualenv
+			${RDEPEND}
+		)"
+
+src_prepare() {
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+	done
+
+	dodoc README.rst AUTHORS
+}
+
+python_test() {
+	SHELL="/bin/bash" ./tests/runtests.py --unit-tests --no-report || die
+}