Version bump, port to distutils-r1 from python-distutils-ng. Add a 9999 live ebuild.

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

5 files changed, 117 insertions, 98 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 06f1df333008..2894a437722c 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.4 2012/11/29 11:39:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.5 2012/12/18 23:36:38 chutzpah Exp $
+
+*salt-9999 (18 Dec 2012)
+*salt-0.11.0 (18 Dec 2012)
+
+  18 Dec 2012; Patrick McLean <chutzpah@gentoo.org> +salt-0.11.0.ebuild,
+  +salt-9999.ebuild, -salt-0.10.0.ebuild, -salt-0.9.8.ebuild:
+  Version bump, port to distutils-r1 from python-distutils-ng. Add a 9999 live
+  ebuild.
 
   29 Nov 2012; Michał Górny <mgorny@gentoo.org> salt-0.10.0.ebuild,
   salt-0.10.5.ebuild, salt-0.9.8.ebuild:
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index dd7abbc7eea9..fa5d0583e125 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -8,20 +8,27 @@ AUX minion-initd-1 391 SHA256 1e927cf84e4baa368384d148b1b4ca544b53678f5f99280cc3
 AUX salt-0.9.8-syndic-resolution-of-master.patch 918 SHA256 d727ba8d1a63b888caa6f7fc2a98b6607fc86ff4feb828b50a53e6f6edf67a4a SHA512 0508f980602ca9df754047d0db6cdff60cdf10490f79ce0fd55c17534a737118095891f347bd94187f2381b36812bb1cf270235fadcd12748edf12a2ca623d1a WHIRLPOOL 194139704b21f31b4192f1f9275d6738b747013abb08941360b289150ce99e01194c902f82999c7cd7aba225f16244ea8be61ffe388e41278324beec5e6c69fd
 AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX syndic-initd-1 390 SHA256 c9f76eadde7ab72728810dcefcf482f7e06afa398080b9866dd3424b924ac92e SHA512 b91a423031555a810c343f49eafc1e95b3a48f1491c42b5979240f73998b6c4cde679a886234020de7136df83b3da7f92590f9dee345f694678f4b386e5defb2 WHIRLPOOL 1d5feb3915a4986a66dce3ef84fd235cbcfdbd5611e5edb51005d97de81dfd1ad2998e252c0b48276983037c8faf39f40d3880a87c55fb9f42f62c7822c9cd61
-DIST salt-0.10.0.tar.gz 1966467 SHA256 268545290cf736bb1d0ba9c6fa73927c77c9cec2a7ed73112c970fd00b2aa94a SHA512 22c9d85240af30929e0658812e287619e5215d830b2281cfff23290a8c4012761270ee1ee997d109ae334643b4cc08157429be85d4b2a1d362c1d296857f7f50 WHIRLPOOL 8c823b9b7f1a0ce573e3beda6c9f7503bd7cd22d0a5be194329a5e20f114422c53b58b483878060fe7c7bf2eaffd7fb9c2dd1ae6f99aca7b7d05c141a75fff4f
 DIST salt-0.10.5.tar.gz 793582 SHA256 16350dea427e9216adfa48a184fe99b302dacf6b2afbb96b792734046d80c9c9 SHA512 ff7485fb8f9ef66c92f73ac64e424c8d05d1d5566e03bf6c187ea74948daacc6f1dfca5ce8f3aead27e1af85e60ed3715a88cead53b137e75723c19254f8a77e WHIRLPOOL 560bd02c945bbb2a7651bb491261c277a95b2925473750a78181b7e7ef09af6708bfc966b3525032bd593b7956dfb3f2e2029efce8fd987eaa470878d66cfbec
