| 1 |
chutzpah 14/07/08 21:45:21 |
| 2 |
|
| 3 |
Modified: salt-9999.ebuild ChangeLog |
| 4 |
Added: salt-2014.1.6.ebuild |
| 5 |
Log: |
| 6 |
Version bump. Add requests dep to 9999 ebuild (bug #516708). |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.11 app-admin/salt/salt-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.11&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?rev=1.11&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-9999.ebuild?r1=1.10&r2=1.11 |
| 16 |
|
| 17 |
Index: salt-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v |
| 20 |
retrieving revision 1.10 |
| 21 |
retrieving revision 1.11 |
| 22 |
diff -u -r1.10 -r1.11 |
| 23 |
--- salt-9999.ebuild 13 Jun 2014 01:23:37 -0000 1.10 |
| 24 |
+++ salt-9999.ebuild 8 Jul 2014 21:45:21 -0000 1.11 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.10 2014/06/13 01:23:37 chutzpah Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.11 2014/07/08 21:45:21 chutzpah Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
@@ -34,6 +34,7 @@ |
| 34 |
dev-python/pycryptopp[${PYTHON_USEDEP}] |
| 35 |
dev-python/jinja[${PYTHON_USEDEP}] |
| 36 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 37 |
+ dev-python/requests[${PYTHON_USEDEP}] |
| 38 |
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
| 39 |
sys-apps/pciutils |
| 40 |
mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
| 41 |
@@ -51,6 +52,7 @@ |
| 42 |
DEPEND="test? ( |
| 43 |
dev-python/pip |
| 44 |
dev-python/virtualenv |
| 45 |
+ dev-python/timelib |
| 46 |
>=dev-python/SaltTesting-2014.4.24 |
| 47 |
${RDEPEND} |
| 48 |
)" |
| 49 |
@@ -58,6 +60,9 @@ |
| 50 |
|
| 51 |
python_prepare() { |
| 52 |
sed -i '/install_requires=/ d' setup.py || die "sed failed" |
| 53 |
+ |
| 54 |
+ # this test fails because it trys to "pip install distribute" |
| 55 |
+ rm tests/unit/{modules,states}/zcbuildout_test.py |
| 56 |
} |
| 57 |
|
| 58 |
python_install_all() { |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.40 app-admin/salt/ChangeLog |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.40&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?rev=1.40&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/ChangeLog?r1=1.39&r2=1.40 |
| 67 |
|
| 68 |
Index: ChangeLog |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v |
| 71 |
retrieving revision 1.39 |
| 72 |
retrieving revision 1.40 |
| 73 |
diff -u -r1.39 -r1.40 |
| 74 |
--- ChangeLog 19 Jun 2014 01:34:13 -0000 1.39 |
| 75 |
+++ ChangeLog 8 Jul 2014 21:45:21 -0000 1.40 |
| 76 |
@@ -1,6 +1,12 @@ |
| 77 |
# ChangeLog for app-admin/salt |
| 78 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 79 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.39 2014/06/19 01:34:13 chutzpah Exp $ |
| 80 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.40 2014/07/08 21:45:21 chutzpah Exp $ |
| 81 |
+ |
| 82 |
+*salt-2014.1.6 (08 Jul 2014) |
| 83 |
+ |
| 84 |
+ 08 Jul 2014; Patrick McLean <chutzpah@g.o> +salt-2014.1.6.ebuild, |
| 85 |
+ salt-9999.ebuild: |
| 86 |
+ Version bump. Add requests dep to 9999 ebuild (bug #516708). |
| 87 |
|
| 88 |
*salt-2014.1.5-r1 (19 Jun 2014) |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.1 app-admin/salt/salt-2014.1.6.ebuild |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.6.ebuild?rev=1.1&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/salt/salt-2014.1.6.ebuild?rev=1.1&content-type=text/plain |
| 97 |
|
| 98 |
Index: salt-2014.1.6.ebuild |
| 99 |
=================================================================== |
| 100 |
# Copyright 1999-2014 Gentoo Foundation |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.6.ebuild,v 1.1 2014/07/08 21:45:21 chutzpah Exp $ |
| 103 |
|
| 104 |
EAPI=5 |
| 105 |
|
| 106 |
PYTHON_COMPAT=(python{2_6,2_7}) |
| 107 |
|
| 108 |
inherit eutils distutils-r1 systemd |
| 109 |
|
| 110 |
DESCRIPTION="Salt is a remote execution and configuration manager." |
| 111 |
HOMEPAGE="http://saltstack.org/" |
| 112 |
|
| 113 |
if [[ ${PV} == 9999* ]]; then |
| 114 |
inherit git-2 |
| 115 |
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
| 116 |
EGIT_BRANCH="develop" |
| 117 |
SRC_URI="" |
| 118 |
KEYWORDS="" |
| 119 |
else |
| 120 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
| 121 |
KEYWORDS="~x86 ~amd64" |
| 122 |
fi |
| 123 |
|
| 124 |
LICENSE="Apache-2.0" |
| 125 |
SLOT="0" |
| 126 |
IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test" |
| 127 |
|
| 128 |
RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
| 129 |
dev-python/msgpack[${PYTHON_USEDEP}] |
| 130 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
| 131 |
dev-python/m2crypto[${PYTHON_USEDEP}] |
| 132 |
dev-python/pycrypto[${PYTHON_USEDEP}] |
| 133 |
dev-python/pycryptopp[${PYTHON_USEDEP}] |
| 134 |
dev-python/jinja[${PYTHON_USEDEP}] |
| 135 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 136 |
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
| 137 |
sys-apps/pciutils |
| 138 |
mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
| 139 |
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
| 140 |
openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
| 141 |
libvirt? ( || ( |
| 142 |
dev-python/libvirt-python[${PYTHON_USEDEP}] |
| 143 |
app-emulation/libvirt[python,${PYTHON_USEDEP}] |
| 144 |
) |
| 145 |
) |
| 146 |
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
| 147 |
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
| 148 |
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
| 149 |
timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )" |
| 150 |
DEPEND="test? ( |
| 151 |
dev-python/pip |
| 152 |
dev-python/virtualenv |
| 153 |
dev-python/timelib |
| 154 |
>=dev-python/SaltTesting-2014.4.24 |
| 155 |
${RDEPEND} |
| 156 |
)" |
| 157 |
|
| 158 |
PATCHES=( |
| 159 |
"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch" |
| 160 |
"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch" |
| 161 |
"${FILESDIR}/${PN}-2014.1.5-minion-error.patch" |
| 162 |
) |
| 163 |
DOCS=(README.rst AUTHORS) |
| 164 |
|
| 165 |
python_prepare() { |
| 166 |
sed -i '/install_requires=/ d' setup.py || die "sed failed" |
| 167 |
|
| 168 |
# this test fails because it trys to "pip install distribute" |
| 169 |
rm tests/unit/{modules,states}/zcbuildout_test.py |
| 170 |
} |
| 171 |
|
| 172 |
python_install_all() { |
| 173 |
USE_SETUPTOOLS=1 distutils-r1_python_install_all |
| 174 |
|
| 175 |
for s in minion master syndic; do |
| 176 |
newinitd "${FILESDIR}"/${s}-initd-3 salt-${s} |
| 177 |
newconfd "${FILESDIR}"/${s}-confd-1 salt-${s} |
| 178 |
systemd_dounit "${FILESDIR}"/salt-${s}.service |
| 179 |
done |
| 180 |
|
| 181 |
insinto /etc/${PN} |
| 182 |
doins conf/* |
| 183 |
} |
| 184 |
|
| 185 |
python_test() { |
| 186 |
# testsuite likes lots of files |
| 187 |
ulimit -n 3072 |
| 188 |
USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die |
| 189 |
} |
Archives