Version bump. Add call to distutils-r1_python_install_all to python_install_all in all current versions. Clean out version 0.16.0.

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

5 files changed, 104 insertions, 19 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 5a53d456cfba..7046d1cf0cd4 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2013/08/06 05:35:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.21 2013/08/14 20:14:36 chutzpah Exp $
+
+*salt-0.16.3 (14 Aug 2013)
+
+  14 Aug 2013; Patrick McLean <chutz@gentoo.org> salt-0.16.2.ebuild,
+  +salt-0.16.3.ebuild, salt-9999.ebuild:
+  Version bump. Add call to distutils-r1_python_install_all to
+  python_install_all in all current versions. Clean out version 0.16.0.
 
 *salt-0.16.2 (06 Aug 2013)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 19aaa1001026..3e4574a1e3fa 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -9,25 +9,27 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-1 390 SHA256 c9f76eadde7ab72728810dcefcf482f7e06afa398080b9866dd3424b924ac92e SHA512 b91a423031555a810c343f49eafc1e95b3a48f1491c42b5979240f73998b6c4cde679a886234020de7136df83b3da7f92590f9dee345f694678f4b386e5defb2 WHIRLPOOL 1d5feb3915a4986a66dce3ef84fd235cbcfdbd5611e5edb51005d97de81dfd1ad2998e252c0b48276983037c8faf39f40d3880a87c55fb9f42f62c7822c9cd61
 DIST salt-0.16.0.tar.gz 3523789 SHA256 2f79012838a5e674f5cd2126326606bffc3b3cb24c33d8667a11158241b656fc SHA512 1f02b20b71922717cf1ae4ab012e0e2b502a57d52b06ed446ab2fb3ce08912b1bc0a4ed702b0189b1890588af7b3ce94d98bc61815d9d3c03e650b88205fc7f9 WHIRLPOOL 5a597b3804576a5ace0e3f6cd937f81db25bf95b731f646a153c9af2bd28826116b2300f125e02cb5929c1dc8a1a4afcff446be2ee7c7bf2546a3b279f4930ab
 DIST salt-0.16.2.tar.gz 3542692 SHA256 19a2b95c4781e1e4c2ddfed6cce7ecc0a02edc3aa49e7df16958a171fba0e075 SHA512 af1d5fffb1aba21645f2de436d9082bb780987f01a1ab8a9e6b728954023479ee86c885e80662cb43525b161b6891afc42108bda42e5f553bdc7131c88a5fe11 WHIRLPOOL 880a62bd3318af2c373e5d0d717843b89a0cdfa541372797b6f6e51720239b476507605b6d01e7a3a04933fcffad08d3cdfcd54630f28ec34f95b348d2031ee6
+DIST salt-0.16.3.tar.gz 3543283 SHA256 6ddf6802ea8957dcc4434c2b0177a9bcadc9979f6a1c370f5ef20859ffadd18f SHA512 089bd5769ae5b79380b0f2a259f4e07ebe51da2845b778e6b31c782f3c607d73e5a5e35cdc85b871fe893210750ba31ceca76bdee471ba39794074c6cd75347b WHIRLPOOL 40d0b6b66dae3b0285534c6995ffe8434bf340f771edfcb8cf8666ba9d15a9c70cc3b5bdea0168d684e98c1215400d0db9e26d4b5287f18d346741ca0a47a585
 EBUILD salt-0.16.0.ebuild 1939 SHA256 56489702929c74ecd47323dc211df295795815d7330933e8d64b465ec18cd680 SHA512 7e58ff7423de29b9f751a9ff94e09c70057a06b21453d3cc36252b4d9303a493a2750261e0d6547411fafc0efc5e7cb62a2950a8ebaab1ff0a0a36b94a32bab1 WHIRLPOOL d00d3ec3b7947c68acc455ca94d5e68a40d7f814f57d4b9d3644ac76db0a86705d45b9c56283718ae0139324506d690e503279238f82667784fb3345858d7bfb
