summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2013-03-26 00:51:44 +0000
committerPatrick McLean <chutzpah@gentoo.org>2013-03-26 00:51:44 +0000
commit09a37330f85005350fb1c4f893886f1c01f4eb5f (patch)
treef9f7ac0de2548a05a8f16ea3ae56640ef0f9c813 /app-admin
parentadd x11-libs/libXpm dep (bug #463288) (diff)
downloadgentoo-2-09a37330f85005350fb1c4f893886f1c01f4eb5f.tar.gz
gentoo-2-09a37330f85005350fb1c4f893886f1c01f4eb5f.tar.bz2
gentoo-2-09a37330f85005350fb1c4f893886f1c01f4eb5f.zip
Version bump.
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/salt/salt-0.12.0.ebuild66
-rw-r--r--app-admin/salt/salt-0.12.1.ebuild66
-rw-r--r--app-admin/salt/salt-0.14.0.ebuild (renamed from app-admin/salt/salt-0.11.0.ebuild)4
-rw-r--r--app-admin/salt/salt-9999.ebuild4
4 files changed, 4 insertions, 136 deletions
diff --git a/app-admin/salt/salt-0.12.0.ebuild b/app-admin/salt/salt-0.12.0.ebuild
deleted file mode 100644
index 3f6bb721428b..000000000000
--- a/app-admin/salt/salt-0.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.12.0.ebuild,v 1.1 2013/01/16 21:57: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" ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.12.1.ebuild b/app-admin/salt/salt-0.12.1.ebuild
deleted file mode 100644
index a8157a96ea00..000000000000
--- a/app-admin/salt/salt-0.12.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.12.1.ebuild,v 1.1 2013/01/22 21:51:46 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" ./tests/runtests.py --unit-tests --no-report || die
-}
diff --git a/app-admin/salt/salt-0.11.0.ebuild b/app-admin/salt/salt-0.14.0.ebuild
index e48b73f9b474..c49ec54e9460 100644
--- a/app-admin/salt/salt-0.11.0.ebuild
+++ b/app-admin/salt/salt-0.14.0.ebuild
@@ -1,6 +1,6 @@
# 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.11.0.ebuild,v 1.2 2012/12/19 00:40:55 chutzpah Exp $
+# $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
@@ -62,5 +62,5 @@ src_install() {
}
python_test() {
- SHELL="/bin/bash" ./tests/runtests.py --unit-tests --no-report || die
+ 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 e1441c74e327..58e10590c0d1 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
# 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.2 2012/12/19 00:40:55 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.3 2013/03/26 00:51:44 chutzpah Exp $
EAPI=5
@@ -62,5 +62,5 @@ src_install() {
}
python_test() {
- SHELL="/bin/bash" ./tests/runtests.py --unit-tests --no-report || die
+ SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report || die
}