chutzpah 14/06/13 01:23:37
Modified: salt-9999.ebuild ChangeLog
Added: salt-2014.1.5.ebuild
Removed: salt-2014.1.4.ebuild salt-2014.1.3.ebuild
salt-2014.1.1.ebuild
Log:
Version bump, clean out old versions. Update 9999 ebuild, don't try to keep
on-root tests working in the 9999.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.10 app-admin/salt/salt-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?r1=1.9&r2=1.10
Index: salt-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- salt-9999.ebuild 27 Feb 2014 00:02:32 -0000 1.9
+++ salt-9999.ebuild 13 Jun 2014 01:23:37 -0000 1.10
@@ -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-9999.ebuild,v 1.9
2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.10
2014/06/13 01:23:37 chutzpah Exp $
EAPI=5
@@ -24,7 +24,7 @@
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis timelib test"
+IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
dev-python/msgpack[${PYTHON_USEDEP}]
@@ -34,7 +34,7 @@
dev-python/pycryptopp[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.0[${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}] )
@@ -51,11 +51,9 @@
DEPEND="test? (
dev-python/pip
dev-python/virtualenv
- dev-python/SaltTesting
+ >=dev-python/SaltTesting-2014.4.24
${RDEPEND}
)"
-
-PATCHES=("${FILESDIR}/${PN}-0.17.1-tests-nonroot.patch")
DOCS=(README.rst AUTHORS)
python_prepare() {
1.38 app-admin/salt/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.38&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.38&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?r1=1.37&r2=1.38
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ChangeLog 6 May 2014 01:09:30 -0000 1.37
+++ ChangeLog 13 Jun 2014 01:23:37 -0000 1.38
@@ -1,6 +1,14 @@
# 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.37 2014/05/06
01:09:30 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.38 2014/06/13
01:23:37 chutzpah Exp $
+
+*salt-2014.1.5 (13 Jun 2014)
+
+ 13 Jun 2014; Patrick McLean <[email protected]> -salt-2014.1.1.ebuild,
+ -salt-2014.1.3.ebuild, -salt-2014.1.4.ebuild, +salt-2014.1.5.ebuild,
+ salt-9999.ebuild, +files/salt-2014.1.5-tests-nonroot.patch:
+ Version bump, clean out old versions. Update 9999 ebuild, don't try to keep
+ non-root tests working in the 9999.
*salt-2014.1.4 (06 May 2014)
1.1 app-admin/salt/salt-2014.1.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.5.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.5.ebuild?rev=1.1&content-type=text/plain
Index: salt-2014.1.5.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.1.5.ebuild,v 1.1
2014/06/13 01:23:37 chutzpah Exp $
EAPI=5
PYTHON_COMPAT=(python{2_6,2_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-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 libcloud libvirt mako mongodb mysql openssl redis timelib test"
RDEPEND=">=dev-python/pyzmq-2.2.0[${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}]
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/SaltTesting-2014.4.24
${RDEPEND}
)"
PATCHES=(
"${FILESDIR}/${P}-tests-nonroot.patch"
"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
)
DOCS=(README.rst AUTHORS)
python_prepare() {
sed -i '/install_requires=/ d' setup.py || die "sed failed"
# 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 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
}
