From 79403fd3b9af88bc55bf19d1722266957d216b07 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Tue, 21 Apr 2015 22:25:07 +0000 Subject: Version bump. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) --- app-admin/salt/ChangeLog | 8 +- .../salt/files/salt-2014.7.5-archive-test.patch | 15 +++ app-admin/salt/salt-2014.7.5.ebuild | 109 +++++++++++++++++++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 app-admin/salt/files/salt-2014.7.5-archive-test.patch create mode 100644 app-admin/salt/salt-2014.7.5.ebuild (limited to 'app-admin/salt') diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog index 5d4e46982e61..0e1e310c6d52 100644 --- a/app-admin/salt/ChangeLog +++ b/app-admin/salt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/salt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.60 2015/04/18 11:14:31 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.61 2015/04/21 22:25:07 chutzpah Exp $ + +*salt-2014.7.5 (21 Apr 2015) + + 21 Apr 2015; Patrick McLean + +files/salt-2014.7.5-archive-test.patch, +salt-2014.7.5.ebuild: + Version bump. 18 Apr 2015; Manuel Rüger metadata.xml: Remove unused USEflag desc from metadata. diff --git a/app-admin/salt/files/salt-2014.7.5-archive-test.patch b/app-admin/salt/files/salt-2014.7.5-archive-test.patch new file mode 100644 index 000000000000..f7ff561efd62 --- /dev/null +++ b/app-admin/salt/files/salt-2014.7.5-archive-test.patch @@ -0,0 +1,15 @@ +diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py +index a7f3005..bb0bc45 100644 +--- a/tests/unit/states/archive_test.py ++++ b/tests/unit/states/archive_test.py +@@ -78,9 +78,7 @@ class ArchiveTest(TestCase): + running_as = 'root' + filename = os.path.join( + tmp_dir, +- 'files/test/_tmp{0}_test_archive.tar'.format( +- '' if running_as == 'root' else '_{0}'.format(running_as) +- ) ++ 'files/test/_tmp_test_archive.tar' + ) + for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): + ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/salt-2014.7.5.ebuild b/app-admin/salt/salt-2014.7.5.ebuild new file mode 100644 index 000000000000..defec26c0995 --- /dev/null +++ b/app-admin/salt/salt-2014.7.5.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.5.ebuild,v 1.1 2015/04/21 22:25:07 chutzpah Exp $ + +EAPI=5 +PYTHON_COMPAT=(python2_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-r3 + 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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" +IUSE+=" openssl redis selinux timelib raet +zeromq test" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + 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}] ) + raet? ( + dev-python/libnacl[${PYTHON_USEDEP}] + dev-python/ioflo[${PYTHON_USEDEP}] + dev-python/raet[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] + dev-python/pycrypto[${PYTHON_USEDEP}] + ) + api? ( + || ( + dev-python/cherrypy[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] + ) + ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=(README.rst AUTHORS) + +REQUIRED_USE="|| ( raet zeromq )" + +PATCHES=( + "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" + "${FILESDIR}/${PN}-2014.7.5-archive-test.patch" +) + +python_prepare() { + # 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 $(use api && echo api); 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 -r conf/* +} + +python_test() { + # testsuite likes lots of files + ulimit -n 3072 + + # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX + USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose || die "testing failed" +} -- cgit v1.2.3-65-gdbad