commit: 2971aabba7edfc2e273fab67ff770bae53dcde70
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 17:17:14 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 9 17:58:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2971aabb
app-admin/salt: updating for msgpack rename (from msgpack-python)
Package-Manager: Portage-2.3.19, Repoman-2.3.6
...t-2016.11.9.ebuild => salt-2016.11.8-r1.ebuild} | 3 +
...t-2016.11.8.ebuild => salt-2016.11.9-r1.ebuild} | 5 +-
...-2017.7.2-r1.ebuild => salt-2017.7.2-r2.ebuild} | 4 +-
app-admin/salt/salt-2017.7.2.ebuild | 140 ---------------------
...alt-2017.7.4.ebuild => salt-2017.7.4-r1.ebuild} | 2 +
5 files changed, 12 insertions(+), 142 deletions(-)
diff --git a/app-admin/salt/salt-2016.11.9.ebuild
b/app-admin/salt/salt-2016.11.8-r1.ebuild
similarity index 98%
rename from app-admin/salt/salt-2016.11.9.ebuild
rename to app-admin/salt/salt-2016.11.8-r1.ebuild
index c1e250c48bf..9376c048826 100644
--- a/app-admin/salt/salt-2016.11.9.ebuild
+++ b/app-admin/salt/salt-2016.11.8-r1.ebuild
@@ -105,6 +105,9 @@ python_prepare() {
# seriously? "ValueError: Missing (or not readable) key file:
'/home/dany/PRIVKEY.pem'"
rm tests/unit/cloud/clouds/gce_test.py || die
+
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {
diff --git a/app-admin/salt/salt-2016.11.8.ebuild
b/app-admin/salt/salt-2016.11.9-r1.ebuild
similarity index 97%
rename from app-admin/salt/salt-2016.11.8.ebuild
rename to app-admin/salt/salt-2016.11.9-r1.ebuild
index e68adad560f..9376c048826 100644
--- a/app-admin/salt/salt-2016.11.8.ebuild
+++ b/app-admin/salt/salt-2016.11.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -105,6 +105,9 @@ python_prepare() {
# seriously? "ValueError: Missing (or not readable) key file:
'/home/dany/PRIVKEY.pem'"
rm tests/unit/cloud/clouds/gce_test.py || die
+
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {
diff --git a/app-admin/salt/salt-2017.7.2-r1.ebuild
b/app-admin/salt/salt-2017.7.2-r2.ebuild
similarity index 97%
rename from app-admin/salt/salt-2017.7.2-r1.ebuild
rename to app-admin/salt/salt-2017.7.2-r2.ebuild
index 88f1dd3f811..19e8be7ea3d 100644
--- a/app-admin/salt/salt-2017.7.2-r1.ebuild
+++ b/app-admin/salt/salt-2017.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -95,6 +95,8 @@ python_prepare() {
rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {
diff --git a/app-admin/salt/salt-2017.7.2.ebuild
b/app-admin/salt/salt-2017.7.2.ebuild
deleted file mode 100644
index 48c9f23243a..00000000000
--- a/app-admin/salt/salt-2017.7.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd distutils-r1
-
-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 neutron
nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq
vim-syntax"
-
-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}]
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
- openssl? (
- dev-libs/openssl:*[-bindist]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- zeromq? (
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- portage? ( sys-apps/portage[${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}] )
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
- vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-salt[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/timelib[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
- ${RDEPEND}
- )"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-)
-
-python_prepare() {
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
- rm tests/unit/states/test_boto_vpc.py || die
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-}
-
-python_test() {
- local tempdir
- # testsuite likes lots of files
- ulimit -n 3072 || die
-
- # ${T} is too long a path for the tests to work
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
- mkdir "${T}/$(basename "${tempdir}")"
- mkdir
"${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
- (
- cleanup() {
- rm -f "${tempdir}"
- rmdir
"${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
- }
-
- trap cleanup EXIT
-
- addwrite "${tempdir}"
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename
"${tempdir}")")" "${tempdir}"
-
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \
- TMPDIR="${tempdir}" \
- ${EPYTHON} tests/runtests.py \
- --unit-tests --no-report --verbose
-
- ) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2017.7.4.ebuild
b/app-admin/salt/salt-2017.7.4-r1.ebuild
similarity index 98%
rename from app-admin/salt/salt-2017.7.4.ebuild
rename to app-admin/salt/salt-2017.7.4-r1.ebuild
index 6dd2b29b185..0060f77cfd5 100644
--- a/app-admin/salt/salt-2017.7.4.ebuild
+++ b/app-admin/salt/salt-2017.7.4-r1.ebuild
@@ -97,6 +97,8 @@ python_prepare() {
rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
rm tests/unit/states/test_boto_vpc.py || die
rm tests/unit/modules/test_kubernetes.py || die
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
}
python_install_all() {
