From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1166321-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E4CF138350 for <garchives@archives.gentoo.org>; Wed, 29 Apr 2020 20:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86AD5E08F5; Wed, 29 Apr 2020 20:30:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D5B4E08F5 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Apr 2020 20:30:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADB7534E896 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Apr 2020 20:30:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54D031F9 for <gentoo-commits@lists.gentoo.org>; Wed, 29 Apr 2020 20:30:30 +0000 (UTC) From: "Patrick McLean" <chutzpah@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" <chutzpah@gentoo.org> Message-ID: <1588192223.c32701f5ba99dea51f816df0980cf0fe67f6cfa8.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/Manifest app-admin/salt/salt-2019.2.3.ebuild app-admin/salt/salt-2019.2.4.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: c32701f5ba99dea51f816df0980cf0fe67f6cfa8 X-VCS-Branch: master Date: Wed, 29 Apr 2020 20:30:30 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b1ec7ad-f94d-4608-923e-9dee4dd45371 X-Archives-Hash: 705b29cd5377fbf5bf85f279b464e675 commit: c32701f5ba99dea51f816df0980cf0fe67f6cfa8 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Wed Apr 29 20:30:14 2020 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Wed Apr 29 20:30:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32701f5 app-admin/salt-2019.2.4: Version bump Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> app-admin/salt/Manifest | 2 +- .../{salt-2019.2.3.ebuild => salt-2019.2.4.ebuild} | 43 +++++++++++----------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index bf06df6f8c2..f5cc57ada94 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,2 +1,2 @@ DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b -DIST salt-2019.2.3.tar.gz 14572686 BLAKE2B 770b815f43ca8651408c1c057377b02c8037e673584c719e0a9b5c56c13c8db2db0e2c8641a17323f2b890d4a69d1508b0090624c7067869d9fa84303c2f8585 SHA512 cd694ca19696a84e3370e39c61da180e508592253713d99dd6dd5342b57c2814fee22e46bade30d7604f5730d9e1a736e59c3a512161f744d3f097f74a2836c5 +DIST salt-2019.2.4.tar.gz 14572556 BLAKE2B a1057baa5ab6c0a07f34ce658a1d5bc644f968600663d28d084eb712b55faaee93b8410d81c4b5324944e6e1f2067ffb102200088832e1b0076fed78c8542ae6 SHA512 9e621cbd78ead1060a2b0c07e7ef02e8c4590360a95c51ac29fa8c1add34f617e4407dd28b67cae3b0fd68b333782185edcf1159edd2db08e8b4e79b6b07a63f diff --git a/app-admin/salt/salt-2019.2.3.ebuild b/app-admin/salt/salt-2019.2.4.ebuild similarity index 90% rename from app-admin/salt/salt-2019.2.3.ebuild rename to app-admin/salt/salt-2019.2.4.ebuild index c6961f4ebef..37adb4ff1a4 100644 --- a/app-admin/salt/salt-2019.2.3.ebuild +++ b/app-admin/salt/salt-2019.2.4.ebuild @@ -3,8 +3,8 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) - -inherit eutils systemd distutils-r1 +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit systemd distutils-r1 DESCRIPTION="Salt is a remote execution and configuration manager" HOMEPAGE="https://www.saltstack.com/resources/community/ @@ -23,13 +23,15 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova" -IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova + openssl portage profile redis selinux test raet +zeromq vim-syntax" -RDEPEND="sys-apps/pciutils +RDEPEND=" + sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] dev-python/libnacl[${PYTHON_USEDEP}] >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + <dev-python/msgpack-1.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] @@ -64,22 +66,22 @@ RDEPEND="sys-apps/pciutils 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}] +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] test? ( - >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-catchlog[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${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} )" @@ -131,20 +133,17 @@ python_test() { 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 - } + cleanup() { rm -f "${tempdir}" || die; } trap cleanup EXIT addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die USE_SETUPTOOLS=1 SHELL="/bin/bash" \ TMPDIR="${tempdir}" \ ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" + --unit-tests --no-report --verbose \ + || die "testing failed with ${EPYTHON}" + ) }