commit: 33e6c2a4792091af99d7af68f77e7f5486f926ed
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 10 11:34:49 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 10 11:38:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e6c2a4
app-admin/salt: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-admin/salt/Manifest | 2 -
.../salt/files/salt-3005.1-no-entry-points.patch | 13 -
app-admin/salt/metadata.xml | 1 -
app-admin/salt/salt-3006.7-r1.ebuild | 357 ------------------
app-admin/salt/salt-3006.9-r2.ebuild | 409 ---------------------
5 files changed, 782 deletions(-)
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 7955dd917cf6..8d812b32b245 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,4 +1,2 @@
-DIST salt-3006.7.tar.gz 20562663 BLAKE2B
b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729
SHA512
9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d
-DIST salt-3006.9.tar.gz 19691113 BLAKE2B
f08dfef58273cef809e4aa954d348b282967affa85e4b2814bb539c41bfcecde29e5a903ed14786b353262e31212c3d581550ac031b5c4866453bec398d5ae88
SHA512
96385f505363645d958c3a05f3d50b240f6c750b28e4a11b419c08ec152fc9a66930e555beeba282ef463986f4b570f6dda1ad944aefd14d4cce586a9f1741e1
DIST salt-3007.0.tar.gz 20304228 BLAKE2B
3db95ce779cfd08d61536dcfb4ff6ac31788ad1d6d4665b640dcc430f5a33847f231f94fd574c5d8df7b14e2854511c80610a37cd19be5429c4643be8bd9e0eb
SHA512
0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b
DIST salt-3007.1.tar.gz 19401831 BLAKE2B
ea8c89a24991467367dc0c50e3d2f864e2f6211ba9a71195d6308a86df16229fc77baa2ec837f043ebad36d9d7a6673fefa3a1a826472d900925e657e2152718
SHA512
732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b
diff --git a/app-admin/salt/files/salt-3005.1-no-entry-points.patch
b/app-admin/salt/files/salt-3005.1-no-entry-points.patch
deleted file mode 100644
index 5d1da8f751e4..000000000000
--- a/app-admin/salt/files/salt-3005.1-no-entry-points.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index bd11ff95f7..3b83f7b6ff 100755
---- a/setup.py
-+++ b/setup.py
-@@ -1173,7 +1173,7 @@ class SaltDistribution(distutils.dist.Distribution):
- return scripts
-
- @property
-- def _property_entry_points(self):
-+ def _property_entry_points_disabled(self):
- entrypoints = {
- "pyinstaller40": [
- "hook-dirs = salt.utils.pyinstaller:get_hook_dirs",
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index e3b53caae59a..1e471042c307 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -31,7 +31,6 @@ backbone of cloud and data center management.
<flag name="mongodb">Support returning data to a mongodb server.</flag>
<flag name="neutron">Support the OpenStack neutron network service.</flag>
<flag name="nova">Enable support for the OpenStack Nova API</flag>
- <flag name="openssl">Add support for using TLS via OpenSSL.</flag>
<flag name="portage">Add support for package state enforcement using
<pkg>sys-apps/portage</pkg></flag>
<flag name="raet">Add support for the new RAET transport.</flag>
<flag name="redis">Support returning data to a redis database.</flag>
diff --git a/app-admin/salt/salt-3006.7-r1.ebuild
b/app-admin/salt/salt-3006.7-r1.ebuild
deleted file mode 100644
index 746bc69b6f9f..000000000000
--- a/app-admin/salt/salt-3006.7-r1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_11 )
-
-DISTUTILS_USE_PEP517=setuptools
-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="https://github.com/${PN}stack/${PN}.git";
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="amd64 ~riscv ~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/cryptography-41.0.3[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${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:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${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-3.2.2[${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[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- 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 )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- app-arch/zip
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- >=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/cherrypy[${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-2.0.0[${PYTHON_USEDEP}]
- <dev-python/moto-5[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
- test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
-)
-
-python_prepare_all() {
- local -a remove_test_files=(
- # remove tests with external dependencies that may not be
available, and
- # tests that don't work in sandbox
- tests/pytests/functional/modules/file/test_readlink.py
- tests/pytests/functional/modules/file/test_symlink.py
- tests/pytests/functional/modules/state/test_jinja_filters.py
- tests/pytests/functional/modules/state/test_jinja_renderer.py
- tests/pytests/functional/modules/state/test_mako_renderer.py
-
tests/pytests/functional/modules/state/test_pyobjects_renderer.py
- tests/pytests/functional/pillar/test_gpg.py
- tests/pytests/functional/runners/test_winrepo.py
- tests/pytests/functional/states/file/test_keyvalue.py
- tests/pytests/functional/states/file/test_patch.py
- tests/pytests/functional/transport/server/test_req_channel.py
- tests/pytests/functional/utils/test_async_event_publisher.py
- tests/pytests/integration/master/test_clear_funcs.py
- tests/pytests/integration/minion/test_reauth.py
- tests/pytests/integration/modules/test_cmdmod.py
- tests/pytests/integration/modules/test_jinja.py
- tests/pytests/integration/returners/test_noop_return.py
- tests/pytests/integration/runners/test_manage.py
- tests/pytests/integration/ssh/test_pillar_compilation.py
- tests/pytests/integration/states/test_ini_manage.py
- tests/pytests/integration/states/test_state_test.py
- tests/pytests/integration/utils/test_templates.py
- tests/pytests/pkg/integration/test_check_imports.py
- tests/pytests/pkg/integration/test_clean_zmq_teardown.py
- tests/pytests/pkg/integration/test_enabled_disabled.py
- tests/pytests/pkg/integration/test_help.py
- tests/pytests/pkg/integration/test_logrotate_config.py
- tests/pytests/pkg/integration/test_pkg.py
- tests/pytests/pkg/integration/test_python.py
- tests/pytests/unit/loader/test_lazy.py
- tests/pytests/unit/renderers/test_yamlex.py
- tests/pytests/unit/roster/test_dir.py
- tests/pytests/unit/states/file/test_keyvalue.py
- tests/pytests/unit/utils/jinja/test_get_template.py
- tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
- tests/pytests/unit/utils/test_cache.py
- tests/pytests/unit/utils/test_versions.py
- tests/unit/modules/test_boto_{vpc,secgroup,elb}.py
- tests/unit/netapi/rest_tornado/test_saltnado.py
- tests/unit/states/test_boto_vpc.py
- tests/unit/states/test_module.py
- tests/unit/utils/test_schema.py
-
tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py
-
- # tests that require network access
- tests/integration/cloud
- tests/kitchen/test_kitchen.py
- tests/kitchen/tests/wordpress/tests
- tests/pytests/functional/cli/test_salt_cloud.py
- tests/pytests/functional/cli/test_salt_run_.py
- tests/pytests/functional/modules/test_http.py
- tests/pytests/functional/modules/test_pip.py
- tests/pytests/integration/cli/test_salt_proxy.py
- tests/pytests/integration/modules/state/test_state.py
-
tests/pytests/integration/modules/state/test_state_state_events.py
- tests/pytests/integration/pillar/cache/test_pillar_cache.py
- tests/pytests/integration/pillar/test_pillar_include.py
- tests/pytests/integration/proxy/test_simple.py
-
tests/pytests/integration/runners/state/orchestrate/test_events.py
- tests/pytests/integration/wheel/test_pillar_roots.py
- tests/pytests/pkg/downgrade/test_salt_downgrade.py
- tests/pytests/pkg/integration/test_pip.py
- tests/pytests/pkg/integration/test_pip_upgrade.py
- tests/pytests/pkg/integration/test_salt_api.py
- tests/pytests/pkg/integration/test_salt_call.py
- tests/pytests/pkg/integration/test_salt_exec.py
- tests/pytests/pkg/integration/test_salt_grains.py
- tests/pytests/pkg/integration/test_salt_key.py
- tests/pytests/pkg/integration/test_salt_minion.py
- tests/pytests/pkg/integration/test_salt_output.py
- tests/pytests/pkg/integration/test_salt_pillar.py
- tests/pytests/pkg/integration/test_salt_state_file.py
- tests/pytests/pkg/integration/test_salt_ufw.py
- tests/pytests/pkg/integration/test_salt_user.py
- tests/pytests/pkg/integration/test_systemd_config.py
- tests/pytests/pkg/integration/test_version.py
- tests/pytests/pkg/upgrade/test_salt_upgrade.py
- tests/pytests/unit/client/ssh/test_ssh.py
- tests/pytests/unit/loader/test_loading_modules.py
- tests/pytests/unit/test_client.py
- tests/pytests/unit/utils/test_aws.py
- tests/pytests/unit/utils/test_http.py
- tests/pytests/{integration,functional}/netapi
tests/integration/netapi
- tests/unit/modules/test_boto3_elasticsearch.py
- tests/unit/modules/test_boto3_route53.py
- tests/unit/modules/test_network.py
- tests/unit/{states,modules}/test_zcbuildout.py
-
- # tests require root access
- tests/integration/pillar/test_git_pillar.py
- tests/integration/states/test_supervisord.py
- tests/pytests/functional/cli/test_salt.py
- tests/pytests/functional/states/file/test_accumulated.py
- tests/pytests/scenarios/performance/test_performance.py
- tests/pytests/unit/cloud/test_map.py
- tests/pytests/unit/modules/state/test_state.py
- tests/pytests/unit/modules/state/test_top_file_merge.py
- tests/pytests/unit/proxy/test_netmiko_px.py
- tests/pytests/unit/proxy/test_ssh_sample.py
- tests/pytests/unit/roster/test_sshknownhosts.py
- )
-
- rm -r "${remove_test_files[@]}" || die
-
- # axe the boto dep (bug #888235)
- find "${S}/tests" -name 'test_boto_*.py' -delete || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # called_once should be assert_called_once_with
- find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e
's:[.]called_once:.assert_called_once:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-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() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
-
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
-
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
-
- # needs root
-
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
-
tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
-
- # don't like sandbox
-
tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
-
tests/pytests/functional/modules/test_defaults.py::test_defaults_get
-
tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
-
tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
-
tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
-
tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
-
tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
-
tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
-
tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
-
tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
-
tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
-
tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
-
tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
-
tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
-
tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
-
tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
-
tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
-
tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
-
tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
-
tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
- tests/pytests/unit/grains/test_core.py::test_get_machine_id
-
tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
-
tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
- tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
-
tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
-
tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
-
tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-
tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
-
tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
-
tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
-
- # tests that need network access
-
tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
-
tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-
tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
-
tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
- tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
-
tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
- tests/pytests/unit/utils/test_http.py::test_query_proxy
-
tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
-
tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
- tests/pytests/unit/utils/test_network.py::test_isportopen
- )
- [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
-
tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
-
tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
- )
- [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
-
tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host
- )
-
- # 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)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
diff --git a/app-admin/salt/salt-3006.9-r2.ebuild
b/app-admin/salt/salt-3006.9-r2.ebuild
deleted file mode 100644
index f793a220348c..000000000000
--- a/app-admin/salt/salt-3006.9-r2.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_1{1..2} )
-
-DISTUTILS_USE_PEP517=setuptools
-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="https://github.com/${PN}stack/${PN}.git";
- EGIT_BRANCH="develop"
-else
- inherit pypi
- KEYWORDS="~amd64 ~riscv ~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/certifi-2023.07.22[${PYTHON_USEDEP}]
- dev-python/croniter[${PYTHON_USEDEP}]
- dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
- >=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
- >=dev-python/distro-1.5[${PYTHON_USEDEP}]
- >=dev-python/jinja2-3.1.4[${PYTHON_USEDEP}]
- dev-python/jmespath[${PYTHON_USEDEP}]
- dev-python/libnacl[${PYTHON_USEDEP}]
- dev-python/looseversion[${PYTHON_USEDEP}]
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/packaging-21.3[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/requests-2.32.3[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
- dev-python/watchdog[${PYTHON_USEDEP}]
- >=dev-python/werkzeug-3.0.3[${PYTHON_USEDEP}]
- libcloud? (
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiosignal[${PYTHON_USEDEP}]
- >=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
- dev-python/async-timeout[${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:0=[-bindist(-)]
- >=dev-python/pyopenssl-23.2.0[${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-18.6.1[${PYTHON_USEDEP}] )
- cheetah? ( >=dev-python/cheetah3-3.2.2[${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[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- amd64? (
- 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 )
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
- dev-python/build[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- app-arch/zip
- dev-python/apache-libcloud[${PYTHON_USEDEP}]
- dev-python/boto3[${PYTHON_USEDEP}]
- dev-python/cherrypy[${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-2.0.0[${PYTHON_USEDEP}]
- <dev-python/moto-5[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/pip[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
- <=dev-python/pytest-8.2.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-salt-factories-1.0.0_rc28[${PYTHON_USEDEP}]
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
- dev-python/pytest-subtests[${PYTHON_USEDEP}]
- dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
- dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
- dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
- dev-python/pytest-custom-exit-code[${PYTHON_USEDEP}]
- dev-python/flaky[${PYTHON_USEDEP}]
- net-dns/bind-tools
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
- dev-util/yamllint[${PYTHON_USEDEP}]
- !x86? ( >=dev-python/boto3-1.21.46[${PYTHON_USEDEP}] )
- )
-"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="
- || ( raet zeromq )
- test? ( cheetah genshi )
- !amd64? ( !nova !neutron )
-"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
- "${FILESDIR}/salt-3005.1-no-entry-points.patch"
- "${FILESDIR}/salt-3006.9-pam-module.patch"
-)
-
-python_prepare_all() {
- local -a remove_test_files=(
- # remove tests with external dependencies that may not be
available, and
- # tests that don't work in sandbox
- tests/pytests/functional/modules/file/test_readlink.py
- tests/pytests/functional/modules/file/test_symlink.py
- tests/pytests/functional/modules/state/test_jinja_filters.py
- tests/pytests/functional/modules/state/test_jinja_renderer.py
- tests/pytests/functional/modules/state/test_mako_renderer.py
-
tests/pytests/functional/modules/state/test_pyobjects_renderer.py
- tests/pytests/functional/pillar/test_gpg.py
- tests/pytests/functional/runners/test_winrepo.py
- tests/pytests/functional/states/file/test_keyvalue.py
- tests/pytests/functional/states/file/test_patch.py
- tests/pytests/functional/transport/server/test_req_channel.py
- tests/pytests/functional/utils/test_async_event_publisher.py
- tests/pytests/integration/master/test_clear_funcs.py
- tests/pytests/integration/minion/test_reauth.py
- tests/pytests/integration/modules/test_cmdmod.py
- tests/pytests/integration/modules/test_jinja.py
- tests/pytests/integration/returners/test_noop_return.py
- tests/pytests/integration/runners/test_manage.py
- tests/pytests/integration/ssh/test_pillar_compilation.py
- tests/pytests/integration/ssh/test_slsutil.py
- tests/pytests/integration/states/test_ini_manage.py
- tests/pytests/integration/states/test_state_test.py
- tests/pytests/integration/utils/test_templates.py
- tests/pytests/pkg/integration/test_check_imports.py
- tests/pytests/pkg/integration/test_clean_zmq_teardown.py
- tests/pytests/pkg/integration/test_enabled_disabled.py
- tests/pytests/pkg/integration/test_help.py
- tests/pytests/pkg/integration/test_logrotate_config.py
- tests/pytests/pkg/integration/test_pkg.py
- tests/pytests/pkg/integration/test_python.py
- tests/pytests/unit/fileserver/gitfs/test_gitfs.py
- tests/pytests/unit/loader/test_lazy.py
- tests/pytests/unit/modules/test_yaml.py
- tests/pytests/unit/pillar/test_pillar.py
- tests/pytests/unit/renderers/test_yamlex.py
- tests/pytests/unit/roster/test_dir.py
- tests/pytests/unit/states/file/test_keyvalue.py
- tests/pytests/unit/utils/jinja/test_get_template.py
- tests/pytests/unit/utils/jinja/test_salt_cache_loader.py
- tests/pytests/unit/utils/test_cache.py
- tests/pytests/unit/utils/test_versions.py
- tests/unit/modules/test_boto_{vpc,secgroup,elb}.py
- tests/unit/modules/test_saltcheck.py
- tests/unit/netapi/rest_tornado/test_saltnado.py
- tests/unit/states/test_boto_vpc.py
- tests/unit/states/test_module.py
- tests/unit/utils/test_schema.py
-
tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py
-
- # tests that require network access
- tests/integration/cloud
- tests/integration/modules/test_cmdmod.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_disk.py
- tests/integration/modules/test_file.py
- tests/integration/modules/test_gentoolkitmod.py
- tests/integration/modules/test_linux_acl.py
- tests/integration/modules/test_localemod.py
- tests/integration/modules/test_sysctl.py
- tests/integration/modules/test_timezone.py
- tests/integration/modules/test_tls.py
- tests/integration/output/test_output.py
- tests/integration/returners/test_appoptics_return.py
- tests/integration/returners/test_librato_return.py
- tests/integration/shell/test_enabled.py
- tests/integration/states/test_archive.py
- tests/integration/states/test_cmd.py
- tests/integration/states/test_compiler.py
- tests/integration/states/test_handle_iorder.py
- tests/pytests/functional/cli/test_salt_cloud.py
- tests/pytests/functional/cli/test_salt_run_.py
- tests/pytests/functional/modules/test_http.py
- tests/pytests/functional/modules/test_pip.py
- tests/pytests/functional/states/test_pip_state.py
- tests/pytests/integration/cli/test_salt_proxy.py
- tests/pytests/integration/minion/test_job_return.py
- tests/pytests/integration/modules/state/test_state.py
-
tests/pytests/integration/modules/state/test_state_state_events.py
- tests/pytests/integration/pillar/cache/test_pillar_cache.py
- tests/pytests/integration/pillar/test_fileclient.py
- tests/pytests/integration/pillar/test_pillar_include.py
- tests/pytests/integration/proxy/test_simple.py
-
tests/pytests/integration/runners/state/orchestrate/test_events.py
- tests/pytests/integration/wheel/test_pillar_roots.py
- tests/pytests/pkg/downgrade/test_salt_downgrade.py
- tests/pytests/pkg/integration/test_pip.py
- tests/pytests/pkg/integration/test_pip_upgrade.py
- tests/pytests/pkg/integration/test_salt_api.py
- tests/pytests/pkg/integration/test_salt_call.py
- tests/pytests/pkg/integration/test_salt_exec.py
- tests/pytests/pkg/integration/test_salt_grains.py
- tests/pytests/pkg/integration/test_salt_key.py
- tests/pytests/pkg/integration/test_salt_minion.py
- tests/pytests/pkg/integration/test_salt_output.py
- tests/pytests/pkg/integration/test_salt_pillar.py
- tests/pytests/pkg/integration/test_salt_state_file.py
- tests/pytests/pkg/integration/test_salt_ufw.py
- tests/pytests/pkg/integration/test_salt_user.py
- tests/pytests/pkg/integration/test_systemd_config.py
- tests/pytests/pkg/integration/test_version.py
- tests/pytests/pkg/upgrade/test_salt_upgrade.py
- tests/pytests/scenarios/dns/multimaster/test_dns.py
- tests/pytests/scenarios/dns/test_dns.py
- tests/pytests/unit/client/ssh/test_ssh.py
- tests/pytests/unit/loader/test_loading_modules.py
- tests/pytests/unit/modules/test_tls.py
- tests/pytests/unit/test_client.py
- tests/pytests/unit/utils/test_aws.py
- tests/pytests/unit/utils/test_gitfs.py
- tests/pytests/unit/utils/test_http.py
- tests/pytests/{integration,functional}/netapi
tests/integration/netapi
- tests/unit/modules/test_boto3_elasticsearch.py
- tests/unit/modules/test_boto3_route53.py
- tests/unit/modules/test_network.py
- tests/unit/{states,modules}/test_zcbuildout.py
-
- # tests require root access
- tests/integration/pillar/test_git_pillar.py
- tests/integration/states/test_supervisord.py
- tests/pytests/functional/cli/test_salt.py
- tests/pytests/functional/states/file/test_accumulated.py
- tests/pytests/scenarios/performance/test_performance.py
- tests/pytests/unit/cloud/test_map.py
- tests/pytests/unit/modules/state/test_state.py
- tests/pytests/unit/modules/state/test_top_file_merge.py
- tests/pytests/unit/proxy/test_netmiko_px.py
- tests/pytests/unit/proxy/test_ssh_sample.py
- tests/pytests/unit/roster/test_sshknownhosts.py
- )
-
- rm -r "${remove_test_files[@]}" || die
-
- # axe the boto dep (bug #888235)
- find "${S}/tests" -name 'test_boto_*.py' -delete || die
-
- # removes contextvars, see bug: https://bugs.gentoo.org/799431
- sed -i '/^contextvars/d' requirements/base.txt || die
-
- # called_once should be assert_called_once_with
- find "${S}/tests" -name '*.py' -print0 | xargs -0 -- sed -i -e
's:[.]called_once:.assert_called_once:g' -- || die
-
- distutils-r1_python_prepare_all
-}
-
-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() {
- local -a EPYTEST_DESELECT=(
- # doesn't like the distutils warning
- tests/pytests/integration/cli/test_batch.py::test_batch_retcode
-
tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
-
- # hangs indefinitely
- tests/pytests/unit/test_minion.py::test_master_type_disable
-
- # needs root
-
tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
-
tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
-
- # don't like sandbox
-
tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
-
tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
-
tests/pytests/functional/modules/test_defaults.py::test_defaults_get
-
tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
-
tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
-
tests/pytests/functional/states/file/test_blockreplace.py::test_issue_49043
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
-
tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
-
tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
-
tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
-
tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
-
tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
-
tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
-
tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
-
tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
-
tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
-
tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
-
tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
-
tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
-
tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
-
tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
-
tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
-
tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
- tests/pytests/unit/grains/test_core.py::test_get_machine_id
-
tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
-
tests/pytests/unit/loader/test_loader.py::test_return_named_context_from_loaded_func
-
tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
- tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
-
tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
-
tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
-
tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-
tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
-
tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
-
tests/pytests/unit/utils/test_x509.py::"test_parse_general_names[inpt27-CommandExecutionError-Joiner
U\\\\+200C not allowed at position 9 in '.*']"
-
tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
-
- # tests that need network access
-
tests/integration/master/test_event_return.py::TestEventReturn::test_master_startup
-
tests/pytests/functional/states/file/test_managed.py::test_verify_ssl_https_source
-
tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_architectures
-
tests/pytests/unit/modules/test_aptpkg.py::test_sourceslist_multiple_comps
- tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config
-
tests/pytests/unit/modules/test_yumpkg.py::test_get_yum_config_value_none
-
tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-
tests/pytests/unit/utils/test_http.py::test_backends_decode_body_false
-
tests/pytests/unit/utils/test_http.py::test_backends_decode_body_true
- tests/pytests/unit/utils/test_http.py::test_query_proxy
- tests/pytests/unit/utils/test_network.py::test_isportopen
- )
- [[ ${EPYTHON#*.} -ge 11 ]] && EPYTEST_DESELECT+=(
-
tests/unit/test_master.py::TransportMethodsTest::test_aes_funcs_black
-
tests/unit/test_master.py::TransportMethodsTest::test_clear_funcs_black
- )
- [[ ${EPYTHON#*.} -ge 12 ]] && EPYTEST_DESELECT+=(
-
tests/integration/modules/test_hosts.py::HostsModuleTest::test_set_host
-
tests/integration/minion/test_minion_cache.py::BasePillarTest::test_minion_cache_should_cache_files
-
tests/pytests/functional/channel/test_server.py::"test_pub_server_channel[transport(zeromq)]"
-
tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel
-
tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering
-
tests/pytests/functional/transport/zeromq/test_pub_server_channel.py::test_pub_channel_filtering_topic
-
tests/pytests/functional/transport/zeromq/test_request_client.py::test_request_channel_issue_64627
-
tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_quotes_around_string_they_should_be_removed
-
tests/pytests/unit/modules/test_nilrt_ip.py::test_when_config_has_no_quotes_around_string_it_should_be_returned_as_is
-
tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[42]"
-
tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[-99.9]"
-
tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value2]"
-
tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value3]"
-
tests/pytests/unit/modules/test_nilrt_ip.py::"test_when_default_value_is_not_a_string_and_option_is_missing_the_default_value_should_be_returned[default_value4]"
-
tests/unit/modules/test_zypperpkg.py::ZypperTestCase::test_repo_value_info
-
tests/unit/utils/test_color.py::ColorUtilsTestCase::test_get_colors
- )
-
- # 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)" || die
- (
- export TMPDIR
- cleanup() { rm -rf "${TMPDIR}" || die; }
-
- trap cleanup EXIT
-
- addwrite "${TMPDIR}"
-
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
- epytest
- )
-}
