chutzpah 14/11/13 03:58:29
Modified: ChangeLog salt-2014.1.13.ebuild salt-9999.ebuild
metadata.xml
Added: salt-2014.7.0.ebuild
Removed: salt-2014.1.11.ebuild salt-2014.1.10.ebuild
salt-2014.1.12.ebuild
Log:
Version bump (bug #528324), this version adds RAET support so fixes bug
#522600. Remove app-emulation/libvirt dependency, since it is replaced by
libvirt-python. Remove old versions.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.51 app-admin/salt/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.51&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.51&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 18 Oct 2014 01:49:25 -0000 1.50
+++ ChangeLog 13 Nov 2014 03:58:29 -0000 1.51
@@ -1,6 +1,16 @@
# ChangeLog for app-admin/salt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.50 2014/10/18
01:49:25 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.51 2014/11/13
03:58:29 chutzpah Exp $
+
+*salt-2014.7.0 (13 Nov 2014)
+
+ 13 Nov 2014; Patrick McLean <[email protected]> -salt-2014.1.10.ebuild,
+ -salt-2014.1.11.ebuild, -salt-2014.1.12.ebuild, salt-2014.1.13.ebuild,
+ +salt-2014.7.0.ebuild, salt-9999.ebuild,
+ +files/salt-2014.7.0-remove-pydsl-includes-test.patch, metadata.xml:
+ Version bump (bug #528324), this version adds RAET support so fixes bug
+ #522600. Remove app-emulation/libvirt dependency, since it is replaced by
+ libvirt-python. Remove old versions.
*salt-2014.1.13 (18 Oct 2014)
1.2 app-admin/salt/salt-2014.1.13.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild?r1=1.1&r2=1.2
Index: salt-2014.1.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- salt-2014.1.13.ebuild 18 Oct 2014 01:49:25 -0000 1.1
+++ salt-2014.1.13.ebuild 13 Nov 2014 03:58:29 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.1
2014/10/18 01:49:25 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.2
2014/11/13 03:58:29 chutzpah Exp $
EAPI=5
@@ -39,11 +39,7 @@
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}]
- app-emulation/libvirt[python,${PYTHON_USEDEP}]
- )
- )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
1.13 app-admin/salt/salt-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.13&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.13&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?r1=1.12&r2=1.13
Index: salt-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- salt-9999.ebuild 10 Aug 2014 01:37:40 -0000 1.12
+++ salt-9999.ebuild 13 Nov 2014 03:58:29 -0000 1.13
@@ -1,10 +1,9 @@
# Copyright 1999-2014 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.12
2014/08/10 01:37:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.13
2014/11/13 03:58:29 chutzpah Exp $
EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
+PYTHON_COMPAT=(python2_7)
inherit eutils distutils-r1 systemd
@@ -12,7 +11,7 @@
HOMEPAGE="http://saltstack.org/";
if [[ ${PV} == 9999* ]]; then
- inherit git-2
+ inherit git-r3
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
@@ -24,43 +23,57 @@
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
+IUSE+=" openssl redis timelib raet +zeromq test"
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
+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}]
- dev-python/pycryptopp[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
- sys-apps/pciutils
- 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}]
- app-emulation/libvirt[python,${PYTHON_USEDEP}]
- )
- )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
- dev-python/pip
- dev-python/virtualenv
- dev-python/timelib
- >=dev-python/SaltTesting-2014.4.24
- ${RDEPEND}
- )"
+ )
+ 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}] )
+ 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}] )"
+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}]
+ ${RDEPEND}
+ )"
+
DOCS=(README.rst AUTHORS)
-python_prepare() {
- sed -i '/install_requires=/ d' setup.py || die "sed failed"
+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
}
@@ -75,11 +88,14 @@
done
insinto /etc/${PN}
- doins conf/*
+ doins -r conf/*
}
python_test() {
# testsuite likes lots of files
ulimit -n 3072
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py
--unit-tests --no-report --verbose || die
+
+ # 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"
}
1.7 app-admin/salt/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/metadata.xml?r1=1.6&r2=1.7
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml 4 Mar 2014 19:22:43 -0000 1.6
+++ metadata.xml 13 Nov 2014 03:58:29 -0000 1.7
@@ -21,13 +21,19 @@
backbone of cloud and data center management.
</longdescription>
<use>
- <flag name="openssl">Add support for using TLS via
OpenSSL.</flag>
+ <flag name="cherrypy">Enable support for cherrypy.</flag>
<flag name="libcloud">Enable salt-cloud support via
libcloud.</flag>
<flag name="libvirt">Support managing virtual machines with
app-emulation/libvirt.</flag>
+ <flag name="gnupg">Enable support for gnupg via
python-gnupg.</flag>
+ <flag name="keyring">Enable support for keyrings via
python-keyring.</flag>
+ <flag name="mako">Add support for using the mako template
engine for parsing salt states.</flag>
<flag name="mongodb">Support returning data to a mongodb
server.</flag>
+ <flag name="nova">Enable support for the OpenStack Nova
API</flag>
+ <flag name="openssl">Add support for using TLS via
OpenSSL.</flag>
+ <flag name="raet">Add support for the new RAET transport.</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>
<flag name="timelib">Use timelib to parse english textual date
descriptions.</flag>
+ <flag name="zeromq">Add support for the zeromq transport.</flag>
</use>
</pkgmetadata>
1.1 app-admin/salt/salt-2014.7.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild?rev=1.1&content-type=text/plain
Index: salt-2014.7.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild,v 1.1
2014/11/13 03:58:29 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="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
IUSE+=" openssl redis 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}]
)
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}] )
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}] )"
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}]
${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
}
python_install_all() {
USE_SETUPTOOLS=1 distutils-r1_python_install_all
for s in minion master syndic; 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"
}
