Version bump, refactor ebuild and 9999 a little for better distutils-r1 support. Add mako USE flag. Clean out old versions.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

5 files changed, 50 insertions, 109 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 63a82fc66998..481b67b8a1b7 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.11 2013/04/16 00:51:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.12 2013/05/04 20:40:58 chutzpah Exp $
+
+*salt-0.15.0 (04 May 2013)
+
+  04 May 2013; Patrick McLean <chutzpah@gentoo.org> -salt-0.13.1.ebuild,
+  -salt-0.14.0.ebuild, +salt-0.15.0.ebuild, salt-9999.ebuild, metadata.xml:
+  Version bump, refactor ebuild and 9999 a little for better distutils-r1
+  support. Add mako USE flag. Clean out old versions.
 
 *salt-0.14.1 (16 Apr 2013)
 
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index b18aa94eae5b..4ca0d061a448 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -25,6 +25,7 @@ backbone of cloud and data center management.
 		<flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
 		<flag name="mongodb">Support returning data to a mongodb server.</flag>
 		<flag name="redis">Support returning data to a redis database.</flag>
+		<flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/app-admin/salt/salt-0.14.0.ebuild b/app-admin/salt/salt-0.14.0.ebuild
deleted file mode 100644
index c49ec54e9460..000000000000
--- a/app-admin/salt/salt-0.14.0.ebuild
+++ /dev/null
@@ -1,66 +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.14.0.ebuild,v 1.1 2013/03/26 00:51:44 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" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.13.1.ebuild b/app-admin/salt/salt-0.15.0.ebuild
index 55fbf00037f8..50e664be1121 100644
--- a/app-admin/salt/salt-0.13.1.ebuild
+++ b/app-admin/salt/salt-0.15.0.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.13.1.ebuild,v 1.1 2013/02/19 18:54:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-0.15.0.ebuild,v 1.1 2013/05/04 20:40:58 chutzpah Exp $
 
 EAPI=5
 
@@ -24,36 +24,33 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako 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 )
+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}]
+		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 )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
+		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}
 		)"
 
-src_prepare() {
+python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-	epatch "${FILESDIR}"/${P}-disable-failing-tests.patch
-
-	distutils-r1_src_prepare
 }
 
-src_install() {
-	distutils-r1_src_install
-
+python_install_all() {
 	for s in minion master syndic; do
 		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
@@ -63,5 +60,7 @@ src_install() {
 }
 
 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 58e10590c0d1..740ae4deae50 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3 2013/03/26 00:51:44 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.4 2013/05/04 20:40:58 chutzpah Exp $
 
 EAPI=5
 
@@ -24,35 +24,33 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mongodb mysql openssl redis test"
+IUSE="ldap libvirt mako 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 )
+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}]
+		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 )
-		mysql? ( dev-python/mysql-python )
-		redis? ( dev-python/redis-py )"
+		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}
 		)"
 
-src_prepare() {
+python_prepare() {
 	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	distutils-r1_src_prepare
 }
 
-src_install() {
-	distutils-r1_src_install
-
+python_install_all() {
 	for s in minion master syndic; do
 		newinitd "${FILESDIR}"/${s}-initd-1 salt-${s}
 		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
@@ -62,5 +60,7 @@ src_install() {
 }
 
 python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
 	SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
 }