diff options
Diffstat (limited to 'app-admin')
42 files changed, 40 insertions, 1400 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex f23803cfab72..74c7588e868e 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest index bca88d7fc9c7..130731eae715 100644 --- a/app-admin/ansible-core/Manifest +++ b/app-admin/ansible-core/Manifest @@ -1,10 +1,8 @@ -DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92 DIST ansible-core-2.12.10.tar.gz 7762154 BLAKE2B deffcc42c124a40ce34ce9a26a0c400b1199018cb05478ea8860500e1a507f9f604c1f40f0d006682fc14ad8f0cc3d035b8ffb1307ee37d26191be3c68e33253 SHA512 8b4eb0e923f976680e81ffbe942c4ddc7ddaaaffe83d14c20f78f7c6ab4f548f21920cdfa57b48de2bc24683028e744a92ac4ca45fecc459ea2b042de8c40737 DIST ansible-core-2.13.7.tar.gz 13940230 BLAKE2B fd3556514f7692b48a66987ff5a084b132217c910ba0b216f2533cd1e542a9b6da6d2aa96e8e32142ab3a6ed7357fc1b68b9827ceaf44b91238bfbcb15b5d026 SHA512 f46d8acb07fa1d397e6e640c52237ed70b575ae0760eeb82b9e41afc6c06d99d341856d6af3452edb82e63a708600c2f348782b8bebc18c0ea9b03a4df80594a DIST ansible-core-2.14.1.tar.gz 14000906 BLAKE2B 86cdf460c3ff6e2877f39f40f9eadc555581045c4a4e1ff301678f9aa7e3116f0bb7084d8841b2bdba50ae119713a226c6353c5e75b9f2a9356073403b04f94a SHA512 d3710aff1dbb04746b663b7c987c3597005dd8633df82f645312e20ddb9c679e7315968c0cf2876ae22ba91d17e4c54ef9cbdb6b825ee1d6f4229e887f8b4571 -EBUILD ansible-core-2.11.7.ebuild 1565 BLAKE2B 5d203f0e9ab504055997f86ef7b74139d2e667c937d33c6e50bf9a9b807ca509f3c3238f77b75cb95c22a806be53e947f2dcaebdc1f2427219a427916580301c SHA512 c0ee9fa9ddf8a6986c70ca68fd098df44fe82dc9cfe1529b18ca147f823a0f0bb882a852c80de7477d3591993fa43af94a8803b8a5c0f9591f18654cde3c2175 -EBUILD ansible-core-2.12.10.ebuild 1566 BLAKE2B 4b333bc88f164266edcd445d164e6922391ead51481dff3bc2513c573dd5abda37ebf6fc10cca09252b596aa67b617c8ef39b5e7e2fdda4349a85eb4d6014a58 SHA512 1182c8ae87094dea4aace7814de9f81829c65368b14ef1adcbf302190a65d2c1b7569b29a96b2ee402cbf11d833e2c59c4368206cfb7503193e6aece3be54b02 -EBUILD ansible-core-2.13.7.ebuild 1324 BLAKE2B 8201733c925fa70a099ee71f45a93aa3ffb7304358da72250b2678b57b8a49046ea490339be54ebd17fbb2e64419cfcd0fb40d1f99fdd92f36b715b79156be39 SHA512 a12a347798278a62fa1cc88ef6b3eced9817098a99069a228d6478e7ae5aada61d294e31ece444ebdfcfbd5deb0e8bec75e879a5280bfa29ca7fce8e3617d506 -EBUILD ansible-core-2.14.1.ebuild 1324 BLAKE2B 5621523df67e3afd316f7c68edd310fa4df08ce31cf3aa47df365612f0ac22ad7ae08097e4152b1ab812551ed25843531a3cb204502a4bd39b3f16884c762e98 SHA512 4eb48191f9f33e08e7197e4c3159b8c7966b93eb7fb94d5e3bf212908425479c8b23c880bef3b350c3cb9b8dd0747e5df3631c72260b97389061d062f1b1c649 -EBUILD ansible-core-9999.ebuild 1569 BLAKE2B e25c05dd3a9538097e760c5ff7737d9a1e296c8036034e90ffde57557bd4aff12c74e727481a8c64783b020f5deec908c43fd570fef7eec798977dbad170418c SHA512 6c4bb21ebb9a4526e57b497f8ad61770c2f5ace8fc752fbdde0d597327567e2c8d4d454319d057530203842e0bcfab063e4342243cdf50344225ecdbaa604de7 +EBUILD ansible-core-2.12.10.ebuild 1561 BLAKE2B ede6d8a22f1cbbf48bb142a2eb2f15f90b2a518e84397dcd959a3f041c2f7621ec6742b383ea10406bb9a25cc68567f4e9ad42bdd1e2c806275ee3a20a2afced SHA512 c986d7f856fd7129ca5e7b6c25ec9f721af06fbec440e45444c932195f4c782050cf142e767ca25c23e0c4a68909a63a9632ac1b9848277080401193a864e571 +EBUILD ansible-core-2.13.7.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c +EBUILD ansible-core-2.14.1.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c +EBUILD ansible-core-9999.ebuild 1570 BLAKE2B be1cec89cbfd906deea937ce4f8d0ec7cab913bf36cc727caee509686dc67a9176ef704819a1f714e5f55c035e4420d11f7520ee848366c22111d99e5c6ce939 SHA512 a3c9abeadd37539fe23959db4b784d985ff29a45623896a0943dad5cf1469f2830feeab9bc74234e11c2b6196ffc68aba20b7a476c578b6ae5a5d0a53afaca50 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d diff --git a/app-admin/ansible-core/ansible-core-2.11.7.ebuild b/app-admin/ansible-core/ansible-core-2.11.7.ebuild deleted file mode 100644 index e84226ab4437..000000000000 --- a/app-admin/ansible-core/ansible-core-2.11.7.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..9} ) -DISTUTILS_USE_SETUPTOOLS=bdepend - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ansible/ansible.git" - EGIT_BRANCH="devel" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] - <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh -" -DEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-vcs/git - )" - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} diff --git a/app-admin/ansible-core/ansible-core-2.12.10.ebuild b/app-admin/ansible-core/ansible-core-2.12.10.ebuild index aebbfcec8b52..ae2fbf2fa73b 100644 --- a/app-admin/ansible-core/ansible-core-2.12.10.ebuild +++ b/app-admin/ansible-core/ansible-core-2.12.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-2.13.7.ebuild b/app-admin/ansible-core/ansible-core-2.13.7.ebuild index 49eef88be33c..ee8d323e90b5 100644 --- a/app-admin/ansible-core/ansible-core-2.13.7.ebuild +++ b/app-admin/ansible-core/ansible-core-2.13.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-2.14.1.ebuild b/app-admin/ansible-core/ansible-core-2.14.1.ebuild index 6f3b322f6062..ee8d323e90b5 100644 --- a/app-admin/ansible-core/ansible-core-2.14.1.ebuild +++ b/app-admin/ansible-core/ansible-core-2.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild index 928f307ff69a..1cec22f8239c 100644 --- a/app-admin/ansible-core/ansible-core-9999.ebuild +++ b/app-admin/ansible-core/ansible-core-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 5886a1474aae..cb08974eccc0 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -3,7 +3,7 @@ AUX ansible-lint-6.8.6_test-module-check.patch 1882 BLAKE2B e42bae381ba29c224768 DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18 DIST ansible-lint-6.8.6.gh.tar.gz 293630 BLAKE2B aa43acb9cca21d3cdafebddb18d82781ab708d5696edc51567a8c56cc3eacb3bd96d08f97436eab54e69866f55fa6fc6537eb62e44e4d26eb3ee46ee13e7322d SHA512 0beb16ecff432444a25d3efa70f67eb55437faed593dfbb4bcaf080b06558403e711218f5a021268a2450ceeab1127d8dc8de027d1e4889350f20ca3d9ed9dca DIST ansible-lint-6.9.1.gh.tar.gz 388343 BLAKE2B 73035bdbd6c1bdee5566d5dee5a8461953d99bbaf896d7a9764c32419e74c3d23883ac1a7548de3e21372195f99c325c371cead7397bf64d6d033d9a2f81ed01 SHA512 eaf255c53fb8355b06e7013f6676a09e2d7e67aa332306448f530c345925c80ff5ea54c580f7f6720a25ebed9e8deb4c0a8e4e22af4183e8a8ef7b6999be6099 -EBUILD ansible-lint-6.8.2.ebuild 2916 BLAKE2B 485b4f5266feb356fdd115e1d3d4a705a18fbb699b66c8e581938501562813ab7956de81e222788c46eeba46d430b21230887661d8afbf9f2abd64bd5393467b SHA512 7939a0506d1982e15f8ea71373101b0388e8ab86fe7f334e1a6aacd4d922e124916038b5cacd829fb757dca664950b180e49f623cbe2eddf8be43cca49962603 -EBUILD ansible-lint-6.8.6.ebuild 2931 BLAKE2B 765790ea4fd0c6af58165f33c7ab2614aa75f19ab0e770203dd8f2108283cc9273c53b3a280c63621e8263b5f4a653bb059a39d2328e80229172d0cc33e3c80c SHA512 eae5405a3cf63410def47601caf9cc3c95329af25fb0107f43fee4f88be581f6e5c3fbcfb7126a7181a7c205a3ff5d30f78d38369097d9cf5873bab8f963e7b2 -EBUILD ansible-lint-6.9.1.ebuild 2960 BLAKE2B 194fd84762e03f179146570fa3f4cfa172fae127e297b4b8aff01fd92deb8eb9293ec490ac3be7509ff71ee400e4a66cac0ad7796c3e819198233f53cbc45d8f SHA512 fc536ea2457eb2bc8e5a5bffa84ca383986aebfc0c488098289240ca73ae0afb2db6a83a7b88d63e480d23fd93dff7171a88d739d7d99aaee48e540666d89991 +EBUILD ansible-lint-6.8.2.ebuild 2911 BLAKE2B 82e54612dff719f575aeb92460119932e83dd5896297a18ddca59a64bd831d9be67c308d7a3b6a7f2c564ba4fc9cfbda933044ba3c400a7cd09ea269ccef6dbf SHA512 b924b1ee6a3d60d1be14ed3c799a39a02aa9100b832bc7916af822dd5506da1da35243b5210cc044b1aa8815143cc3b817a2ed3b3fad504d009d670bb4b4a176 +EBUILD ansible-lint-6.8.6.ebuild 2932 BLAKE2B 13ef3958c1d6223366203b8a1572576c5a0473ab47666e75300a83b1425283efdc5e47b4bf6c91694e9b9fe95ffde689d8c0a0522fe08a360a1ef3a03a6e65a5 SHA512 b94d19d721de45d5d67f539479fb0cf773b94a22ce31c01074ae638bb7beeb109207b56f7ea4154df173ecfbf3a31ee2a0110efecc8d74097b8da4229b70ca5b +EBUILD ansible-lint-6.9.1.ebuild 2961 BLAKE2B e25d4e539178cee703ceba44ac5c2752814a6dffed335f9da6b1eb57b5dfe4afe1d6d74bf0effdeaa1ebf839277e066599f0709d05659fedff9c15cf0704da58 SHA512 57acab5fab20c55d95ff509d57e9484d30c57d033d0eeaf48309df85e3d646d91cf9a1647138c5cbbe228f84e4dd1cb01dc5d7c2c5292805eb5b9be488879ed5 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36 diff --git a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild index 2e40f9cbc06a..64f06f90a631 100644 --- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild +++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild index dcb2f57e85ed..b351ac69b126 100644 --- a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild +++ b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild index 0d91815abba5..5ec4fb0791cb 100644 --- a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild +++ b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest index 95c45e0c1acd..1e57a0a2f546 100644 --- a/app-admin/ansible-molecule/Manifest +++ b/app-admin/ansible-molecule/Manifest @@ -1,3 +1,3 @@ DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d -EBUILD ansible-molecule-4.0.1.ebuild 2793 BLAKE2B e5593a6e67bd847e78d87062b987ddf8789e7edfe349b772c3e6bb98c5b8cb40bfceccfb9a49e391a825c01a64cc2b593ba93ba29696281e2de9284c12f2ee5e SHA512 62e5344a0373478ff3cb2b45808331acd1fc2f021a978335bcc997ba90995a2a42fd550e8e93388b2e65d809f2ab4e01230b277ad364c8c942257b31c0b50163 +EBUILD ansible-molecule-4.0.1.ebuild 2788 BLAKE2B e67f991ed869874d78b778091c0c4506feeda8ab4cb1c12c6185c454be478641f9c15c8cbf9ede832f8c625dbc290cfdde0f40a94d5585853953557b32ed84c8 SHA512 d71f3763148e9a4d85fc41bb1b13364c357f5169acbfe99e1277814f4fc535fdf8c3f9fdb2631ca395d4bce17c302e88d412ef14528f0396b6bf0715086e9d1e MISC metadata.xml 407 BLAKE2B 869b6c1d6da66568eeac2daaca56567876dbfb057f50add7bbc95fef8a3fc38b99279d359a90573f8d6af47d0e451445827f6efeefa8fb0e7954e8b624783855 SHA512 e6dbbe2c0536ea84bdfea0168a743dbe3de424b442757441bc4f978e07d41ca6022eb2d6f269c921f42b4e7d858788f967c1c35bd4241a35dbe25a161f5744de diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild index c7f2bb183135..0991e0135aa7 100644 --- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild +++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 0a83e4209aca..88e925276f96 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,7 +1,5 @@ -DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702 DIST ansible-5.10.0.tar.gz 36898833 BLAKE2B 5705325c150909e4911cbc6fafb9b6194bcd15cf7a97978835b29cb8b87b671fa888163e28e825d1fc98006c57313677afed63236f4a55af415a70daf5fe305f SHA512 d81b34642533dfaf0c3dba5ecc8ba483efb3d82bd40afa469de2778666e932bec3c20e61ae579184fcbd7f1ec7c8d694617f334ebb3e910db3c9f6709d3b9385 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a -EBUILD ansible-4.6.0.ebuild 701 BLAKE2B d484948763f9511dd75724514873b3b0823855ce3c05e136ebe72d0dbdda4297faff6f8c1c4be0219b373683cc0e208413888b29469daf018e94730cca7bfa4c SHA512 6f5d5560e0fa042bf889ca44a59346184a11e44c7488ff73d04f4c71f7b95e35a5032732fc08ea9b1e0c76f0ed68a2c844fd00a994d4712369e9afcda415e3ec EBUILD ansible-5.10.0.ebuild 702 BLAKE2B 3d91e2541f6063cb2e6df89ecfec63e64609eaf9e3fc9fb08e0076d73899551734a05a64ca04234caa4bacf2ca95e3c766a2af5005c79c496af2a46020c7110e SHA512 5236c7ab0cce12706e5346084ba71e2fbf49d8be58b6164ed9b7312dcf1027826b6ceafcc22f380b08c4f180df2eb93a2f84d734af92272b2b246111cf1fe507 EBUILD ansible-6.7.0.ebuild 702 BLAKE2B fde39a0d8caeb4586918f639fb9213627e345854ee6dd92fc895778a01200fc6f1139fd96a51b910c57c3b05cf0d76e6d0393d9f429fefd8c654ca275f318e41 SHA512 0e8d86c5eb2f44937f8dc3a03f82a58765395b0255813d9b02174c2e431e2594ee3a4a24467826b5aaca6645a2134e53655518176179acc3490fcc11e3a7ba75 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097 diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild deleted file mode 100644 index a932683ff21d..000000000000 --- a/app-admin/ansible/ansible-4.6.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://www.ansible.com/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -RESTRICT="test" - -RDEPEND=">=app-admin/ansible-core-2.11.1 - <app-admin/ansible-core-2.12" - -python_compile() { - local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} -python_install() { - local -x ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_install -} diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 766d2ce5c522..7d94bca051f4 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,17 +1,9 @@ -DIST aws-cli-1.27.32.gh.tar.gz 2328348 BLAKE2B 0958525a47f6dac8422dd37c9e099c2bf48d4bb5a8897673d18bb5b747dc6a0806d71cdf92899daf768ffa7cf9b7d39fe559cadad46eabc7913130d98c578d75 SHA512 db034e58761368a72e5a233e49e6c904281635fb47384f984b2ead1bd285bdb0af1a7e7b76d77ddaa6d19496ee1add756e1dbc43044aab1ba2b1f09232a112c9 DIST aws-cli-1.27.37.gh.tar.gz 2332965 BLAKE2B 9c855f02bc63f64e3d9bb706139305a6b3dad523bd2563c9d6ca4b39b340ea242bf8e85ee369ca92d327073d9eb0a4f0e3da59b4016eaa2ce4f48aa083cc9c51 SHA512 3f53d4c15244019d1773486e192bda4ca69a9afe8e32f2fcfd9f56affc3bcc84e15a1aa4b27563f404bc5471b868eabc74c8fb3884deb0372d61a038e101202a DIST aws-cli-1.27.41.gh.tar.gz 2333941 BLAKE2B ab39bd9acdf7d2d6f7ac6a8168b5959ede6799b4e06e04892fd49fae056b384c4fe9f7d721301b46be90f84fc0ead345968d1bc93399c8d8a374559e10c31519 SHA512 81d36eb1554386968924ea14c42e03fc21ab32ab97750f2d8fd20ac0deb6a6a7184b84b41e06ba0738ece233ff9dba08fe1f9f801bce1a2b38656c73f23e76e0 -DIST aws-cli-1.27.42.gh.tar.gz 2334306 BLAKE2B ae531e82fcc4f7fc290d1a383f3d93eb20fc238a759d9f2afefed64998f47958456b9f32345a314e0d34a8817777d47e554fa367845c8d7dcfac27f3e3b6a12e SHA512 f2d976e9892b512a9d0d4bf2a629089aa0b63f273ef6464173cdabbe7e9e348bfaded1e2b1e15656db0ca4245d9de798b6e896da945aab359dacd8f1811bd5ba -DIST aws-cli-1.27.43.gh.tar.gz 2334390 BLAKE2B dce5ebdf220a946084506765a72f6d7afd7a8667c9cc8d4c5ffe39fc0386d96a96f129fe54c5b150b5b47b5cfa1a3a1b3dbd7e8f424191030f5ff22872ac169e SHA512 a927b05bc2dd9eb5c64f4f80e85719f8571f025ab3734beed34720376088f0434c286d050159a7042f1149f3a5c1936588c20faf97cbd4b068d0a74a390876db -DIST aws-cli-1.27.44.gh.tar.gz 2334804 BLAKE2B bd7064f1e7691ce8d66448899083715b6d53b6ed5530366bcd2162046b559503a5ec6b1c56d039745e392c4bad098975dba694f3899a4734b5d985d2c793c93b SHA512 476226affbd8fa533143faebdc3b3131796b3f60fc9704721a3573e0ac0c96fe4bc9ae3dd377a4e6eeba5b74ed13e86a99c629cc4a7dd1a441fb78855bfbcadf DIST aws-cli-1.27.45.gh.tar.gz 2344942 BLAKE2B 02171244d074008721a5da4b9e640b0da3b77ed90ad8acda300b7256ef62eb663f0bee78a52f025e3f6315306602ba3cb8848e89dbfb6abec6342a0ae04b1009 SHA512 d3daa556c6b93c312dae8ff29941d938cfed7f27e62408f06c32abbeb7324d04a3b8997fd1db9feb78ef1ef1eb98ea2fa456fe179c037127558ecf786e5b69c5 DIST aws-cli-1.27.46.gh.tar.gz 2345966 BLAKE2B e39f6feecad7d940f7cf64bc947f586e13c01c06c78181c2d04ade117797e4e0eae7eccf2823bb0a17f1e347aaafb6430687bcd5e10c932aeaea2430fca62f38 SHA512 5bb3554b7b4ece43c3f9ae0ac6c6dff92af501c34de16d71be9767b9a59740945504a6804be5985f1ee4ca1e328776aa65b80a5bce9d633dffb8066c3b5e65ce -EBUILD awscli-1.27.32.ebuild 2278 BLAKE2B f4f49e0d5fb6023363e07a0b1f520b1d37adfaa54bcf2bc64944e5f9274441de180bd50165dd0fcdebc8242cb4ca9d508ca5f7ad833b65934b9666f44382005b SHA512 2e4deaaad93718512fa5efc816e4bd2e20710bf7956c29423e6a8a437cea276625872d80cf0baf809d36f4958ff83bca8358ead7e62ff4d95b2321913277486e EBUILD awscli-1.27.37.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b EBUILD awscli-1.27.41.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d -EBUILD awscli-1.27.42.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 -EBUILD awscli-1.27.43.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 -EBUILD awscli-1.27.44.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.45.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 EBUILD awscli-1.27.46.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.27.32.ebuild b/app-admin/awscli/awscli-1.27.32.ebuild deleted file mode 100644 index 9102a3ea8c09..000000000000 --- a/app-admin/awscli/awscli-1.27.32.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.27.42.ebuild b/app-admin/awscli/awscli-1.27.42.ebuild deleted file mode 100644 index 62c19f3a63fb..000000000000 --- a/app-admin/awscli/awscli-1.27.42.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.27.43.ebuild b/app-admin/awscli/awscli-1.27.43.ebuild deleted file mode 100644 index 62c19f3a63fb..000000000000 --- a/app-admin/awscli/awscli-1.27.43.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/awscli/awscli-1.27.44.ebuild b/app-admin/awscli/awscli-1.27.44.ebuild deleted file mode 100644 index 62c19f3a63fb..000000000000 --- a/app-admin/awscli/awscli-1.27.44.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit bash-completion-r1 distutils-r1 multiprocessing - -MY_P=aws-cli-${PV} -DESCRIPTION="Universal Command Line Environment for AWS" -HOMEPAGE=" - https://github.com/aws/aws-cli/ - https://pypi.org/project/awscli/ -" -SRC_URI=" - https://github.com/aws/aws-cli/archive/${PV}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# botocore is x.(y+2).z -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # do not rely on bundled deps in botocore (sic!) - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - # strip overzealous upper bounds on requirements - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO - tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only - tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing - tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid - ) - - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked -} - -python_install_all() { - newbashcomp bin/aws_bash_completer aws - - insinto /usr/share/zsh/site-functions - newins bin/aws_zsh_completer.sh _aws - - distutils-r1_python_install_all - - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die -} diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest index b7761bcd7a9d..dc4ea14bf600 100644 --- a/app-admin/mcelog/Manifest +++ b/app-admin/mcelog/Manifest @@ -1,10 +1,6 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4 -DIST mcelog-182.tar.gz 314857 BLAKE2B fc0716a468ce3eb4fd08806913c7e5e7481f0181f1217bf6e7bc6d675651dd04adac3cd0927428a6f88b15ddd919fbb1c26a4cfd977c3d902906fc09170bb1b3 SHA512 546fd30d16b00efb79e0df49c4c2d7cff08280762f04c4f67c3ceed500dcd19ba63a6eeb55f6ee444f9bbae04431745eb8aa3ded609c10e6be69cf5dd7722443 -DIST mcelog-189.tar.gz 314373 BLAKE2B fcd0a2c52eaa8e75b5d4233190e5daccef2500fba024f505a109bd4b4b69881fc65fe28a15c7a1dea7fcc8ad7d3c6a67e14891ae486d5fa352ccaeae7a71fbd7 SHA512 391123c6153788c533dc8caa749997732495206d59801fde80380c2dbc188236a78bd18bfb6fb27fa9112f436dd3e66314f75ce5aed2c85f3a821fe0c12ff7ea DIST mcelog-190.tar.gz 314409 BLAKE2B 287b5ccba24ef7afe4b2653f2ab8ddd9ae94451e1131941d61031042a039cb9ed633f75b0ddf0035f3fef023cdf67c5c0b01169d0afac4ae47f9badcc55d16ef SHA512 26347d5255c602189961c63f8bf44f0c73b8f7fb0d455108c604a84e73e00303646961759101aab42157d12a7678f8c47277829b0460b0832a64c8b5c913d952 -EBUILD mcelog-182.ebuild 1129 BLAKE2B c145537c454aa41c2bfababeda876d349e6c0cc82a52c7c03e09c323562d801f329956c4f7241744aad82c0cea2c653c37b35eee04af104bd35acf66d11246e9 SHA512 2ebe74e82511c423be28db3054d5c348f8d712dfabe165cc624377da94b39cb9d8460f48cfb5b8b7acc7a3f135b689e0666b615f057e0b82a9bf76eceb31e35b -EBUILD mcelog-189.ebuild 1129 BLAKE2B 9ff00a93a582ceed3b42c5ce28b7e23099f345cca9e4411f35f32d70fe2e46bed47265fd6a48bfac773512faac5281e778130403135b0514c6bcea5fcfa19657 SHA512 13a6cf3907e5b5e0813504bf9a6a877e612fcfe392fd8a4ff34774058ec0abfbecbeaf1bea014db29f1d59e5a3afe02460c9683566b4fc42d776a217bab11e46 EBUILD mcelog-190.ebuild 1129 BLAKE2B 9ff00a93a582ceed3b42c5ce28b7e23099f345cca9e4411f35f32d70fe2e46bed47265fd6a48bfac773512faac5281e778130403135b0514c6bcea5fcfa19657 SHA512 13a6cf3907e5b5e0813504bf9a6a877e612fcfe392fd8a4ff34774058ec0abfbecbeaf1bea014db29f1d59e5a3afe02460c9683566b4fc42d776a217bab11e46 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc diff --git a/app-admin/mcelog/mcelog-182.ebuild b/app-admin/mcelog/mcelog-182.ebuild deleted file mode 100644 index 1b3a0ee7345e..000000000000 --- a/app-admin/mcelog/mcelog-182.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A tool to log and decode Machine Check Exceptions" -HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-mcelog )" -DEPEND="${PYTHON_DEPS}" - -# TODO: add mce-inject to the tree to support test phase -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~X86_MCE" - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY" - check_extra_config - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${PN}-129-debugflags.patch - eapply_user - tc-export CC - python_fix_shebang genconfig.py -} - -src_install() { - default - - insinto /etc/logrotate.d/ - newins ${PN}.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} - systemd_dounit ${PN}.service - - dodoc *.pdf -} diff --git a/app-admin/mcelog/mcelog-189.ebuild b/app-admin/mcelog/mcelog-189.ebuild deleted file mode 100644 index fb4a73adcb20..000000000000 --- a/app-admin/mcelog/mcelog-189.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit linux-info python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A tool to log and decode Machine Check Exceptions" -HOMEPAGE="http://mcelog.org/" -SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-mcelog )" -DEPEND="${PYTHON_DEPS}" - -# TODO: add mce-inject to the tree to support test phase -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - local CONFIG_CHECK="~X86_MCE" - kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY" - check_extra_config - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \ - "${FILESDIR}"/${PN}-129-debugflags.patch - eapply_user - tc-export CC - python_fix_shebang genconfig.py -} - -src_install() { - default - - insinto /etc/logrotate.d/ - newins ${PN}.logrotate ${PN} - - newinitd "${FILESDIR}"/${PN}.init-r1 ${PN} - systemd_dounit ${PN}.service - - dodoc *.pdf -} diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest index 9d9a7343e712..8cdde037b931 100644 --- a/app-admin/ps_mem/Manifest +++ b/app-admin/ps_mem/Manifest @@ -1,3 +1,3 @@ DIST ps_mem-3.14.tar.gz 18539 BLAKE2B 29046d2bcef7eafea72921440664ec40b235ddb45d068e1b2edbb40e8318b0245ec320dd6d3b96e3aad9dc2666dd8bdf88686e4bab5ccff832a4de30e4644a15 SHA512 53d9e87e6a35f48b013c7280a954fb95373668e30f41fe3e5a9d2af9b7fb9060f113a80ac5ee3af6e23370058ff3afc8b2c88c99e1666d8422e3c73dc848ee81 EBUILD ps_mem-3.14.ebuild 626 BLAKE2B c1f1dba412a81f7f1f2833521dac3608405995af8c23b202a6791069fe9c2fc2d58f8058a1c883596075d70055165e9ba1e32e4e485696509c7d9fe77f1bff79 SHA512 16f7e31264e673b061522d2a72bb236d241221ccf73f971efa08cb0a9488e427b0b3f81aca5e33aac545bad0c718e589fa6e128f918520e093f79844283ab2b0 -MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7 +MISC metadata.xml 316 BLAKE2B bbf16e534e768183ea26fa3e25202cc08b40e2a0c01380903de019963114bd95d144361124279c9ae2e74c3ad75eff5030c2bbdb66b9e51cc5fdefd8b488e274 SHA512 8ac1f79e0f242442d741c3b214c15e0563d8a41a211991eb67f6a2001a6448e078f525c1025bae79d42a129458e945aadbf10648425f6090fcc170d6e6559e88 diff --git a/app-admin/ps_mem/metadata.xml b/app-admin/ps_mem/metadata.xml index da20bb112a7c..c6a9a6a96a6c 100644 --- a/app-admin/ps_mem/metadata.xml +++ b/app-admin/ps_mem/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> +<upstream> + <remote-id type="github">pixelb/ps_mem</remote-id> +</upstream> </pkgmetadata> diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index ce8d69b96183..ed771b52534d 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -4,19 +4,10 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac AUX master-initd-5 558 BLAKE2B 09a1485449b239b4f0d7e0514572084769c73b28053fc6ff9b4cbeb239358e7311784c15e883ddf5ca8310794e3d2bb851f2a765bb3aa17f8081ee008bfd130a SHA512 36b2d601d4dd3bd7b1758e77029b70916adbf8919c3ef04fd867ca25b143666d0c2f5834adddf05e7c2b013f04939f57e3396c888514e08f1679e6459a6ce7bb AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583 -AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3 -AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2c4aecbdaaa8bd53b3aef1acc96496bde162a0102064a400dff768c2cd5faddfe33a433922c5295b30dfef38e68841ebfe1a119644 SHA512 ce002f4fdf0d1e75cfbe9c2d3a6c98e08c21b0c436c500b70a0405c4ee10a1b1849446fab47dd681c71c9a847587fe97537de095768ecf650df9b53f3778ca62 AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30 -AUX salt-3002.5-tests.patch 1437 BLAKE2B 7c0ddc9ab12c7ed3d07e18a22623f5f9e24f47bf7e871ad7b71f0d1c482790f1ac994b628bbaa0692344deacf57526496c79f1aa7fc1a68092dea67392c0ce45 SHA512 1551757f01348d64de94b8b5830ad45333a06e1cd54d457702a33031b1f741ce12c23c9452e25d3498a0fa6a8c80ec425b0618809af7c3860ce1064946491cbb -AUX salt-3002.7-tests.patch 439 BLAKE2B 241d1efab22509c73e23d1e4e397fff5c6dadd7481cf8156df5d8c2b79e6b332c3e55e40e00582ed57c67da61dbad97a8be6df62209bd435db638e6e8a9d06c6 SHA512 c9145592a810a135111079d39d9a28cd0f4b7530e19864ee87b144b44c951b9a43e876f935f05a8ea8428da7fe3cfbcc49020baf46baf7b840816b15aff3f190 -AUX salt-3002.8-relax-pyzmq-dep.patch 293 BLAKE2B 7c56c7ea6124e18e6d71f1266cbdcca26537a2a5a72a996412a59eddeba5987748e9079a3ca601cde9365c65aca9e0aef3ed5f6fc47cd8dbfac3a43c59f0a4ca SHA512 3906630838b8d915e3bad3e1dd649d3ab6b42697aa4b26bedf3ab9dee406dd000440073fab026a967ee261cc1e64d7e14fbe1016f1d5b47576bbae496bee215f -AUX salt-3002.8-tests.patch 1531 BLAKE2B 8a8b02a0ad6099aac7722d8f8edd178b27817483ef9216ca3f00078231c13d2f5e3a551539956186933200d04349e67640aa691cb7e5f35e3f6a4ce3dfb71368 SHA512 e146a04570aa9524341216547d8a55a434499eb67c4be1167a0fee778ce93c172555816a5422462648ce5431106c47840e7c0f270b6087cf84058082a1a7341a AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3 AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc -AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928 -AUX salt-3003.4-relax-pyzmq-dep.patch 333 BLAKE2B 31596e398c420e04802f086e61ff59676a9687c199df0f7fcb9c7e6a804a3339e1c1960a0579cae0022f90c0e1a274aa90916b7a685239b54d47851246acbe1f SHA512 e9796a8cb0bcdc9d90f8a3d4e01d955a2ac1129edc3d572be7ddd472fd488bae933e80f6a107471c6660b61a16d9034cf4a80c7b8103a2c0b26b4392f5c70286 -AUX salt-3003.4-tests.patch 1982 BLAKE2B 920f9c7e587358cff0abf97f2dfe54ee523f82a35c238d193520e6bd30921cec993705dd93d0c8130d4794fe051e7236411afa552d311f2dcc30596c1bac2b51 SHA512 700cb7e9020383b0684898e4a6675174e552bed1ba7540cb773303ec151574707d142b888a99d5288e18236cf0d47169f1515041e4e6ca91204a0bc140f66898 AUX salt-3004.1-py310.patch 2071 BLAKE2B 23f8db2e2bc7307fd58e535bf642e9c76172d03d49b3e86333ee82434adbaa5f437330fa951221f233bba9e09b514611180d19f1db2856ba7d0a3a231a4b385f SHA512 6eec860778ceab15f5ea4260b648cd96df52daaec900dd093257af97e873e8a5be1296d4181767846eb63277a0b903e92ab6550772046acd7a8dea72eb0447f8 AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d82c13eaf9f2f2f4ed627f8690ba8893b58de7ef2f0a976879ce94f8f542b9198c637021ba08bc067f3eb56aa40e9598c75 SHA512 7c48d3f86cd81d11077c80ca9536a85c9825299dd9c2a81fd43fc2c2781211d9bb72e4dd79381343851c3292210eab41de049006e608ceb340af31a84cd244bb AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349 @@ -34,14 +25,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14 -DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1 -DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50 DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18 -EBUILD salt-3002.9-r1.ebuild 6085 BLAKE2B 6a41f53f3e87b43c21f4713fdfe3d84441b57b93e85a414516a07c91fe0fda9227004e7e6de6f1014aff752b80b36e8dd534f0cf4cd668f26085e710cce53eff SHA512 f24d46e24a9eedba4809e261634ba2f8fe41a649f5246715683fbdba00a1d034b433801b119b0a7868f8b9ccdb4bb4b7b66f739170ec9f71e5899f99f322c6ed -EBUILD salt-3003.5-r2.ebuild 6423 BLAKE2B 3580efca7073a310563ff3940a6590d6c24a982fe761d7fbbf075b6ed6aeaf75065af48e891c21668dd2b44b7030de28d8669e7742342371853e75dcc31c11da SHA512 533204ff503e40241f8222e8dab08071780322d957a8399f5476f9da4a53d1379e2cf5b77045e9597756f4f5f92d18e2275f996b2aa1d012f17463f3c7d2dad9 -EBUILD salt-3004.2-r2.ebuild 6533 BLAKE2B d5bf7a51958664827d878eba3a321b25a03311a96cac3c45bc28a18bd9121f899e5c2468174c54e34994a3aa97ef57f810b3fac9f4fa3240a4e5f1aaa19cdafb SHA512 874d073e4433afcaa8f8878ed33d1cb5ca1b652b264f0e39b0b0afb5c2e051b9f4aa8af9b9fb9fabb376338707bfdc1376e37851e546ad73bab521195a5dfe3b -EBUILD salt-3005-r1.ebuild 6981 BLAKE2B 25b00014910b7bb67661b64eb94ea261fcdefd6278c1d7454d25654dcaf1c4896c0706726e9df46e740c7a13fddddb0e29604389db9d5ec0fe36288cec891c7d SHA512 1ad93554d0200b5d21d7ac1347dca0bb97aa7ffb622b136b3ccaee5dfaf670232a91189f4dfce0d057ccfb316781d999a960bd660ed6922b424d6db1fddffbee -EBUILD salt-3005.1.ebuild 7215 BLAKE2B 2d171c462997346cd66681febbe27f8f4ee2df432b4fcb44ad62ea756b20667407710aed58236cfa4eddb1c948d1dc120a2814f038afbd9875ad3846dd629ef9 SHA512 b621b21f2f7db4b41a43db7614458b93bb81de6c09108a85250c811d7769c86cd7f42edf061ade6ccba39ce39d893b3d760ededaa4ead6994afbdaa43c0f28a0 +EBUILD salt-3004.2-r2.ebuild 6528 BLAKE2B ac76c30eef745bf6c794029c1bffe356fe6cd1b541ed3d1285502abf1422c627ea52a1ef52b9aa2433e121cd5090edc170143fb161516a765d203eb0dfb72f6f SHA512 bad1d8ac9bbb80f49db7b76b2622ebfa924b1424912e9c2137732319d82a9bfd6b7a84daed4b02a648b4d8d04d0d9ab38ada5dc4abf3de8b967ae669e8f6f318 +EBUILD salt-3005-r1.ebuild 6976 BLAKE2B c19b56458e4082af1f71640b4e87d4a0d4a09bb64d453c6fbe1ce204ad2cfda315c0875727defb7aec7038e62da2b8f19a0d18ae89a1c55ca6aebdec368f5363 SHA512 3db49d931481105faada8242254516d2aadf25d984e47cfe92f61985998727240fe8ed3bb4447b4bfb9cec92f8500745752f09d20743c304092cb14184867d1f +EBUILD salt-3005.1.ebuild 7210 BLAKE2B d9e23571fd1fd2334e708ac9262101d63f7f48be1bf630ff880357797b287c1881ed0d6dc8f50eb9ea8262d21af1cf0eb0ddd96638eed4d12cfa581bcb814c9c SHA512 0eefaf18ef343a5eace392049460b4853d08a4e421b34e2d2893c93864ea4b573701f7ec8a8032da6be50856dde229a6c5cdee35c5fd00696825f21d9cfb496b MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da diff --git a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch deleted file mode 100644 index d0172d739554..000000000000 --- a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py -index be26b3f093..ca971556d5 100644 ---- a/tests/unit/modules/test_boto_apigateway.py -+++ b/tests/unit/modules/test_boto_apigateway.py -@@ -169,6 +169,7 @@ def _has_required_botocore(): - return True - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - conn = None - -@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin): - self.addCleanup(delattr, self, 'conn') - - -+@skipIf(True, "Causes machines to OOM") - class BotoApiGatewayTestCaseMixin(object): - def _diff_list_dicts(self, listdict1, listdict2, sortkey): - ''' diff --git a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch deleted file mode 100644 index 5ef68dcd1803..000000000000 --- a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py -index 3ee0e2da5f..5b462f0a9e 100644 ---- a/tests/integration/files/file/base/_modules/runtests_helpers.py -+++ b/tests/integration/files/file/base/_modules/runtests_helpers.py -@@ -18,7 +18,7 @@ try: - from tests.support.runtests import RUNTIME_VARS - except ImportError: - # Salt SSH Tests -- SYS_TMP_DIR = os.path.realpath( -+ SYS_TMP_DIR = os.path.abspath( - # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long - # for unix sockets: ``error: AF_UNIX path too long`` - # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -diff --git a/tests/support/paths.py b/tests/support/paths.py -index 5f28904858..26245fadf9 100644 ---- a/tests/support/paths.py -+++ b/tests/support/paths.py -@@ -48,14 +48,12 @@ if TESTS_DIR not in sys.path: - sys.path.insert(1, TESTS_DIR) - - SYS_TMP_DIR = os.path.abspath( -- os.path.realpath( -- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -- # for unix sockets: ``error: AF_UNIX path too long`` -- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -- os.environ.get("TMPDIR", tempfile.gettempdir()) -- if not sys.platform.startswith("darwin") -- else "/tmp" -- ) -+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long -+ # for unix sockets: ``error: AF_UNIX path too long`` -+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} -+ os.environ.get("TMPDIR", tempfile.gettempdir()) -+ if not sys.platform.startswith("darwin") -+ else "/tmp" - ) - TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir") - TMP_ROOT_DIR = os.path.join(TMP, "rootdir") diff --git a/app-admin/salt/files/salt-3002.5-tests.patch b/app-admin/salt/files/salt-3002.5-tests.patch deleted file mode 100644 index 5a2eb43c3a42..000000000000 --- a/app-admin/salt/files/salt-3002.5-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- salt-3002.5/tests/unit/modules/test_cmdmod.py 2021-02-26 11:01:33.407219444 -0800 -+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 11:01:47.709124416 -0800 -@@ -560,6 +560,7 @@ - - self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout)) - -+ @skipIf(True, "doesn't work in sandbox") - def test_run_all_output_loglevel_debug(self): - """ - Test that specifying debug for loglevel ---- salt-3002.5//tests/unit/utils/test_thin.py 2021-02-26 13:30:47.841179546 -0800 -+++ salt-3002.5-python3_7//tests/unit/utils/test_thin.py 2021-02-26 13:41:33.681174531 -0800 -@@ -1275,6 +1275,7 @@ - @skipIf( - salt.utils.platform.is_windows(), "salt-ssh does not deploy to/from windows" - ) -+ @skipIf(True, "does not work with network-sandbox") - def test_thin_dir(self): - """ - Test the thin dir to make sure salt-call can run ---- salt-3002.5/tests/unit/modules/test_cmdmod.py 2021-02-26 13:30:48.014178373 -0800 -+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 13:43:22.395441008 -0800 -@@ -439,6 +439,7 @@ - - @skipIf(salt.utils.platform.is_windows(), "Do not run on Windows") - @skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS") -+ @skipIf(True, "does not work with network-sandbox") - def test_run_cwd_in_combination_with_runas(self): - """ - cmd.run executes command in the cwd directory diff --git a/app-admin/salt/files/salt-3002.7-tests.patch b/app-admin/salt/files/salt-3002.7-tests.patch deleted file mode 100644 index 828b7eee76eb..000000000000 --- a/app-admin/salt/files/salt-3002.7-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py -index e745f8f8c6..a2bb2a7ef2 100644 ---- a/tests/unit/modules/test_boto_route53.py -+++ b/tests/unit/modules/test_boto_route53.py -@@ -80,6 +80,7 @@ def _has_required_moto(): - return True - - -+@skipIf(True, "skipping broken test") - @skipIf(HAS_MOTO is False, "The moto module must be installed.") - @skipIf( - _has_required_moto() is False, diff --git a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch deleted file mode 100644 index e42a22b4e8b7..000000000000 --- a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index 77c9bd8be1..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,5 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>=19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3002.8-tests.patch b/app-admin/salt/files/salt-3002.8-tests.patch deleted file mode 100644 index c94a0c106347..000000000000 --- a/app-admin/salt/files/salt-3002.8-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/salt/transport/mixins/auth.py b/salt/transport/mixins/auth.py -index de86773750..3ca09260a0 100644 ---- a/salt/transport/mixins/auth.py -+++ b/salt/transport/mixins/auth.py -@@ -54,7 +54,7 @@ class AESPubClientMixin: - @salt.ext.tornado.gen.coroutine - def _decode_payload(self, payload): - # we need to decrypt it -- log.trace("Decoding payload: %s", payload) -+ log.debug("Decoding payload: %s", payload) - if payload["enc"] == "aes": - self._verify_master_signature(payload) - try: -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index 97bce1f10b..2ff5904b87 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -835,6 +835,7 @@ class ConfigTestCase(TestCase): - ) - - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") -+ @skipIf(True, "Broken with newer versions of jsonschema") - def test_hostname_config_validation(self): - class TestConf(schema.Schema): - item = schema.HostnameItem(title="Item", description="Item description") -@@ -2060,6 +2061,7 @@ class ConfigTestCase(TestCase): - item = schema.NotItem(item=schema.BooleanItem()) - self.assertEqual(item.serialize(), {"not": item.item.serialize()}) - -+ @skipIf(True, "Broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_not_config_validation(self): - class TestConf(schema.Schema): diff --git a/app-admin/salt/files/salt-3003.3-tests.patch b/app-admin/salt/files/salt-3003.3-tests.patch deleted file mode 100644 index 049d8c164c55..000000000000 --- a/app-admin/salt/files/salt-3003.3-tests.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py -index 29210d7522..4fd648116f 100644 ---- a/salt/transport/ipc.py -+++ b/salt/transport/ipc.py -@@ -2,7 +2,6 @@ - IPC transport classes - """ - -- - import errno - import logging - import socket -@@ -20,6 +19,7 @@ from salt.ext.tornado.ioloop import IOLoop - from salt.ext.tornado.ioloop import TimeoutError as TornadoTimeoutError - from salt.ext.tornado.iostream import IOStream, StreamClosedError - from salt.ext.tornado.locks import Lock -+import tornado.iostream - - log = logging.getLogger(__name__) - -@@ -693,11 +693,11 @@ class IPCMessageSubscriber(IPCClient): - if not first_sync_msg: - # We read at least one piece of data and we're on sync run - break -- except TornadoTimeoutError: -+ except TornadoTimeoutError if isinstance(TornadoTimeoutError, BaseException) else (salt.ext.tornado.ioloop.TimeoutError): - # In the timeout case, just return None. - # Keep 'self._read_stream_future' alive. - ret = None -- except StreamClosedError as exc: -+ except StreamClosedError if isinstance(StreamClosedError, BaseException) else (tornado.iostream.StreamClosedError) as exc: - log.trace("Subscriber disconnected from IPC %s", self.socket_path) - self._read_stream_future = None - except Exception as exc: # pylint: disable=broad-except -diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py -index 5f1cf11e24..8affb398ff 100644 ---- a/tests/integration/grains/test_core.py -+++ b/tests/integration/grains/test_core.py -@@ -21,6 +21,7 @@ def _freebsd_or_openbsd(): - return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd() - - -+@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD") - @pytest.mark.windows_whitelisted - class TestGrainsCore(ModuleCase): - """ -diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py -index 2321689ef5..574de51e56 100644 ---- a/tests/integration/states/test_x509.py -+++ b/tests/integration/states/test_x509.py -@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== - first_run[key]["changes"]["Certificate"]["New"]["Not After"], - "%Y-%m-%d %H:%M:%S", - ) -- self.assertEqual(29, (expiry - datetime.datetime.now()).days) -+ self.assertEqual(30, (expiry - datetime.datetime.now()).days) - self.assertTrue(os.path.exists(crtfile), "Certificate was not created.") - - with salt.utils.files.fopen(crtfile, "r") as first_cert: -@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== - }, - ) - self.assertEqual( -- "Certificate needs renewal: 29 days remaining but it needs to be at least 90", -+ "Certificate needs renewal: 30 days remaining but it needs to be at least 90", - second_run[key]["changes"]["Status"]["Old"], - ) - expiry = datetime.datetime.strptime( - second_run[key]["changes"]["Certificate"]["New"]["Not After"], - "%Y-%m-%d %H:%M:%S", - ) -- self.assertEqual(179, (expiry - datetime.datetime.now()).days) -+ self.assertEqual(180, (expiry - datetime.datetime.now()).days) - with salt.utils.files.fopen(crtfile, "r") as second_cert: - self.assertNotEqual( - cert_contents, -diff --git a/tests/pytests/functional/modules/state/requisites/test_listen.py b/tests/pytests/functional/modules/state/requisites/test_listen.py -index b7a90d0ca0..26030f403b 100644 ---- a/tests/pytests/functional/modules/state/requisites/test_listen.py -+++ b/tests/pytests/functional/modules/state/requisites/test_listen.py -@@ -292,43 +292,3 @@ def test_listen_requisite_resolution_names(state, state_tree): - assert "test_|-listener_service_|-nginx_|-mod_watch" in ret - assert "test_|-listener_service_|-crond_|-mod_watch" in ret - -- --def test_onlyif_req(state, subtests): -- onlyif = [{}] -- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_with_changes" -- with subtests.test(onlyif=onlyif): -- ret = state.single( -- name="onlyif test", fun="test.succeed_with_changes", onlyif=onlyif -- ) -- assert ret[state_id]["result"] is True -- assert ret[state_id]["comment"] == "Success!" -- -- onlyif = [{"fun": "test.true"}] -- state_id = "test_|-onlyif test_|-onlyif test_|-succeed_without_changes" -- with subtests.test(onlyif=onlyif): -- ret = state.single( -- name="onlyif test", fun="test.succeed_without_changes", onlyif=onlyif -- ) -- assert ret[state_id]["result"] is True -- assert not ret[state_id]["changes"] -- assert ret[state_id]["comment"] == "Success!" -- -- onlyif = [{"fun": "test.false"}] -- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" -- with subtests.test(onlyif=onlyif): -- ret = state.single( -- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif -- ) -- assert ret[state_id]["result"] is True -- assert not ret[state_id]["changes"] -- assert ret[state_id]["comment"] == "onlyif condition is false" -- -- onlyif = [{"fun": "test.true"}] -- state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes" -- with subtests.test(onlyif=onlyif): -- ret = state.single( -- name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif -- ) -- assert ret[state_id]["result"] is False -- assert ret[state_id]["changes"] -- assert ret[state_id]["comment"] == "Failure!" -diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py -index 5424514160..0564b59593 100644 ---- a/tests/pytests/unit/modules/test_cmdmod.py -+++ b/tests/pytests/unit/modules/test_cmdmod.py -@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154(): - - @pytest.mark.skip_on_darwin - @pytest.mark.skip_on_windows -+@pytest.mark.skip("does not work in sandbox environment") - def test_run_cwd_in_combination_with_runas(): - """ - cmd.run executes command in the cwd directory -diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py -index 3b91757a03..5fa0f88e78 100644 ---- a/tests/unit/ext/test_ipaddress.py -+++ b/tests/unit/ext/test_ipaddress.py -@@ -2707,6 +2707,7 @@ class IpaddrUnitTest(TestCase): - "2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff", - ) - -+ @pytest.mark.skip("_cache no longer present in python3.8+") - def testNetworkElementCaching(self): - # V4 - make sure we're empty - self.assertNotIn("broadcast_address", self.ipv4_network._cache) -diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py -index e745f8f8c6..ab36a90a79 100644 ---- a/tests/unit/modules/test_boto_route53.py -+++ b/tests/unit/modules/test_boto_route53.py -@@ -80,6 +80,7 @@ def _has_required_moto(): - return True - - -+@skipIf(True, "test case appears to be broken") - @skipIf(HAS_MOTO is False, "The moto module must be installed.") - @skipIf( - _has_required_moto() is False, -diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py -index 907c67f477..2429d27641 100644 ---- a/tests/unit/utils/test_parsers.py -+++ b/tests/unit/utils/test_parsers.py -@@ -5,6 +5,7 @@ - import os - import shutil - import tempfile -+import pytest - - import salt.config - import salt.log.setup as log -@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.log_file): - os.unlink(self.log_file) - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] -@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] -@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.ssh_log_file): - os.unlink(self.ssh_log_file) - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] + self.args -@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] + self.args -diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py -index bf7a323e26..3c8ce3a128 100644 ---- a/tests/unit/utils/test_vt.py -+++ b/tests/unit/utils/test_vt.py -@@ -17,6 +17,8 @@ import subprocess - import sys - import time - -+import pytest -+ - import salt.utils - import salt.utils.files - import salt.utils.platform -@@ -275,6 +277,7 @@ class VTTestCase(TestCase): - salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" - ) - @fixStdOutErrFileNoIfNeeded -+ @pytest.mark.skip("Does not work in sandbox environment") - def test_split_multibyte_characters_unicode(self): - """ - Tests that the vt correctly handles multibyte characters that are -@@ -342,6 +345,7 @@ class VTTestCase(TestCase): - salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" - ) - @fixStdOutErrFileNoIfNeeded -+ @pytest.mark.skip("Does not work in sandbox environment") - def test_split_multibyte_characters_shiftjis(self): - """ - Tests that the vt correctly handles multibyte characters that are diff --git a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch deleted file mode 100644 index 7585af58ab11..000000000000 --- a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt -index 35d9014713..ffa1589043 100644 ---- a/requirements/zeromq.txt -+++ b/requirements/zeromq.txt -@@ -1,6 +1,4 @@ - -r base.txt - -r crypto.txt - --pyzmq<=20.0.0 ; python_version < "3.6" --pyzmq>=17.0.0 ; python_version < "3.9" --pyzmq>=19.0.2 ; python_version >= "3.9" -+pyzmq diff --git a/app-admin/salt/files/salt-3003.4-tests.patch b/app-admin/salt/files/salt-3003.4-tests.patch deleted file mode 100644 index 93fd4214021b..000000000000 --- a/app-admin/salt/files/salt-3003.4-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index 0fc1844bc8..32346da1f6 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -34,7 +34,6 @@ import salt.utils.files - import salt.utils.path - import salt.utils.platform - import salt.utils.win_functions --import saltfactories.utils.compat - from salt.serializers import yaml - from salt.utils.immutabletypes import freeze - from tests.support.helpers import ( -@@ -465,9 +464,7 @@ def pytest_runtest_setup(item): - item._skipped_by_mark = True - pytest.skip(PRE_PYTEST_SKIP_REASON) - -- if saltfactories.utils.compat.has_unittest_attr( -- item, "__slow_test__" -- ) or item.get_closest_marker("slow_test"): -+ if item.get_closest_marker("slow_test"): - if item.config.getoption("--run-slow") is False: - item._skipped_by_mark = True - pytest.skip("Slow tests are disabled!") -diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py -index ef7acdb7a3..22953556cb 100644 ---- a/tests/unit/utils/test_schema.py -+++ b/tests/unit/utils/test_schema.py -@@ -1,6 +1,8 @@ - # pylint: disable=function-redefined - import copy - -+import pytest -+ - import salt.utils.json - import salt.utils.schema as schema - import salt.utils.stringutils -@@ -822,6 +824,7 @@ class ConfigTestCase(TestCase): - }, - ) - -+ @pytest.mark.skip("broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_hostname_config_validation(self): - class TestConf(schema.Schema): -@@ -2048,6 +2051,7 @@ class ConfigTestCase(TestCase): - item = schema.NotItem(item=schema.BooleanItem()) - self.assertEqual(item.serialize(), {"not": item.item.serialize()}) - -+ @pytest.mark.skip("broken with newer versions of jsonschema") - @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing") - def test_not_config_validation(self): - class TestConf(schema.Schema): diff --git a/app-admin/salt/salt-3002.9-r1.ebuild b/app-admin/salt/salt-3002.9-r1.ebuild deleted file mode 100644 index 57cc741d1ea3..000000000000 --- a/app-admin/salt/salt-3002.9-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) - -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" - 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/tomli[${PYTHON_USEDEP}] - dev-python/watchdog[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - <dev-python/importlib_metadata-5[${PYTHON_USEDEP}] - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - 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? ( - >=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=" - test? ( - ${RDEPEND} - >=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/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/pytest[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - net-dns/bind-tools - !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-2019.2.0-skip-tests-that-oom-machine.patch" - "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" - "${FILESDIR}/salt-3002-tests.patch" - "${FILESDIR}/salt-3002.5-tests.patch" - "${FILESDIR}/salt-3002.7-tests.patch" - "${FILESDIR}/salt-3004.2-jinja-3.patch" - "${FILESDIR}/salt-3002.8-tests.patch" - "${FILESDIR}/salt-3002.8-relax-pyzmq-dep.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,cache}}.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 salt/utils/virtualbox.py || die - - # tests that require network access - rm tests/unit/{states,modules}/test_zcbuildout.py || die - - sed -i 's:log.trace(:log.debug(:' \ - salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.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 - - 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() { - 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}")" - - ( - cleanup() { rm -f "${tempdir}" || die; } - - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die - - USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose \ - || die "testing failed with ${EPYTHON}" - ) -} - -pkg_postinst() { - : -} diff --git a/app-admin/salt/salt-3003.5-r2.ebuild b/app-admin/salt/salt-3003.5-r2.ebuild deleted file mode 100644 index 32ca2ccd2aae..000000000000 --- a/app-admin/salt/salt-3003.5-r2.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) - -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" - 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/tomli[${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}] ) - <dev-python/importlib_metadata-5[${PYTHON_USEDEP}] - libvirt? ( - dev-python/libvirt-python[${PYTHON_USEDEP}] - ) - 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? ( - >=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.1.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-1.3.14[${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*[${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}] - net-dns/bind-tools - >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] - !x86? ( >=dev-python/boto3-1.19.63[${PYTHON_USEDEP}] ) - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq ) - test? ( cheetah genshi )" -RESTRICT="!test? ( test ) x86? ( test )" - -# tests currently broken -RESTRICT+=" 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.3-tests.patch" - "${FILESDIR}/salt-3003.1-tests.patch" - "${FILESDIR}/salt-3004.2-jinja-3.patch" - "${FILESDIR}/salt-3003.4-tests.patch" - "${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch" - "${FILESDIR}/salt-3004.2-pyzmq-23.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() { - : -} diff --git a/app-admin/salt/salt-3004.2-r2.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild index c420cc03e20f..9a0c3a5933f5 100644 --- a/app-admin/salt/salt-3004.2-r2.ebuild +++ b/app-admin/salt/salt-3004.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit systemd distutils-r1 diff --git a/app-admin/salt/salt-3005-r1.ebuild b/app-admin/salt/salt-3005-r1.ebuild index 56568c4de1e6..47d410c70d15 100644 --- a/app-admin/salt/salt-3005-r1.ebuild +++ b/app-admin/salt/salt-3005-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit systemd distutils-r1 diff --git a/app-admin/salt/salt-3005.1.ebuild b/app-admin/salt/salt-3005.1.ebuild index f5eeccf44bb3..68afb794ae71 100644 --- a/app-admin/salt/salt-3005.1.ebuild +++ b/app-admin/salt/salt-3005.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) DISTUTILS_USE_PEP517=setuptools inherit systemd distutils-r1 diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest index 04adb1ad203a..32acfba2c4a1 100644 --- a/app-admin/xkcdpass/Manifest +++ b/app-admin/xkcdpass/Manifest @@ -1,3 +1,3 @@ DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555 EBUILD xkcdpass-1.19.3.ebuild 1077 BLAKE2B d0e3ab445a1f86966d63de20cf3c78136e4582384c9e160796ec73012b8ab99c53fb2501341132e5cee370d6928444a8ebba369ceb43f5c0138c781b04dbd5e3 SHA512 203be3dd89c515a66533a84a1b4c5d6543be85b710a5fa929283c04f5a5afc6862305736d5f6e171f7bd1f3e42757c0a66437ec72a20846aeacf4495f156e8fd -MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c +MISC metadata.xml 388 BLAKE2B a1477ba7c23e7ddab97dd869612794c1e1d0876cf9564bc54ecc6858280d6cc23dfac4e83d78f0f18543c5ae3804e1a701701e08ae6722e533c8c6f1dca29e71 SHA512 6a6bf779b5e0de8bb4a8be49253981590ee039b252db6bc4f25a8e1db6123a832fc7d628302e192aedd485e864b528d272da8a4e0f557987d4b7104c5d0ce985 diff --git a/app-admin/xkcdpass/metadata.xml b/app-admin/xkcdpass/metadata.xml index aa20bff17b1d..bff94a464c7b 100644 --- a/app-admin/xkcdpass/metadata.xml +++ b/app-admin/xkcdpass/metadata.xml @@ -5,4 +5,8 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> + <upstream> + <remote-id type="github">redacted/XKCD-password-generator</remote-id> + <remote-id type="pypi">xkcdpass</remote-id> + </upstream> </pkgmetadata> |