-DIST salt-0.9.8.tar.gz 1641495 SHA256 a00cb012b8caca3ce30ecf37a8bc9e0ba3048d5158ff6914918a913aae07ed15 SHA512 767f87d15483f101d5f264371abaf5ddb048a997ed758078a2ad015bd1bfb62224e7d9e6e5556af069766d20f3decc8944ab947e07f1ada6192b0c5dc50796e5 WHIRLPOOL c99f6ba40319cead3a4cb801ea6c9d3a1398642bcfcad1e018d128dc9dc216cf5ab7c55c140d22f6c08623bd61b3b0f026480fb224ffe82199d863e41defd0c7
-EBUILD salt-0.10.0.ebuild 1546 SHA256 725448b1076e0259628f243bb6d51c3662d95bce95832a9efefcb3e9f1d16423 SHA512 f517c9581ecb7c013ea27e986aaf8985e11260495e3a6699ff002fef0c56a92020715844ed6aebd69e997b82a49822493503fd69a12005fede3988e79dd401a7 WHIRLPOOL b7754a4b98dcffe65789a994114cc9bc34ac7d7399f3332d45e562d91d01fff52687896aa8ca2c0105e43f622f0d5324f0e44c29419ad92181dce0725570c76a
+DIST salt-0.11.0.tar.gz 846339 SHA256 d5ecc48ff6c9a81686db59921e1b24e1c876f889214e7865f95d646ab572a3de SHA512 53c8ef06b2387b5cceb661c2b4805f6cfe84e888668169eec035f1d9edbe8587d2ff9b079e2545ae3d01ffdcf35243ca27fdebef926c830a54c5ca5567f640a4 WHIRLPOOL 5363855ac0921e0316c5435f379cc4fa0e7414e479dd7e550e44e472a61e47d9edd9100556633b6ffea13d857e46210f6cfee6c6b6c89f545b33be8a982167a7
 EBUILD salt-0.10.5.ebuild 1630 SHA256 2d0dc025168e79ad476866febddd6388f0fc2a31e27753b95388e2e772ec4420 SHA512 4091dc8fb63d03c58aef5eedd221e3adeb093e1a0c7441c7ae3bd7d481281ab0635cc8a5dd66a8991957ca932850194a5673d53c0b932ecf2634b0d36f555959 WHIRLPOOL 573764254ae52e32ab11f710f99457d5b420064e8118c5a11efb92c998508229910c86b393c4d353420d7e09aee236b6efda328aa52de81cce427f61af0a8a37
