Version bump.

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

3 files changed, 107 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index d2fde6d5291b..8feb2604ecf0 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.33 2014/03/04 19:22:43 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.34 2014/03/19 22:36:52 chutzpah Exp $
+
+*salt-2014.1.1 (19 Mar 2014)
+
+  19 Mar 2014; Patrick McLean <chutzpah@gentoo.org> +salt-2014.1.1.ebuild:
+  Version bump.
 
   04 Mar 2014; Patrick McLean <chutzpah@gentoo.org> salt-2014.1.0.ebuild,
   metadata.xml:
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index a73a061a1733..cc937860e41c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -16,25 +16,27 @@ AUX syndic-initd-2 405 SHA256 9deb3f395a9d47558bcdb709d4f1f68f7ab72286fc0933e172
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
 DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
 DIST salt-2014.1.0.tar.gz 2787665 SHA256 168dd154a9243b1c853700e61f56e7d6ab5cbc9862fb215ab991e05f46b2a406 SHA512 99db0a79b32adb205c7de73f3810383816e1b6051ff200c1032f17167e962bae742d0ebc916bd314361c09aff24312eb8b05a295ebdde1d6c169da22b3b523a3 WHIRLPOOL 753e2844939ccf9d781d4952f2b97a9ce41cd415c2adaae27b1a085297e4b8f06025bd9b8841b02b40744974a253df824db69ad9c4cf398908bbe9cdf9d95128
+DIST salt-2014.1.1.tar.gz 2811441 SHA256 bbe145c6e11db3697f2f13bca9cc341a4d6b459751e56142d34eec5a4187b743 SHA512 81e9b9d076e63bcf12387f6ccc33ec980f2749779ea443003aa504ab4909e5db968f816198271d2afa849dbf6c61f73a56c6d31ce65a2b49734215ae53260484 WHIRLPOOL dfd8886234a448e4a1bb97827075a48ed3bd647876c52108ee2f201af3406813ac6557a7ecdd00696405972be4d520ad482c8ffc3b21c55871c849670cb2859b
 EBUILD salt-0.17.4-r2.ebuild 2214 SHA256 99ac240c300950df1617983b0094e4f47361659d25a5d55a7afc01620c4de489 SHA512 e8c473134a71308b41293849f06d0378b72f7bb1f1479927b9bbd8bdcb4c4868d55ccda5e53f7bbdcb6068b14b089de8a80061b851d86307dd819240711c0edc WHIRLPOOL 5ca3224a701065b9bacd6dcfb4fd807e4d1fd8009a090724e60c7117d9e12025074616aca8b966742d60fb424402aed9ed40a93f78f00b9975bb1e538a36f6de
 EBUILD salt-2014.1.0.ebuild 2503 SHA256 e893224cdae97f33d30eea043abafc0c6da8e702284ce3cf7c06b6991b0d40c9 SHA512 85058c56776f754b4189221cefb13535b8f8d0b4590c30fdd2efbd29fbce8fedededd5493dab4bc597f0c8a768a4f4c0e5c769c99c139eccf9a40fbf89a65781 WHIRLPOOL 51cfd66f4964b6e416f5243e021cb6f8c1d0197d464484d0de3409f8be5ec8d0ffb96d20114e9760aed2548413868ed3c19a064ccdbbd329b59a5a9b500dee93
+EBUILD salt-2014.1.1.ebuild 2503 SHA256 822c7f4e89cd5e896fc6bdfddc81725723cdd363adf94dd2cc684a635630ada6 SHA512 535d9bd715401ea656b178dec24b664fff4b3029de709ce17c648cd36f8983d83ed1f08a50d6ad60886ad9f073ddf81757a981642024f0d2d4532d01f2e36d43 WHIRLPOOL 13996d3a3174a48501fb20f1a5a46242b6deb3eb29968f309ce1e059023bc716bd5f2048d1837f3ddea3486683bdeeb06474107e0a543ab51994d949f3f03aa0
 EBUILD salt-9999.ebuild 2361 SHA256 f4cb233adde0ae7b6ddbb0313fb6cb506a9e745ad6867793ca524c97309fed5b SHA512 12ae0148b97c8e9fdaec4f0507ceb16fd378760e5b03bdfdbabbfe866873b561b26f33e79c99bc19873fe095dfb21acfc1866fc4f22876e195dec7b562d19672 WHIRLPOOL 4111067ceddd0aa68b86e77043869838a948a17d9ccfef7bded2cc227d30864bf47bf61039941f2b599d370a8cf649b2ee6870f19e7f92e7baf452358ba58416
