Version bump.

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

3 files changed, 101 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index e4a61fb8ab0b..62c481ab135b 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.28 2013/12/09 23:19:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.29 2013/12/12 23:26:17 chutzpah Exp $
+
+*salt-0.17.4 (12 Dec 2013)
+
+  12 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +salt-0.17.4.ebuild:
+  Version bump.
 
   09 Dec 2013; Patrick McLean <chutzpah@gentoo.org> -salt-0.16.0.ebuild,
   -salt-0.16.2.ebuild, -salt-0.16.3.ebuild, salt-0.16.4.ebuild:
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index d74be1653d23..c21852763f53 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.16.4.tar.gz 3542126 SHA256 aa880a7008995be88e417e3639ff9326c3df73650fe3155a7dec43a3b1cb498d SHA512 d4aa7d9395f164a7a9efe76ddebd2aa72d695cfb33fa2c3e9efd6f1a1288f6aaa910d635835a4f22e47cb9c126bfc24c30ef0e9054fdb42cbbc4299ded17f0ef WHIRLPOOL 73ded2adde59f4aa1d982e6f59b31ad91f9a41d4fa2913fdd046ab0157fa9e936852724e5529a173db339a4b11a80b1ed64b35b5c252a72ed23fedf6cee4eecf
 DIST salt-0.17.2.tar.gz 1866629 SHA256 f1339c02c40b8aa9c55db66bd5780037aa7f6eb4d592fa9e1353e74d1ab167b2 SHA512 fd31b458f09140e2c735e1eedfc47a560dc235e0507dd2f6553328444e1622deca62689e344fdf7f3f5f243534f5feafc1d768944b0d2d8c006ad360297d2d98 WHIRLPOOL 4aa1562e1f579e79b6d8c1beb0059bdac53add7b9ee16a97d2fcfe599844601909932ec341ee11c4f9ef3f449217556e61f84ba9646b7718bc5d90324fbf39fc
+DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
 EBUILD salt-0.16.4.ebuild 2041 SHA256 63470d69ab4e751537ec0637b7a2f87278f03b3476a616bccdaa62eaf3d98f7b SHA512 d42632bc25e96bfb6b3bc9491cdc8188537362ec8828f64d1ca9671263bd05ab2a5a856608be8fc9c6972e8e969a9e8c57f9c7836a1b53cb067da394f623c7cd WHIRLPOOL 2bb1ab120dba94d2ce5b6874fa123789b5eedf55731ca916313db3d6531be45b3b54e6a4f23c6ac8eb5464cf0d2b3f1a5fd7b063f6de6f1f343362172f1d827c
 EBUILD salt-0.17.2.ebuild 2151 SHA256 6c62a7aea235dc1dff7f585977e229dae6bbbe4252d24418bac748321f115d7f SHA512 3e3b59fe36f32b8d544911880f6ef0a376680172e9bc50be152045c9da05658e5dbba551b7702b31c1039b7a0e3c8b46bbb4d696d89c763c3bd7b1a9b7493cf4 WHIRLPOOL c6ceaab08a93a9814fe672e25813022ecfb1d49bf0b644424922d445a069d587fc59e2e8179158cbd1395d58258e8a2c44f0c4d1d0b35b02b7bbd5d8ae18a487
+EBUILD salt-0.17.4.ebuild 2153 SHA256 b633d068252cad2de01f6cb65f0848ec9ad9136b471644bd646b72b575151783 SHA512 e7869d3dd220802c014026ae040b52fbac1d401578e30feea6c9268e6375130496df3945c32f90934ac283b1747d74ed254baf12d44ef2e1260b04dc289914de WHIRLPOOL f4321393fad0c1ebb4bfbf2f05697dbbd6662fcc191ccee2b011e15139a10e92bc817de8281e910d7b77670297fb49628cfd5aea9225314155515b41e020ff3c
 EBUILD salt-9999.ebuild 2048 SHA256 7172ea7d2e846578b7e44447c3fb88b59f8ff2dc20990c5d5a4153053cb8b70d SHA512 052f1bd15d17b62ef4b1fa7e8a679426261ff06b2240dd588f25f6d21f8d55c5af1c47bb26175640866c8f49724627207f2e6df213f247059656ecb9eef032bf WHIRLPOOL 7100976954db139e33632c543ae7640c25106bbeb9f056b68deaf1101dff00caac61224d63b23fffb20c84fba42ce5aaddede168f1b689e80b82bdcfe9b55b90
