summaryrefslogtreecommitdiff
path: root/app-admin/salt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-21 17:32:00 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-21 17:32:00 +0100
commit61f10f985e19dfe20a4d9552902625edd5b6eabb (patch)
tree50db31971b38c4e0358253ef5005058a46fc773e /app-admin/salt
parent34dea8e38f88007799629d0a56b12dec480b1d21 (diff)
gentoo resync : 21.06.2021
Diffstat (limited to 'app-admin/salt')
-rw-r--r--app-admin/salt/Manifest2
-rw-r--r--app-admin/salt/salt-3003-r1.ebuild5
2 files changed, 4 insertions, 3 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 2ac13497ecff..6f3db749591c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -37,5 +37,5 @@ EBUILD salt-3000.8-r1.ebuild 6607 BLAKE2B 836d773a15e113447bddc988f783ad1ebdcbf1
EBUILD salt-3000.9-r1.ebuild 6649 BLAKE2B 66677b3408322036e59bd64f3f0c64bffa916079e40c08273ad326191fe57962846b862933b1319cdbba81077a26c3e7569796205d7ac7ce89068feb32b283b0 SHA512 8f2095fc664c4d92c0a1ef2d250e70e25ab1468185466644c51d15ecfdd6f393919b6f9a18a1b1d46701ab839ebcb851360477e19f942223245bbf98bafbba94
EBUILD salt-3001.6-r1.ebuild 6230 BLAKE2B 2d426df7b28e4f24bd7bcf79bc6a641816e04c58189e69a9b90e367d859d8238eab992a5c2366bf0b91f2e6880b0c67b586fd3df9ddd49cbce06d54bddefeb83 SHA512 db15971b900f13c27f9e61d954562e67de3d9bdc14420cf22460a41ab528f96ea5cbb1703828b73478998f62015be56ae08b69b30d5ebe511fa533f1b01c0584
EBUILD salt-3002.5-r1.ebuild 6266 BLAKE2B 48c7fb0bd4b5dad34c7c998a4083bf9a34d1413bd1e62c9018906c6fde58bfe97da696b235534bf96ef9a6e1e9c4c2f89262ed6859a88d21b73f50a370f5ecc1 SHA512 8e06b18090a9fa3624e5d9677efbf42d5286f3118d39f22cee8c99ae093f09fc5bb2faa4bab4bf51bdb12b1403632ccf22da49146aac2203d57d754def6ad5db
-EBUILD salt-3003-r1.ebuild 6550 BLAKE2B 68fbc98b0101f15fa0d69ee0e9a7d6f1066a64cc53d5045e207798b7822c27c0964b65748917febd1f0fb87b048966d277fba7f5d0ddcef161a6a25e55659b63 SHA512 66e14cb783a970b61df81652883f69cb95407c094e9aaa70091619ba4c425bfc80845a31fd778c928ffab93954df2a8e152c00932e8c8b020a01f199fe7721cb
+EBUILD salt-3003-r1.ebuild 6566 BLAKE2B 1390e1fe90572ddae6755496cf76d433e652d5279b57d9a73617d779ccdc16ed799855f9be4422cb8aea4c1da090f9769dcb9e391183a35ca9e22b890fed9b19 SHA512 01f6716f24f4a97142aa37fdb37dac3b49dc67aaef6f41352489043d77692ae2ef4a5f5c71c1aed3754b04ddc29b1156b1e2923756f4db7bc27d0b645ee3b6e1
MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild
index 0c3832ff8ad9..19b06ebd0227 100644
--- a/app-admin/salt/salt-3003-r1.ebuild
+++ b/app-admin/salt/salt-3003-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="Apache-2.0"
@@ -56,6 +56,7 @@ RDEPEND="
)
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+ genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
@@ -119,6 +120,7 @@ python_prepare_all() {
rm -r tests/integration/cloud || die
rm -r tests/kitchen/tests/wordpress/tests || die
rm tests/kitchen/test_kitchen.py || die
+ rm tests/unit/modules/test_network.py || die
# tests require root access
rm tests/integration/pillar/test_git_pillar.py || die
@@ -126,7 +128,6 @@ python_prepare_all() {
rm tests/pytests/unit/client/test_ssh.py || die
# make sure pkg_resources doesn't bomb because pycrypto isn't installed
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed
find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
# pycryptodome rather than pycryptodomex
find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die