-EBUILD salt-0.9.8.ebuild 1584 SHA256 13cbc8fd7c9be6a6af51e511905570d2e10392da883db7b6422ebe208cb43017 SHA512 af8708c019b43527cbf14bb039038876df75cae89c1920eb3c6de8377ba5ec8fa98a72ae2d317d79e2a1e3d390bec68f753f1cc7f63c3284ff37640c10a987fc WHIRLPOOL e6ccca16ba221fef7d0ac9d02e6204b7b3ab16c7f21ce9804df6a217c748b81d1e331bbbcb4a7875a2768e1e560272beca9f9962f58f9192944b37088a61972b
-MISC ChangeLog 629 SHA256 f62c202ee9ce4c7e857a304fd589dfed9efe61ada204c47a5d681312a1503d55 SHA512 17768c19751675455f8a48e04c6b4be3f1987e8e1d499ff8e82cb5b13eb4c465d47dbe7628f2709ba0a15e2cc99299263c22dff93b1577cfe1e3fb05aa335b53 WHIRLPOOL 1cff40af6bc6a023d128f05751026ab256e63e0a990dc45210da71f9c6f5faac1cb7838f0cbf4221b438ff11a579cd6a6cf49eb8c5f124eb143c85436834d27c
+EBUILD salt-0.11.0.ebuild 1535 SHA256 049413da6703af4dbea167298aaa1f7d09055f9bd94547e4573441ac10dfe9d3 SHA512 afba3335e7fa47a5fc2051e7005fe59f521c2822c662304a59030afe46818698d0695487af4c73314ecc62d31b89d28ae63746fe4934c2c682e13626d9986538 WHIRLPOOL c083e4860791cec7e5c4842b1a6aaa42fc663a8368aa5c4029f31e022f7328d5340792ef79bc800d8181ac8bf22b4aa4f1937b0e19e5214a8cd16a4efee32c51
+EBUILD salt-9999.ebuild 1533 SHA256 6f244e94e4f10381f04bed1723b3c904fefc45583298a61d3fc5d36e1f74386a SHA512 d72e3b8fb38cfd9ea630b2aa7aed6f52a99a21d73e1d1b9819c3ec11352f03e1e746dcadbf1f80dae8c5be1c414c47d682a2275d33b47b94f724add249666d0a WHIRLPOOL 1301ba2fd255a2c3299e50efaafb8b1f71c05f08e03c72668600351872436b74c383437efbdfdca39593bb787991ae07b4b4c7ea2e2ccfce2134d69d65cad81b
+MISC ChangeLog 909 SHA256 99e55cc13b5266e326fefd2cd5daf088bfbce14b4646aa65cb4bfa76d3df0533 SHA512 3afa75d50c6d74f3f40a01a91d876ed547035a2f7e3e2c9438d486d84fc1d5a5cd9ec27e830830527991661fcfa37232a05690cc702de0a7fefc0133ea1435fe WHIRLPOOL 33d2d207da74275185f76d762d918b07e5fa9b57452c7893d655d297b1a74d53df0ba120dca0990fbde4757ccdfdeda7c8a8036e04d221491d995da131786297
 MISC metadata.xml 1340 SHA256 dd567be41c623728d40d751ca11cba4fda644f801f9dcb502dcf9dbd70d94dde SHA512 7ac534a47402100d07810e990d0bb69eb6fe931c06a176b5559227f9f0329dad3a3845007161bad03cf294d721e77e63cd7c0f546660df65bf874a7242f764e8 WHIRLPOOL 41a6d43543759bae8d415733db4b5dbc40938f2da6be9e479d744e3555835c1b1e04bec7516920ff87198266cb5ffd7dda9633c5bf48bba5b9687fe7fa549fbc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlC3ScsACgkQfXuS5UK5QB2W6QQAmL+AHjuVqGDSKbC4tR8yDPG1
-+aKMQ6BP4EP/140eaTvqOO5lQdud3RCblDGX1v7u9HNPNYcYR7CcEvvwWOuvaN5H
-R10FW83Kl94yQyMM/Sm5RwMKcBqf6sRwUfObGyWl05aQJJ4szW7KBCYzxcc2eycC
-MvnxNDwA0ZJd75+jR1k=
-=MjgC
+iQIcBAEBCAAGBQJQ0P4QAAoJEHy/RO9cNQiDtaAQAKxepRUHXImzuZb1shy6Dss2
+hrLAuTqYNhGuXiDgMloNNoU2GaoDfE5CYz2M4ScNkK9/C3LbbxZknOiygZgDw5BB
++p+E1gn/+yP3zcdlMY2chyHF+azUaMxWcoxsZZgZ89LgG94sqqznakRCHZuq/8a6
+2JdJogKygXpNLqFzEds1AOfChL0HelDM+UOQwmOaQ4Hgxk5dVvTgopD74Pps4w+A
+2IwkBZM4O+7JhjK7rp7GY9LVnxqL65j1SWB3x/vgw2QZaAisQuBp69kNlkOFC3MO
+xhII3LWivTJHQokur1eMs0pBpcJIJIpx+hKH/wI7VFb1oFUs2J3hi5eMgNmqoO+j
+W20cdFepG67c0nOEfr32xrBevd0i75nO1lNahpz/IfSeEZc8Gvl/l0GYvQLeTiIQ
+w+FkJnZbFxAEIGUlC8O8V2gOsTF3QPWVbIl36bel1ofwWYmzw/p9VWFCatyEoUFu
+YHLTO/BVY/AB5xnxVc+1CgjBLty2LVmfPDQvyTj8ZvZ/E/Xjgdp5upyPZ19StQ/z
+5FGDP1s9XgahlnfurDwK0TFhCpj2g/mSZcNF5c4hemAoZibW6uKEboIoApoLroY6
+UFr/9UeWLH5yVjNfzCftLuTGY36vYX5w2it9zqKN9qw1MR1/eJVypvEIPqh/nh5v
+0WVCpUzkVRkCt+Py+cJf
+=s3cQ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-0.10.0.ebuild b/app-admin/salt/salt-0.11.0.ebuild
index 1cfa72a1dee5..789e93571767 100644
--- a/app-admin/salt/salt-0.10.0.ebuild
+++ b/app-admin/salt/salt-0.11.0.ebuild
@@ -1,63 +1,65 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.10.0.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.11.0.ebuild,v 1.1 2012/12/18 23:36:38 chutzpah Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
+PYTHON_COMPAT=(python{2_6,2_7})
 