-MISC ChangeLog 4770 SHA256 cc4a664c44f3ebdb6948f7710ede2e78137b38aa79abd32191b8a66a6ef3e1f2 SHA512 4514c6d5d2ca7327447cfb7ea4987af5a26cbc7d013b7945c43f6692e33d5b60e2cbc335c7d20646eba3a5d8a402a680b8acf4f0f2e065c0268fac2eca5f5eda WHIRLPOOL 11d091982784e788728e8b6f4dc7d055dd68a9faa259b7772644fe3065371592de9a7c3f8f8653026e179e484e99f24527521c34feacaf36be73150691e8f9d9
+MISC ChangeLog 4888 SHA256 da2f83f786184504b682ff9f9530572f4f062b6149e07ad5fac66a520fcb036d SHA512 818dd6fe7d52f166c2f168f2293239083076dc63393bdb661ce91c54ec221f258698766de1dc58879a1d4bd7e1208aaa195ad2fc3f71dbaee5c8088cd1244af0 WHIRLPOOL c611d0dd2928369403215daec3d7c3621587a1364bc5abe0ac59fd9c12833dbc7805d3916cf3d49db0dbab97bfe9b5ffeb163cea8ccb4943b46b8ea537995afb
 MISC metadata.xml 1349 SHA256 c381390f62360f243ee210d099ddfddfc81632186db11964416e5faeb5ef0256 SHA512 dc7da5bb40585036807c1158bd50bdb72f51e4d4255fa1f6b07c2d91fb39cfeda50d288c3367b3e23ee8adfeaddb05840f276639ed045ff5696f4a5c2d5375b3 WHIRLPOOL f137a52155ad3d3f2a5deb5ba66ea7a986d77c1ea271072e63bba5070619e87ba0838412d466abb6fdac705d45bc5fc06ce1950a78d95a8bf5b8932f8c8504fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSplAGAAoJEHy/RO9cNQiDYcUP/jF3w5vXixKFyq4tncFXIuAA
-san+R45DdSKH/jKvavPG9LB/Xc8nxNVhSTPeT3CNmmTEp4Tcov8JQKU7mQ6h7PTI
-Z6raT1he2hLf1Jy4XNkcgdm/RwdubUhP8S7g9JHyar+K4s6o3CeKznYUmQnKU4Xh
-UxrvJ8TOlJ4tBEph/cpo/2igwXWStJvrZw1Y88eZThDUFCIV7I1rBYkz33l16Pvw
-R/TTpYXzMIsdSQ6wsqzUiAfdVVsTuZNNh5bMYZsjsxQ3z083XKVSRoteXSq98HC3
-p0+QqgyHc4qGrPPrZRIgrM2TdOzvCTEOq5O6rDInVBO/R1IEbGnjHKj1eWuEeL01
-ru5cTXjVvv2twjolaufaHkUghnCVTWDsyGLd7Qb3dU65toz7G+ZgGENsygf+W09A
-QEKPu7aeasTG5RVy6uYsy6ISd42MPHWUGLA9YtmtmFKfqrqiN24k3Nq3+pSNHier
-88Ys2dyghtZb6nPUElgeBdrp2T1b7fggqqBBQmTsynYfo4OUByM/AAQfFoAtesBT
-Wbknca0I4WZsAVoYDzqJtGT7JScqgqyQPCneBM0j4VYgzKazuqMFh0qcTRg6jZTb
-WeEyzw7KL8WduDwtLnuIjJ1tHLi4QUbvzzNbhTeK7Jq8/K0U119ZblmdcSaHDbHb
-rwJzM5NjKlv+b9dW+crg
-=+8/+
+iQIcBAEBCAAGBQJSqkYaAAoJEHy/RO9cNQiDmP8QAJ8rZrXi/mtXdDTtU2GyLmLq
+ooXPb/g3o8JstOyL8U1TP1lA0giI36bpooUvSPhIVL8XInez3YabkUxOr+0w63o1
+ZS5+4SxsUlajw67D+/Y8lE6Zh7Rh3d2hyOfke74gJze4f/X0yB8ZKcayDfjDuuRC
+gVsgKw8H0Oshsm2qk+jilqWABUdB77J2pE84rM2DVbHi8aVpsZBzrfFDljUKylZf
+Rawr+5wUvCMf+OL0DebFW17oU7pfRoAPH95vgZ9Lt9NdqgV6eu5iCQiG6TcXaoaU
+17UudfvUxr92XpiykBG/hbx5WqAG1/Sk6+l5X8emHZwnpD43Q42VuJO8GH7TpOmR
+S47BL9W0AN+KktQKqozJcP/GrWCYgofdVi6xxzm5rFhjEZ7UevWs95AkdR6y+xES
+e3CoK0fFaKlivHJxX5pY0AwFzmULCTNQ7zrx/xLdK80VpZnRq7Jt1MOin6PUZlQJ
+LDgIuH4debLwL/y4vemboboxxpZQPS7YlkyvG+ykpYPBLpkFMwSCdWCpV6SBkxkF
+11EScYFgypbPtM4nPPUEnuxgfSAAm0jWYxPtNb4vCp9YiTTX98g8bGGvGXVVLW1h
+jq49nuYM8BJvNq1T47bQrF3kQ1qobYW3agyu+D3jUqNJXwb+XGrwm+9u+TPndqOo
+2EB2q+urb8YUQ9HPmItT
+=KbnI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-0.17.4.ebuild b/app-admin/salt/salt-0.17.4.ebuild
new file mode 100644
index 000000000000..36f4854fee5e
--- /dev/null
+++ b/app-admin/salt/salt-0.17.4.ebuild
@@ -0,0 +1,79 @@
+# 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.17.4.ebuild,v 1.1 2013/12/12 23:26:17 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}]
+		sys-apps/pciutils
+		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+		libvirt? ( || (
+			dev-python/libvirt-python[${PYTHON_USEDEP}]
+			app-emulation/libvirt[python,${PYTHON_USEDEP}]
+			)
+		)
+		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+			dev-python/pip
+			dev-python/virtualenv
+			dev-python/SaltTesting
+			${RDEPEND}
+		)"
+
+PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
+DOCS=(README.rst AUTHORS)
+
+python_prepare() {
+	sed -i '/install_requires=/ d' setup.py || die "sed failed"
+}
+
+python_install_all() {
+	distutils-r1_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/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
+}