-MISC ChangeLog 5999 SHA256 ad063a23ba5c8a825808ffb1ee57364068b18fdd6a4ee705d7fc61e5bb6b3a75 SHA512 72a457c90341dbcdb9bc3d6d336a0c7380c3d25cadfb1463b68ba5060e4737b63c125d0faf67310cfa517cf0263734e7bd1a5675785c5e10a68e08d76b766c02 WHIRLPOOL 2cd4df42da1f62d06c30fd2c48fe719c71eb022028d119578f24cf2f7e495443147887fa321518c4aa0f962f38d746b2232bdc2fdcaead309bfcd133e2f677f0
+MISC ChangeLog 6121 SHA256 0a398e13549dc6f056d8860b470441da88072e11105aabd1e08c2c7ffdc7bf97 SHA512 dc53300aa923a353b89f69c216ac9bf462570ead1263e3ceafbfff91d30090448197f204dea139855b538be4d1178736e2f22f8e76798b739ecc20f0dd63c03a WHIRLPOOL 9f08ce8d2e2c285a03fcfdc43110e07966ac9c7b993e3eeb20dc0d7c1142d91565fee47264531f189329c7f67b34261f83c295fbe5146dcf444aeb98dd3fce6f
 MISC metadata.xml 1506 SHA256 ae73efc765e4fcb1806a7f8da5e27e00fd3c42b90494ba9870304b9abd49df93 SHA512 00d2c68cd6edb7ae2b26c5b16dc182d136dd2969844a5dbedc1864b5af8783885fc597f20df427dbfa57cc1a59c1e43299c6aa7ecf7d1a5a9e512b2f61a1c8f4 WHIRLPOOL 29859710a53a6cba45848b8ea0cb283c268124c592d5b95e31b7956b3e95449f607a7675087f851933b661252a7599eda869b04116279ca00261fa2008cde929
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTFigEAAoJEHy/RO9cNQiDR6EQAIdv7CcZ2lhDWKiUbXKN4iMg
-a6cnfcIFx+fFy0+/Vf0c45TP+r/nZT+SoY8Ujq/Iks/yxHpRXWt1+2KkrjoJ9GqX
-uZ0isCd1DxUQUGmJvO476UzgBoA874NcgJs8mjgDtvfxoWH/jtGgS7PlBAU/Gz4/
-46MNOjLF0EXvRjmdZArLr7owo8I0fPtXIfskrKdjB2lfvMglT05dQfWIZbPKw7jW
-lO9+Ek6tNwpm/qUN66EYkYbVbAThm7L/qdKl+KslAgEMiBEo0lj5T2EL5tVYCh1d
-gp/U275fazAKi4E+7AkbSpoZ/mCV8f2m9uO2+01geCH2czY9oW0ce3FTL4ovfzdf
-ax/s0YbeCERCcyeMANoTWuCoU40X3Jfq2LHKTxC0qhxx4RAcRoNgJ6oHo7tqG5cu
-7taqHD93QI1F00m5VRg1gMQXfsi8mx3MZTmowVgivQgKROtEokOE/MJyuSyZlFt7
-rbOqW7Cgr1OBYSGC/AD5b9Q07sKcJLaCpi3mIIOW8/MNPFt4rswU305RX4LnHFSJ
-/iK1Q/uwy8XOWWYJvRO97cs3GApsM5rQFHNvmvJ9WzOTaFLM+/SvbKrDe2MruS3W
-FEhNU4Luh+CcxH6BGd135YI6xCCy4n9JxtLCep2qE5ZxkU+MTDPSTM2yc6/0yHY2
-cEFwlUkd7S8T/HzJhAcE
-=pDjO
+iQIcBAEBCAAGBQJTKhwFAAoJEHy/RO9cNQiDt84QAJmXRMDyJMrKdmJr+3K9cs8q
++1IIWxvRzhuUhjjkwttxmRY7Kic9eWJKw+UnLul94Y7KfgHph/gLliznSgZOIIpg
+5HYAcx9cQeHqj0CYaZ+uhFbA4o4OHQs3DnuHDKwKaS0eRfpbo34GdRjAZqhcQypZ
+RW5sm4+hhrWrzQdc8aC+uTHVqnhL+wBFWyP8YLZhTL7FZI21W4V5M02u0LnYwaer
+kmEI4YFo1Wi/DWiKerSH8aRLM0VtihmM6ar/LPSDimu51TCbUzr1Hh66RKM1JSY9
+7uw48Z/iBk/SWfFXz51+8Jko11niWuN0pLz6lrnq8WZlaH7DYiS4acbpk4QNg3Ob
+VVwni1CQJELauenwQEjQCewJhA9R6Z6qlGrVNfqGkE6DKDsH/sAgx2+8OasWd8hf
+xm3ZxZwy/7Rakl9dOyfUEkkBhTZM5vGn39C4SMuDuclNewG1ukd51rp39aWppXLV
+ZsTOaG2ZrKR1cpudMOOvGj8/1U51ktPKSReIKJMSvrwpdTjohQCKJPV6PhIydNrq
+nNqinYVsJrcMI/2H34ZeKADmoE0ZkL5TX6s0G/sdD/jamTiBds2YGFA2KKGcnXfo
+C9wcW5hDegNPe79tTeahUczYP1+fjDXIVdY3ztg5Cj4BY2+h83X4UTk718bg26d5
+Z/J6uFmFlAgCbvoekYkz
+=wrYY
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-2014.1.1.ebuild b/app-admin/salt/salt-2014.1.1.ebuild
new file mode 100644
index 000000000000..60c22e4b7283
--- /dev/null
+++ b/app-admin/salt/salt-2014.1.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.1.ebuild,v 1.1 2014/03/19 22:36:52 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7})
+
+inherit eutils distutils-r1 systemd
+
+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 libcloud libvirt mako mongodb mysql openssl redis timelib test"
+
+RDEPEND=">=dev-python/pyzmq-2.2.0[${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}]
+		libcloud? ( >=dev-python/libcloud-0.14.0[${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}] )
+		timelib? ( dev-python/timelib[${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"
+
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py
+}
+
+python_install_all() {
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for s in minion master syndic; do
+		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
+		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
+		systemd_dounit "${FILESDIR}"/salt-${s}.service
+	done
+
+	insinto /etc/${PN}
+	doins conf/*
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
+}