-inherit eutils python-distutils-ng
+inherit eutils distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager."
 HOMEPAGE="http://saltstack.org/"
-SRC_URI="mirror://github/saltstack/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	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"
-KEYWORDS="~x86 ~amd64"
-IUSE="+jinja libvirt mongodb mysql redis"
+IUSE="ldap libvirt mongodb mysql openssl redis test"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-		>=dev-python/pyzmq-2.1.9
+RDEPEND=">=dev-python/pyzmq-2.1.9
 		dev-python/msgpack
 		dev-python/pyyaml
 		dev-python/m2crypto
 		dev-python/pycrypto
 		dev-python/pycryptopp
-		jinja? ( dev-python/jinja )
+		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 )"
-
-# Tests try to remove system files (bug #437268).
-RESTRICT=test
+DEPEND="test? (
+			dev-python/virtualenv
+			${RDEPEND}
+		)"
 
 src_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
 
-	python-distutils-ng_src_prepare
+	distutils-r1_src_prepare
 }
 
 src_install() {
-	python-distutils-ng_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
 
-	# install the config template files
-	dodir /etc/${PN}
-	for conf in conf/*.template; do
-		sed '1 d' ${conf} > "${D}"/etc/${PN}/"$(basename "${conf%.template}")" \
-			|| die "sed failed"
-	done
-
 	dodoc README.rst AUTHORS
 }
 
 python_test() {
-	./setup.py test || die
+	SHELL="/bin/bash" ./tests/runtests.py --unit-tests --no-report || die
 }
diff --git a/app-admin/salt/salt-0.9.8.ebuild b/app-admin/salt/salt-0.9.8.ebuild
deleted file mode 100644
index 7df20fc71499..000000000000
--- a/app-admin/salt/salt-0.9.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.9.8.ebuild,v 1.2 2012/11/29 11:39:19 mgorny Exp $
-
-EAPI=4
-
-PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
-
-inherit eutils python-distutils-ng
-
-DESCRIPTION="Salt is a remote execution and configuration manager."
-HOMEPAGE="http://saltstack.org/"
-SRC_URI="mirror://github/saltstack/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+jinja libvirt mongodb mysql redis"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		>=dev-python/pyzmq-2.1.9
-		dev-python/msgpack
-		dev-python/pyyaml
-		dev-python/m2crypto
-		dev-python/pycrypto
-		dev-python/pycryptopp
-		jinja? ( dev-python/jinja )
-		libvirt? ( app-emulation/libvirt[python] )
-		mongodb? ( dev-python/pymongo )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
-
-# Tests try to remove system files (bug #437268).
-RESTRICT=test
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-syndic-resolution-of-master.patch
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	python-distutils-ng_src_prepare
-}
-
-src_install() {
-	python-distutils-ng_src_install
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-	done
-
-	# rename the config templates to the actual config names
-	for c in "${D}"/etc/${PN}/*.template; do
-		mv -f "${c}" "${c%.template}"
-		sed -i '1 d' "${c%.template}"
-	done
-
-	dodoc README.rst AUTHORS
-}
-
-python_test() {
-	./setup.py test || die
-}
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
new file mode 100644
index 000000000000..e404affbc336
--- /dev/null
+++ b/app-admin/salt/salt-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 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.1 2012/12/18 23:36:38 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"
+	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
+}