-EBUILD salt-0.16.2.ebuild 1939 SHA256 779651e25a8acd5d4ea01c36cfa0137d00396ab71585f644d456b80e852ae70a SHA512 a7442e99b5a939e6c2a64509f4e70d24c9161e7aa671a90c760d64111feffb36c0c413e914a45db6455d8056732276b438dea66b4b1100e7ea253741e3c92df4 WHIRLPOOL 16cffbf5d3f4ebb748511aea2fc0883bfb24f7248f5d674c43cfb3d672e874ffcaa3c86e7bdbfab5a397d2a8ae3ef375e0c040fc3a3d125ad19b7f579be1ea4a
-EBUILD salt-9999.ebuild 1937 SHA256 4fe7fef0f0d06e22a8e9515e96910cb77c3a6f3c671c5824a4739390b512a03e SHA512 a642743fd6cb1f191c8d2e4c2ef8fe24fbc4d1d8e89095ea572ed0ef6e230c1cf444887f6aacff2332c85e9b9c30aebc5cf54868514366024a3e54ae902b8315 WHIRLPOOL 5debe7b070b59dbf20a015bc04e478932e7c3ef72699586d5dc4c2af8a5ea87774683762e2089ffd610900b2ef51ff8583201e25293b92a85a4d0097e4b9afd3
-MISC ChangeLog 3531 SHA256 5e18f4c6209e4546de4bdee16a6304971d17aff315e9b5cd68a0036223610421 SHA512 9a74ea774e68eb54b5cebc64a30fde2b018ac6c32a9837058fa2ecd4131b93071573d4aa6a48a15c4ca114b8de8c614597054e22eebcb56ac2d9589bff358c36 WHIRLPOOL ff7f90db40d8e5bb338b28eacd6df8c24b4c942c95db67ae56283727292126bf1a356025dffafc53ef0b2f5bcb17166618e9c10217b8637c6f6795abc5acecf1
+EBUILD salt-0.16.2.ebuild 1973 SHA256 aac141e280a4d2ca5ce99453b42db6606b331c2288fb2c17e0079690048c15e7 SHA512 1e2323f4ceca9da6da38038e43941aef132e63e7399b0dac88521a83de8fa49bfacdc1c210c24d3891636a602273489a0eee359cf917cde7b0ac19b78a05adae WHIRLPOOL 736804d6129886250f9c869a3e5ee7fd448351248f273b639ab372b95e842c31bf68ad09fd87bab73bcef5890cd43eb47b81d795c0f378f534d187656913b742
+EBUILD salt-0.16.3.ebuild 1973 SHA256 48f5d4fbb506717d05715bf80ebc7c321817371a5e1af790515838cb0e1c94c7 SHA512 2c996861bed5b58b0ba83375516e9aa53b3f1195c433bc60ae7a190f60a366b8440d5c614244ee6d25b65fbf40e8d89be01fce3f7c974c5b03eea180951f6457 WHIRLPOOL 5885708b72c501f78122c330ed8165992a1ac4c51b18d6dbc392f763ffb50c5ef388555022c042bb4b7fe4bf12dbfc0add74845bd734a76de4956f78f615ed0d
+EBUILD salt-9999.ebuild 1971 SHA256 aa050537deda8fdc9667ca454ddfddfe2036a8b038714f146b839c3679a3a953 SHA512 4dbd873ecfdb3d1bd40ff39ff227d833821327ba9488e8500a9ce61dcf9c9bfe3f2eeba11dda905bb93afb7fd1f89880714ffb0143832d32661d5f2b7621668f WHIRLPOOL 34721552d988fe2df92814dac00296f95d2356a2e99ff52650adcede688463246f9e711e22ad5c94d954daaeeaeaf892afe51484d1224cafcc1a2bc848421d24
+MISC ChangeLog 3805 SHA256 f361f6938928a391224310b36bdbdd71f822db6e8a0a30940dbcab1df5bf124a SHA512 de4b5ca68213ff910460c0ff4e7fd4ac288f06e61bff5e1d6b25763d0b598ec2830bddbc53ddede2fe9a1ec4bfa7cac0b40fbfd2b7571f3b53eb2397b2e42574 WHIRLPOOL 64f5796e4a9f5ac0d4fc075fa20e41b915367e75b7687e37a3ad3c7c00653151befc352d9d0724bc0b816afbb69f365a8e514d6e6c82a9bacb0fcf5408e4ca1c
 MISC metadata.xml 1349 SHA256 c381390f62360f243ee210d099ddfddfc81632186db11964416e5faeb5ef0256 SHA512 dc7da5bb40585036807c1158bd50bdb72f51e4d4255fa1f6b07c2d91fb39cfeda50d288c3367b3e23ee8adfeaddb05840f276639ed045ff5696f4a5c2d5375b3 WHIRLPOOL f137a52155ad3d3f2a5deb5ba66ea7a986d77c1ea271072e63bba5070619e87ba0838412d466abb6fdac705d45bc5fc06ce1950a78d95a8bf5b8932f8c8504fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSAIsQAAoJEHy/RO9cNQiDqiQQAJQcAe1SuW0zXR15EcwxvZRn
