chutzpah 15/01/16 22:56:46 Modified: salt-9999.ebuild ChangeLog Added: salt-2014.7.1.ebuild Log: Version bump, add selinux USE flag (bug #533118). Sync 9999 ebuild with current version. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path 1.16 app-admin/salt/salt-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?r1=1.15&r2=1.16 Index: salt-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- salt-9999.ebuild 3 Jan 2015 12:26:40 -0000 1.15 +++ salt-9999.ebuild 16 Jan 2015 22:56:46 -0000 1.16 @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.15 2015/01/03 12:26:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.16 2015/01/16 22:56:46 chutzpah Exp $ EAPI=5 PYTHON_COMPAT=(python2_7) @@ -23,7 +23,7 @@ LICENSE="Apache-2.0" SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" +IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" IUSE+=" openssl redis selinux timelib raet +zeromq test" RDEPEND="sys-apps/pciutils @@ -48,6 +48,12 @@ dev-python/m2crypto[${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}] ) @@ -55,14 +61,13 @@ 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}] ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${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-2014.4.24[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}] ${RDEPEND} )" @@ -78,7 +83,7 @@ python_install_all() { USE_SETUPTOOLS=1 distutils-r1_python_install_all - for s in minion master syndic; do + 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 1.54 app-admin/salt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.54&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.54&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?r1=1.53&r2=1.54 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ChangeLog 3 Jan 2015 12:26:40 -0000 1.53 +++ ChangeLog 16 Jan 2015 22:56:46 -0000 1.54 @@ -1,6 +1,13 @@ # 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.53 2015/01/03 12:26:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.54 2015/01/16 22:56:46 chutzpah Exp $ + +*salt-2014.7.1 (16 Jan 2015) + + 16 Jan 2015; Patrick McLean <chutz...@gentoo.org> +salt-2014.7.1.ebuild, + salt-9999.ebuild, +files/salt-2014.7.1-remove-pydsl-includes-test.patch: + Version bump, add selinux USE flag (bug #533118). Sync 9999 ebuild with + current version. 03 Jan 2015; Sven Vermeulen <sw...@gentoo.org> salt-9999.ebuild: Add selinux? dep to selinux-salt (bug #533118) for live ebuild 1.1 app-admin/salt/salt-2014.7.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.7.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.7.1.ebuild?rev=1.1&content-type=text/plain Index: salt-2014.7.1.ebuild =================================================================== # 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.1.ebuild,v 1.1 2015/01/16 22:56:46 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[${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-2014.8.5[${PYTHON_USEDEP}] ${RDEPEND} )" DOCS=(README.rst AUTHORS) REQUIRED_USE="|| ( raet zeromq )" PATCHES=( "${FILESDIR}/${P}-remove-pydsl-includes-test.patch" ) python_prepare() { # this test fails because it trys to "pip install distribute" rm tests/unit/{modules,states}/zcbuildout_test.py # these tests fail because they depend on features that are only # in git versions of SaltTesting rm tests/unit/{templates/jinja,modules/hashutil}_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" \ ./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed" }
