From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- app-admin/salt/Manifest | 12 +-- app-admin/salt/salt-3000.8-r1.ebuild | 2 +- app-admin/salt/salt-3000.9-r1.ebuild | 2 +- app-admin/salt/salt-3001.6-r1.ebuild | 2 +- app-admin/salt/salt-3002.5-r1.ebuild | 2 +- app-admin/salt/salt-3003-r1.ebuild | 2 +- app-admin/salt/salt-3003.1-r1.ebuild | 201 +++++++++++++++++++++++++++++++++++ app-admin/salt/salt-3003.1.ebuild | 198 ---------------------------------- 8 files changed, 212 insertions(+), 209 deletions(-) create mode 100644 app-admin/salt/salt-3003.1-r1.ebuild delete mode 100644 app-admin/salt/salt-3003.1.ebuild (limited to 'app-admin/salt') diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 618cd5e7d3b4..4d8b38487ffa 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -35,10 +35,10 @@ DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12 DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1 DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 -EBUILD salt-3000.8-r1.ebuild 6607 BLAKE2B 836d773a15e113447bddc988f783ad1ebdcbf1c434e5c16d490c3a65bb60b70d76d4ed550408fa34bde0d38d992ff8b1173e1c61b03e508886689c1ec2c0812c SHA512 f4a0c7a3a951a8d98f3240800cbdb61d2c19ce6229641b36dfdd9b81808918bdbe3265c9db6c8d6f70eef023000358d73a72507ac9314c87e300414821bbbe8d -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 6566 BLAKE2B 1390e1fe90572ddae6755496cf76d433e652d5279b57d9a73617d779ccdc16ed799855f9be4422cb8aea4c1da090f9769dcb9e391183a35ca9e22b890fed9b19 SHA512 01f6716f24f4a97142aa37fdb37dac3b49dc67aaef6f41352489043d77692ae2ef4a5f5c71c1aed3754b04ddc29b1156b1e2923756f4db7bc27d0b645ee3b6e1 -EBUILD salt-3003.1.ebuild 6678 BLAKE2B fe0015562b80785d745d2025d561f150aba7e0199f3d356573bb95e71dffca7c3b0db1f9cdbdbb0c3482df726b55f7010aee9471ad6d7d9cf34a7a9856951ee1 SHA512 78c63b69c41db96fb7ce3b40949bfa178b7faff880939606a3ec6c5bba3cdfe5e155017d05fe484b9afb037dca8eba9c29ddf05e8ca094512025f01eec099a90 +EBUILD salt-3000.8-r1.ebuild 6619 BLAKE2B edeb4e38aab16c71206a6fea80e6e72d89659e427af66961235a854368ee785963a4cf1800cb4a725722fd433a56349b4e5fbb58626ee563c489de2c1b4fbc13 SHA512 439fca4963d8ec8f840c4fc2a3d49c04256ba53ef4f222887188b3c877bd0cdbbe24a081bfbcf75d02a5a6e39c0544bbb634fc6aacf850983825549b84cf372d +EBUILD salt-3000.9-r1.ebuild 6661 BLAKE2B 0234da9585d1606983d13022f59878394d47d4b3389655568164d22a45f1de52af53c8f1ff9978f4c41abc2c3531d1a25687ed7300011fb9372756836093e8c4 SHA512 08d14c253e18b99cd85b07ae3eaa1f5161881badf4fb9a744093704b5f3da1f693a81f415c6a95360bd3c54762657a3be549a45f4f3c9743d6e893f8c6482b6d +EBUILD salt-3001.6-r1.ebuild 6242 BLAKE2B 570ba5f2830435467db7eb562c58f3f45199b2519ce0f88eee298e66b3b05a9d5f111dc399709bc70e97d6c109275a676dcb2b8fb0a3eeb55fffb4a053974ce2 SHA512 06a37ac98911040244f18b562affe9732315ed8feb0944f00a5c82e31061966d173cc33e138be8ce852da755532e436742f778130c5a61aa9e38b966e8d2c811 +EBUILD salt-3002.5-r1.ebuild 6273 BLAKE2B e9768ac7fcd7a11c6c05bf8b9900428af79aa63cd1332208ec15295cfc769945bf77e16afaa696e26efbdcba525df1ab520838bffce7319470a742133544a759 SHA512 ceee568eba9776ccb8bacbabf914899f1bd4d27fdcc777a2296b046169601cdb269c2e32e2dba7d052dc780a5990e0d1deb5dee2c4180f6383ea9a45922e33c5 +EBUILD salt-3003-r1.ebuild 6578 BLAKE2B 3741769a693c4d2bd6868c0cd3ef47697e25a97675336c08c2af482702d48c43e6a54ed71092f1ba754c52938533d8dc8a94e6f5e678c77419824b2b51e04924 SHA512 c5bb47ee8a74e07bae14a368ad48f7ae5906a738ee04a48c4d2efea32f6cf65475e1d4db4107d61fd9fd267cf105d36a682171ae4af4745eed51e587a78514a7 +EBUILD salt-3003.1-r1.ebuild 6810 BLAKE2B a66ce2731f94e3a870a0ffb5ba0e2627a7c6cf345009b33b1095bd3e7439fb12450abc2d9aa858106bf590cceb198fbe449dd50b32e3bb2214bb96e9bc560309 SHA512 009ab916c2f44a7e99bc5fbc1e50709a361eaf395d26babadf88f5e05322a0b44596911cbd310fc4089928fbc1f100923b274307f759d169a40c604c6b377a31 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5 diff --git a/app-admin/salt/salt-3000.8-r1.ebuild b/app-admin/salt/salt-3000.8-r1.ebuild index 986ee5e8b93e..13ed8d22824d 100644 --- a/app-admin/salt/salt-3000.8-r1.ebuild +++ b/app-admin/salt/salt-3000.8-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3000.9-r1.ebuild b/app-admin/salt/salt-3000.9-r1.ebuild index 876a4b185475..5be41e9acbe2 100644 --- a/app-admin/salt/salt-3000.9-r1.ebuild +++ b/app-admin/salt/salt-3000.9-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3001.6-r1.ebuild b/app-admin/salt/salt-3001.6-r1.ebuild index 69dcc1cddbd0..e6a695ff300f 100644 --- a/app-admin/salt/salt-3001.6-r1.ebuild +++ b/app-admin/salt/salt-3001.6-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 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3002.5-r1.ebuild b/app-admin/salt/salt-3002.5-r1.ebuild index 91a7919ea18b..45c6151ec8e8 100644 --- a/app-admin/salt/salt-3002.5-r1.ebuild +++ b/app-admin/salt/salt-3002.5-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 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild index 19b06ebd0227..0d4ef8fc9027 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 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/app-admin/salt/salt-3003.1-r1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild new file mode 100644 index 000000000000..5c542bc2bd47 --- /dev/null +++ b/app-admin/salt/salt-3003.1-r1.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="https://www.saltstack.com/resources/community/ + https://github.com/saltstack" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako + mongodb neutron nova openssl portage profile redis selinux test raet + +zeromq vim-syntax" + +RDEPEND=" + sys-apps/pciutils + >=dev-python/distro-1.5[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.9.8[${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}] + >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] + dev-python/watchdog[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( + $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) + ) + openssl? ( + dev-libs/openssl:0=[-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}] + ) + 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}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + nova? ( + $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) + ) + neutron? ( + $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) + ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim ) + zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) +" +BDEPEND=" + test? ( + ${RDEPEND} + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] + dev-python/mako[${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/psutil[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-subtests[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/libcloud[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq ) + test? ( cheetah genshi )" +RESTRICT="!test? ( test ) x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" + "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" + "${FILESDIR}/salt-3002-tests.patch" + "${FILESDIR}/salt-3003-tests.patch" + "${FILESDIR}/salt-3003.1-tests.patch" +) + +python_prepare_all() { + # remove tests with external dependencies that may not be available, and + # tests that don't work in sandbox + rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die + rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die + rm tests/unit/states/test_boto_vpc.py || die + rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die + rm tests/pytests/functional/transport/server/test_req_channel.py || die + + # tests that require network access + rm tests/unit/{states,modules}/test_zcbuildout.py || die + 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 + rm tests/integration/states/test_supervisord.py || die + rm tests/pytests/unit/client/test_ssh.py || die + + # 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 + + distutils-r1_python_prepare_all +} + +python_prepare() { + einfo "Fixing collections.abc warnings for ${EPYTHON}" + local abc + abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die + find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || 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-5 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + # testsuite likes lots of files + ulimit -n 4096 || die + + # ${T} is too long a path for the tests to work + local TMPDIR + TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" + ( + export TMPDIR + cleanup() { rm -rf "${TMPDIR}" || die; } + + trap cleanup EXIT + + addwrite "${TMPDIR}" + + USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ + "${EPYTHON}" -m pytest -vv \ + || die "testing failed with ${EPYTHON}" + ) +} + +pkg_postinst() { + if use python_targets_python3_8; then + if use nova; then + ewarn "Salt's nova functionality will not work with python3.8 since" + ewarn "dev-python/python-novaclient does not support it yet" + fi + if use neutron; then + ewarn "Salt's neutron functionality will not work with python3.8 since" + ewarn "dev-python/python-neutronclient does not support it yet" + fi + if use libvirt; then + ewarn "Salt's libvirt functionality will not work with python3.8 since" + ewarn "dev-python/libvirt-python does not support it yet" + fi + fi +} diff --git a/app-admin/salt/salt-3003.1.ebuild b/app-admin/salt/salt-3003.1.ebuild deleted file mode 100644 index fe9927cb4610..000000000000 --- a/app-admin/salt/salt-3003.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://www.saltstack.com/resources/community/ - https://github.com/saltstack" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako - mongodb neutron nova openssl portage profile redis selinux test raet - +zeromq vim-syntax" - -RDEPEND=" - sys-apps/pciutils - >=dev-python/distro-1.5[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/libnacl[${PYTHON_USEDEP}] - >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.9.8[${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}] - >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( - $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) - ) - openssl? ( - dev-libs/openssl:0=[-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}] - ) - 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}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - nova? ( - $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) - ) - neutron? ( - $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) - ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim ) - zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) -" -BDEPEND=" - test? ( - ${RDEPEND} - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] - dev-python/mako[${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/psutil[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/libcloud[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -PATCHES=( - "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3003-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" -) - -python_prepare_all() { - # remove tests with external dependencies that may not be available, and - # tests that don't work in sandbox - rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die - rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die - rm tests/unit/states/test_boto_vpc.py || die - rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die - rm tests/pytests/functional/transport/server/test_req_channel.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - 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 - rm tests/integration/states/test_supervisord.py || die - rm tests/pytests/unit/client/test_ssh.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_prepare() { - einfo "Fixing collections.abc warnings for ${EPYTHON}" - local abc - abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die - find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || 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-5 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - # testsuite likes lots of files - ulimit -n 4096 || die - - # ${T} is too long a path for the tests to work - local TMPDIR - TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" - ( - export TMPDIR - cleanup() { rm -rf "${TMPDIR}" || die; } - - trap cleanup EXIT - - addwrite "${TMPDIR}" - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - "${EPYTHON}" -m pytest -vv \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - if use python_targets_python3_8; then - if use nova; then - ewarn "Salt's nova functionality will not work with python3.8 since" - ewarn "dev-python/python-novaclient does not support it yet" - fi - if use neutron; then - ewarn "Salt's neutron functionality will not work with python3.8 since" - ewarn "dev-python/python-neutronclient does not support it yet" - fi - if use libvirt; then - ewarn "Salt's libvirt functionality will not work with python3.8 since" - ewarn "dev-python/libvirt-python does not support it yet" - fi - fi -} -- cgit v1.2.3