-c4Io3wVC6tv7dWL+CoEgCDpI38yhsyw7LuAu45D8IMb86f0wszc+zK9uac2UpRQA
-fU4q71TLViJ6tBhs9ssg6Hnm4N4xt3jCxjb5NMT12H7HVATE7rliQbdwgBptu2WQ
-1CLig4HZL8kYjrXDV0LIwOidzkFM0YEQPcntHOYxHMRDyhIVzA/ZxxnWRL24loE1
-Vb9FLfPbwuDe3k4JGKLBqiD3rVvS3/25rWd2oXs6tbkuJ1e0TIFDSQKKRCTacEoN
-1EaEuqm6sUJxgC1Jh2FYiKohWDwP+aNfrdJKSuHFT6mlFEhYwBOcLg5pqQFflDDu
-rBF85u4WAFTPw00pAzmm4NTiFGK2eJsgi9g/b9P8FGqbjQPqNVSi6hLDMqwWzO9P
-+pm+GNo16WUJR42w1XdgYzGGdic864kXnZHGpv9iRVJYwAaMvS31v+IN+MEjikSe
-xQqaPWItQ+7Ey2iHSTckSWYkINrGyffm7LC8ecKPeWaVJuiMdHU8UnIoW8AmzRi9
-m8t0SyqvE3dzzeFuA+/d+nQpytSe0na9S7FSclKRQgY6RDdsRQLow0jZrWnlaXse
-I5LfbkqRWAo404+HzCPoZ9i17i3v4cgTHTdq/nVWMZawmj04eRd8qyuNciG6JsMY
-DbuzNIwYkzPEp2Mq+YGv
-=HkQL
+iQIcBAEBCAAGBQJSC+UtAAoJEHy/RO9cNQiDW8sQAIwcGsOMRd/ZcrnqJjtoZYAS
+blPRCSQa9h78Y5paJSA1YFaqSZlD6xpZqKtuLqcOekDTjw6U8uOlSdE7LIAsi5uO
+0r9LaAgXNwwhLU9S6wB6NUnwppgRu34HpZBNMQ0/OJ01BVrXAiCUycR5ltB5G8QV
+YTaeoait0Dr9EIkPT04GwfSwbnxOtWQ7IhyrKPKvSygqoigumuy/ddd0PMqehh6S
+PNdN+2lJjkNbnLgHi7ZC5qdus85xEcJBLe2ILp8I2p4KnZqSLz1JdZOT5BKKDTkC
+TmFtTSbsHusSXoACV/Tcs39lpzVihIx6M9l7wCYa8JAmbHAedAL+N+0PvB0T0fJl
+uC4r2Y2XmmIAQo3maCJToRTJta86FJXsdGvPdJf2i9TwvncRownuLeSdUf5mu2Cz
+4Kd+ucvq0dNOOE6+pEg/DoP07y4TIx2CoSzxn8g+eFL3VGXlAv9O5eMF6HTKMD35
+KJzrVFkxx75uYVNhZFJXHye9V5L4gCXCxJP90x+xpEhzvNCw3/l0bxtEz7+mbCC/
+YOE3yB80qmJSh6Sv3qCdYj7Aa/wfih6R9L6HuGEwRfBeJtG9Qvv8y1yMz4II5FXZ
+ZqmwpdESG8I9NI9P2Owxc1YLtMiLyd8pDtwyO+AycJkLKKawYEsg6GBt3zCLC3YM
+SgTagt+eeNUgirt/Cror
+=BMGr
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-0.16.2.ebuild b/app-admin/salt/salt-0.16.2.ebuild
index 198ba4660cdc..2afad23e8ad1 100644
--- a/app-admin/salt/salt-0.16.2.ebuild
+++ b/app-admin/salt/salt-0.16.2.ebuild
@@ -1,6 +1,6 @@
 # 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.16.2.ebuild,v 1.1 2013/08/06 05:35:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.16.2.ebuild,v 1.2 2013/08/14 20:14:36 chutzpah Exp $
 
 EAPI=5
 
@@ -52,6 +52,8 @@ python_prepare() {
 }
 
 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}
diff --git a/app-admin/salt/salt-0.16.3.ebuild b/app-admin/salt/salt-0.16.3.ebuild
new file mode 100644
index 000000000000..26e7cf666a35
--- /dev/null
+++ b/app-admin/salt/salt-0.16.3.ebuild
@@ -0,0 +1,72 @@
+# 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.16.3.ebuild,v 1.1 2013/08/14 20:14:36 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? ( 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() {
+	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/*
+
+	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
+}
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index 6b65031e0eb6..cf466e4ed43a 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.6 2013/08/02 17:25:31 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.7 2013/08/14 20:14:36 chutzpah Exp $
 
 EAPI=5
 
@@ -52,6 +52,8 @@ python_prepare() {
 }
 
 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}