diff options
author | 2024-11-23 10:05:38 +0000 | |
---|---|---|
committer | 2024-11-23 10:05:38 +0000 | |
commit | ac9e78e61fdf3513f45d15029cd70e2f92aae836 (patch) | |
tree | a9b99ab9bd7c73fb976abf6382d411fb66f604c5 | |
parent | Merge updates from master (diff) | |
parent | dev-python/numpy: Stabilize 2.1.3 arm64, #944534 (diff) | |
download | gentoo-ac9e78e61fdf3513f45d15029cd70e2f92aae836.tar.gz gentoo-ac9e78e61fdf3513f45d15029cd70e2f92aae836.tar.bz2 gentoo-ac9e78e61fdf3513f45d15029cd70e2f92aae836.zip |
Merge updates from master
64 files changed, 364 insertions, 1880 deletions
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index b336074fe4c0..d6ef94b32110 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,8 +1,3 @@ -DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a2745067ed923c52f271de3fd249b8fc35d4f7aa9a6e523279c463f619294096b5e88d9800a53fc9d3c3a9ddeae1e507 SHA512 d2a1aafd3aba9441b6560e1a197c1c65c3597883ac93cd8c29e1c88f03cd554039ffaacd8df10392189de5ed0b11169b2d32c8a5513ab70cc0a9f331eb87813a DIST aws-cli-1.35.23.gh.tar.gz 2819656 BLAKE2B 6e9d20410344f075ce12bfc8c0a49941a846f02304de9a30516376d0b6666b8c0a9affb36dd94a463f48f17f478f5d27e0f7375a48c63eca1b3a28927211e6aa SHA512 9075af833da9abc9494a2dd01a987b874e2b4444d7d5d1f4f974da1b56940b88603e8ec115662c85c2beb7cb70a65c3bcdbbd5510a1973433f8030efc6a1c69a DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83 -DIST aws-cli-1.36.5.gh.tar.gz 2826720 BLAKE2B fc1fae0f6983c635e27a98747dc9cdf7b43dceedc52104923e4ad1272664b09a28939db876cd235206e83925cf77bdd872de82660ddd286ba6e8ede273b5a704 SHA512 009ff8306302f47c7ea1f5eff93265ce1334e799fb541b0a96759495790e30a0164501e09b45fd72a58aa828d1a67fed4061b4e65b4dd1f84722b49b0ba43f9e -DIST aws-cli-1.36.6.gh.tar.gz 2827814 BLAKE2B 23089b5c996a298b1a9cc529701f9ad25d5794b81e1bfdf952db829dd3d57ec2c5229f81fe071d6ef4e9d050b55766d3abb38a40ff10bb91dbb882c39dd2c68a SHA512 a02725703fe7cab1b55683a1cd9b7fcb4ca9fe7deedd7b867b52a9164af6522fe25be8da6ee1858708ad3a9e20f134155b70cc87d8c87d5df167336dc8539de0 -DIST aws-cli-1.36.7.gh.tar.gz 2830849 BLAKE2B 97dc3fe17c64e241d8bee007664e5c10feea87f799f6c4659883da1f85fb12610d46e77ed58cb884656a3b2ff89dd51e0f7d2bcc5ac8947b45c517a06d5f815e SHA512 bf8cfc09c0c3948d778d5ad9cdb5638f7b3ea7ac34c9e63e98a46fa06c651bc5798076a35229506f272b6b0160165bbea69beea5497989b70b6d2d2bc86334c8 -DIST aws-cli-1.36.8.gh.tar.gz 2833023 BLAKE2B e19765639c8f9c3c2b2faa607391ff48a75ce57d0d8d612caae577c81c3d26a5adc501304f6a2ef250d9b9841813495f24701c3b794d612c6d2903b88ffee4e5 SHA512 556bf9f8e26e620517a1fd7c907158a5d5ff49ea25987ccbacb7030c2f80aa45d63fff36327e30dce4a1b8f9030f5205788b3995027d920a49c56c45c2f9fe1b DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e diff --git a/app-admin/awscli/awscli-1.35.20.ebuild b/app-admin/awscli/awscli-1.35.20.ebuild deleted file mode 100644 index 7ea16f8ee0dc..000000000000 --- a/app-admin/awscli/awscli-1.35.20.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit bash-completion-r1 distutils-r1 - -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.(z+34) -BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))" -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.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -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 serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( "${serial_tests[@]}" ) - case ${EPYTHON} in - python3.13*) - EPYTEST_DESELECT+=( - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - ;; - esac - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -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.36.5.ebuild b/app-admin/awscli/awscli-1.36.5.ebuild deleted file mode 100644 index 2960403cf7e0..000000000000 --- a/app-admin/awscli/awscli-1.36.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit bash-completion-r1 distutils-r1 - -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-1).(z+59) -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))" -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.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -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 serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( - "${serial_tests[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -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.36.6.ebuild b/app-admin/awscli/awscli-1.36.6.ebuild deleted file mode 100644 index 2960403cf7e0..000000000000 --- a/app-admin/awscli/awscli-1.36.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit bash-completion-r1 distutils-r1 - -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-1).(z+59) -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))" -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.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -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 serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( - "${serial_tests[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -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.36.7.ebuild b/app-admin/awscli/awscli-1.36.7.ebuild deleted file mode 100644 index 2960403cf7e0..000000000000 --- a/app-admin/awscli/awscli-1.36.7.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit bash-completion-r1 distutils-r1 - -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-1).(z+59) -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))" -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.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -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 serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( - "${serial_tests[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -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.36.8.ebuild b/app-admin/awscli/awscli-1.36.8.ebuild deleted file mode 100644 index 2960403cf7e0..000000000000 --- a/app-admin/awscli/awscli-1.36.8.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit bash-completion-r1 distutils-r1 - -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-1).(z+59) -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))" -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.10.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - !app-admin/awscli-bin -" -BDEPEND=" - test? ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -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 serial_tests=( - tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} - tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking - tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows - tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking - tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success - tests/unit/customizations/test_sessionmanager.py - tests/unit/test_compat.py::TestIgnoreUserSignals - tests/unit/test_help.py - tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - EPYTEST_XDIST= epytest "${serial_tests[@]}" - - local EPYTEST_DESELECT=( - "${serial_tests[@]}" - - # flaky (some ordering?) - tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 - ) - # integration tests require AWS credentials and Internet access - epytest tests/{functional,unit} -} - -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/dev-python/alembic/alembic-1.14.0.ebuild b/dev-python/alembic/alembic-1.14.0.ebuild index cf8af9852135..954c93539342 100644 --- a/dev-python/alembic/alembic-1.14.0.ebuild +++ b/dev-python/alembic/alembic-1.14.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="doc" RDEPEND=" diff --git a/dev-python/async-timeout/Manifest b/dev-python/async-timeout/Manifest index 0e272d7787c7..e6590acc71ea 100644 --- a/dev-python/async-timeout/Manifest +++ b/dev-python/async-timeout/Manifest @@ -1,3 +1,2 @@ DIST async-timeout-4.0.3.tar.gz 8345 BLAKE2B cd603b5b58f85412220a99b7b5001ac08df18239f8fca0bf20648f1af982a5dd51b7d84ccce1d168530ee1c1afcef048e03b3de68ba8db068782f79da28bfddd SHA512 d7628370c47587a64170e067a5341bba17658da10900fb8ddf4426aa3f4facc55d63b28febb4b65abe12a9ff5be759319f49fc723c82a5a6cc27377c5e33a5a0 -DIST async_timeout-5.0.0.tar.gz 8951 BLAKE2B 6af85e8892eeeff5fb6fe0c000fb2a053bbcd8a3d5221b0fe90fbced50cfa257c09d229182b9f55c78f60a542e7570fe174b8c8248444dea36983483a5df5813 SHA512 542ed0d38e8e46140e4b7cd345c5dbd30112bd12f4e7de4c38784bcb7ba810bf10e9d6a9c16dadb2ce919954084164ec299f7b59eddc676cf29c46299e3259bd DIST async_timeout-5.0.1.tar.gz 9274 BLAKE2B cfc1d36d6627351308b91bc6c08030d1a9dbb9e09373bd13bc942884c6e5f7624aff30140d80c64cd9e99a4fd9ceb0cbdf8d5c14bb15c9b7615da9485d165520 SHA512 cf82de33bf4e092e8b092d9fdd18260ee708383940f3bb198bbad9ee137aa7573e511aaf2bc29f6c19c341c8e66abb6b8c4d5c0c20ca2e6fa0e12b25c2aef1a8 diff --git a/dev-python/async-timeout/async-timeout-5.0.0.ebuild b/dev-python/async-timeout/async-timeout-5.0.0.ebuild deleted file mode 100644 index c260a45b6106..000000000000 --- a/dev-python/async-timeout/async-timeout-5.0.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Timeout context manager for asyncio programs" -HOMEPAGE=" - https://github.com/aio-libs/async-timeout/ - https://pypi.org/project/async-timeout/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -o addopts= -p asyncio -} diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 96caee2cf5a1..b450789a8533 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -1,8 +1,3 @@ -DIST boto3-1.35.54.gh.tar.gz 882727 BLAKE2B 398e7743d30700856b15440c217d40e88aec4e58669009f68392e108373f2e57ff3c384be9bdc3873b102686df7f0e05f53d4518b149e982e0893473919db3cb SHA512 bfddb7c4b3816edc2b572bd6f412c0d085296df17b552930dfc9bb108c7100190da1f58f5f701d3ec3c36e6deb88c93e5af5bfc68963b76fc7c950d456815ec5 DIST boto3-1.35.57.gh.tar.gz 885077 BLAKE2B 4f3a29db5e76c706fbfd0afb3ec05d5518e69f3fd26d15e79024fb898d874818fa21031187d66078a4ebd107cce9461000e37506886f337049bd821e20933563 SHA512 19f951c04452203c070243bd8c944183221b51d9853efc19d33002af57c7d59c1967e8a7b606e56f772f35576ec6e1b52e2037138ba01a28f13685a49458c7d4 DIST boto3-1.35.63.gh.tar.gz 891481 BLAKE2B 092f4380aa31e57b3c8f6ef41ea8f0a4272e55f7a71762a532f338482f08782a11d57bdbc9af3630348706c4009bd0d3cd56ef4b2f1394d2d003638717cef860 SHA512 4deab7682b0f4d80a4aa12a8660b7263908411bd8f38692f9fa8820c6a18a4ecc3443e7524794282a0c0f38a4b94a1d09b6737e84ff3e01b9c8ac93abca2a9ce -DIST boto3-1.35.64.gh.tar.gz 892807 BLAKE2B bf2b899bfa3163efe20851079e764d99ccaf9c4a3555cc653363b42e018b9c5ce3bf3977d4fa0662de80c4163c4a97ff61842220d1cf21f6ff77c196fa6f6915 SHA512 3cb1f8ce15b2c7a977341c2f4338da6afa00ce359156bc48408d8f3c984a3ce8fc0da04c6897feb6e73bd4a5435d2b71a8f0e4d249880055ceda7b3e223a2889 -DIST boto3-1.35.65.gh.tar.gz 894025 BLAKE2B 378eef8673f3ed9a6d1495d0c4182679edb7671bd358d6041cba955a7a59954a9f516dfe371080926da669c14a4d47179ed22ffb326fb60ac6782e4d4f6963f0 SHA512 ad2335b0b18915971f49d44249d87808ed7b70977b30894070df941e3a84d9acb215f95ed7176f97faf8a9065c039ac0919dd8500114f1cf2d55169fb989d5e0 -DIST boto3-1.35.66.gh.tar.gz 896770 BLAKE2B 734980f82893d889fce0dadfd753f2be84390fef6d1d482c36b913ce02f5e189440c83eef8d94a34195289dc5246c244498f994b8be7ab439a66f32a97991c1e SHA512 a2fba42ba874fa829048f1579dcedba0eb8405a1d8474c90ebb941d44a575ac5c08f5830e2548fde37726dee279eea403ec8d894c28af1a67dab44af2ea4074e -DIST boto3-1.35.67.gh.tar.gz 898885 BLAKE2B 2d9cdc0e78bca1ce3301c309d7f9db0dcce310300de2995101ad7a6200066a9e8a3313af96be0256832e01620329bf48182f244faf2558bad98d4217f81cd08a SHA512 e8f7b08391cb26b73faa3cf72b88a996774e8c18694784710481b4203cd8b75ec00ad8fe8bab724c42265514e18d77c4880b7e9a04a21e7d58be473b500962df DIST boto3-1.35.68.gh.tar.gz 901189 BLAKE2B f7449998af169c873319d7b8748035db72c3af7be6499453c9fe61f40cbfd724dce7cf003fe700f6046f43c887768f4c26dd52e491f5734a5ec55c5b54e360c0 SHA512 24582ed20764870e2491a2dc48869089ebc4371a279eff68827ce3a6a962568fc1738e52285fa89a3a846385b498bb233460c1d0ae3177d735ad20b2cef7fea2 diff --git a/dev-python/boto3/boto3-1.35.54.ebuild b/dev-python/boto3/boto3-1.35.54.ebuild deleted file mode 100644 index 54e9299b7dca..000000000000 --- a/dev-python/boto3/boto3-1.35.54.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.35.64.ebuild b/dev-python/boto3/boto3-1.35.64.ebuild deleted file mode 100644 index 8cba6d95740e..000000000000 --- a/dev-python/boto3/boto3-1.35.64.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.35.65.ebuild b/dev-python/boto3/boto3-1.35.65.ebuild deleted file mode 100644 index 8cba6d95740e..000000000000 --- a/dev-python/boto3/boto3-1.35.65.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.35.66.ebuild b/dev-python/boto3/boto3-1.35.66.ebuild deleted file mode 100644 index 8cba6d95740e..000000000000 --- a/dev-python/boto3/boto3-1.35.66.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/boto3/boto3-1.35.67.ebuild b/dev-python/boto3/boto3-1.35.67.ebuild deleted file mode 100644 index 8cba6d95740e..000000000000 --- a/dev-python/boto3/boto3-1.35.67.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="The AWS SDK for Python" -HOMEPAGE=" - https://github.com/boto/boto3/ - https://pypi.org/project/boto3/ -" -SRC_URI=" - https://github.com/boto/boto3/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/botocore-${PV}[${PYTHON_USEDEP}] - >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}] -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - # don't lock versions to narrow ranges - sed -e '/botocore/ d' \ - -e '/jmespath/ d' \ - -e '/s3transfer/ d' \ - -i setup.py || die - - # 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 - - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 86849b611e47..5659324a2070 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -1,8 +1,3 @@ -DIST botocore-1.35.54.gh.tar.gz 13569174 BLAKE2B 1f4cb326d27ef028e16b20838fe1f7bc32cc5c782694d4d47dc2d0cd1384a7fdfe584f6225f41004c8e4c9028c1ac2b2b157daa073adab515d99a2cf1d42b19f SHA512 cab2956d9b7597295d761f232b9981085bb4daec182514fb514b6aed7bdb82ddca41b7b85900987f624828ae389f4ac282b0950692d965ccb9b67d6ce3d40362 DIST botocore-1.35.57.gh.tar.gz 13603794 BLAKE2B 23a4dc82e1d9667e75494c2fb651b883c7fbaf689679a1b40c3f277c33760fbaacd6843e6630876fe75597c6e6dc892726c609a97efcff0d46533460c379c43f SHA512 f20eccdcd0c027e3c1d6c631988c8913f3150b1b6da679fc18ea75824d0ef61b999ee9cad4f0d74edbb639cf52daf188fd7e256664e57fc89be09f33ed78d65e DIST botocore-1.35.63.gh.tar.gz 13692343 BLAKE2B 41ded808c412e9af8f938cf64db1632478f77d082417afac1f34905e946c0459545afa46854a41458090eab26a32b2733fb164f374455d8bdefea35718182632 SHA512 7185f5a288f848e1f3810ab9fa4eb46467321af6bdd345a8de623722ee513ab89f43303955487b014a3c349ed69a62c7bdf54e5095c3f4ebfd254fab51443ca8 -DIST botocore-1.35.64.gh.tar.gz 13718535 BLAKE2B 6fb1e8f858b9b5ea0796df76bed1df5b66dcce9eedd7e82c736def7b8f515354e157f1892f2a8b0c7d26cc4cc0501c122c0c8002c4dec0e175adf5c37e26a861 SHA512 d822ed760c0abf04afd2929a634fed9bb52ab9829a16cf31777fc832c7ec58594fbdd17e66f113332d1c63f9beb3310565aabece069941750fa1a172fdbf9163 -DIST botocore-1.35.65.gh.tar.gz 13727546 BLAKE2B a910934f226ca55c2cc55763f7a3eebdfe299410b9a99aadab3d938b864056063649984527f161969a3b0840bfad1e0bab07042c49de1efc8d25a3e17d33c496 SHA512 d7116f80522c3f5bafb29b7688800752539ee2ff06e53fd6b2a9c9cf3f37f9dcb3a731ec08d2cf735f737cabff3f5aa8314df697748135c56902c0ff4a3040ec -DIST botocore-1.35.66.gh.tar.gz 13752979 BLAKE2B cd8732c85c471c8360e6680e574a098e039020a22e4634f8c1f00df104e80b462f80be88db5b8f58e4d230acee8334ac8a5730fa63b8ced1f26e30922596f7d5 SHA512 29cd9ddbe8e51c5610ff1616c772da362721960eef72e95bf16559f175fa4ab908d54bf095154c6743f0fdcb057c966352beea693cc10b00ec7bf590da3e7e50 -DIST botocore-1.35.67.gh.tar.gz 13825419 BLAKE2B 3db50d138ff06df33dc5f5f42c409bfe70a8e5e8a8807d63049787a41f9dd81a3fa48dd26ac7510436dfee35ff6177e6ef04fa01da07057baea5afb7f53ab661 SHA512 61d829baea6a38bf005f85773789221190afd35eeb17d068e34d9aa425991cc29e2b896cca84e0ab29ff11911e69947d5b6aead574ed5b7498958ffb2e0443e5 DIST botocore-1.35.68.gh.tar.gz 13887015 BLAKE2B f49ea77be07628c9c0a471a76b87bc2b2e0371afdfdaf6da2ad39fdc828376dff14681167a2989b440f37fc5754dae12c7160cb14fb82187acbcf07e34647fc3 SHA512 e31ff9022f29e4cacd9c6085e9c8741d799986746e34965c37e12d8ecfc3a5f4fed8e14045e9ce4f2f552f31d07641ffe8a0209d9d220b942e1b54c2e0d0f848 diff --git a/dev-python/botocore/botocore-1.35.54.ebuild b/dev-python/botocore/botocore-1.35.54.ebuild deleted file mode 100644 index 2a4066b03f9d..000000000000 --- a/dev-python/botocore/botocore-1.35.54.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - <dev-python/jmespath-2[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.35.64.ebuild b/dev-python/botocore/botocore-1.35.64.ebuild deleted file mode 100644 index 0f88c5cbe9f3..000000000000 --- a/dev-python/botocore/botocore-1.35.64.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - <dev-python/jmespath-2[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.35.65.ebuild b/dev-python/botocore/botocore-1.35.65.ebuild deleted file mode 100644 index 0f88c5cbe9f3..000000000000 --- a/dev-python/botocore/botocore-1.35.65.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - <dev-python/jmespath-2[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.35.66.ebuild b/dev-python/botocore/botocore-1.35.66.ebuild deleted file mode 100644 index 0f88c5cbe9f3..000000000000 --- a/dev-python/botocore/botocore-1.35.66.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - <dev-python/jmespath-2[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/botocore/botocore-1.35.67.ebuild b/dev-python/botocore/botocore-1.35.67.ebuild deleted file mode 100644 index 0f88c5cbe9f3..000000000000 --- a/dev-python/botocore/botocore-1.35.67.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Low-level, data-driven core of boto 3" -HOMEPAGE=" - https://github.com/boto/botocore/ - https://pypi.org/project/botocore/ -" -SRC_URI=" - https://github.com/boto/botocore/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - <dev-python/jmespath-2[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] -" -# unbundled packages -RDEPEND+=" - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/jsonschema[${PYTHON_USEDEP}] - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # unpin deps - sed -i -e "s:>=.*':':" setup.py || die - - # unbundle deps - rm -r botocore/vendored || die - find -name '*.py' -exec sed -i \ - -e 's:from botocore[.]vendored import:import:' \ - -e 's:from botocore[.]vendored[.]:from :' \ - {} + || die - - distutils-r1_src_prepare -} - -python_test() { - local EPYTEST_DESELECT=( - # rely on bundled six - tests/functional/test_six_imports.py::test_no_bare_six_imports - tests/functional/test_six_threading.py::test_six_thread_safety - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest tests/{functional,unit} -} diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest index 294d6becd175..7453c370ad8e 100644 --- a/dev-python/cachecontrol/Manifest +++ b/dev-python/cachecontrol/Manifest @@ -1,2 +1 @@ -DIST cachecontrol-0.14.0.tar.gz 28899 BLAKE2B 158d70333b8e5cbbee31db788c9737a92592c3c342d17e4e1ff4826759e3fe14eb855556f9363c122fbf3fd68ca43a78b34b3327260fe51a15b30dde01302508 SHA512 4bb43475d43a2b83f9196cf02af7a881ab37da3b481777f1ae6b24df0f7dab54629fcdf9e07b00e1226a7707f5c92b0473481ef7cbbcaa4275665a41487c903f DIST cachecontrol-0.14.1.tar.gz 28928 BLAKE2B 9f01bc35c905f0fb489e796f96ccc0063a475bacc24b980ee67f8053412a52d9167b4b96495a8a7f7c561e2485a1b6fcb4ec94b1408ea5111f8661fea59394fd SHA512 f99463ee08199058d0f84a173d6a85276cfe6caec0bec6692e5af74f4c8e684a68ab6910c6c85cbd1f4515c7044ee2fbf149cfd85e4ce9d9ac97e9850698c07f diff --git a/dev-python/cachecontrol/cachecontrol-0.14.0.ebuild b/dev-python/cachecontrol/cachecontrol-0.14.0.ebuild deleted file mode 100644 index 00b7217135e7..000000000000 --- a/dev-python/cachecontrol/cachecontrol-0.14.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="httplib2 caching for requests" -HOMEPAGE=" - https://pypi.org/project/CacheControl/ - https://github.com/psf/cachecontrol/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86" - -RDEPEND=" - <dev-python/msgpack-2[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}] - >=dev-python/requests-2.16.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/cherrypy[${PYTHON_USEDEP}] - >=dev-python/filelock-3.8.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/dev-python/cfn-lint/cfn-lint-1.18.4.ebuild b/dev-python/cfn-lint/cfn-lint-1.18.4.ebuild index 086f03ea08df..b020827d82b1 100644 --- a/dev-python/cfn-lint/cfn-lint-1.18.4.ebuild +++ b/dev-python/cfn-lint/cfn-lint-1.18.4.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" RDEPEND=" >=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}] diff --git a/dev-python/flit-core/Manifest b/dev-python/flit-core/Manifest index 1f4eb88dbf1f..08356c292a94 100644 --- a/dev-python/flit-core/Manifest +++ b/dev-python/flit-core/Manifest @@ -1,2 +1 @@ DIST flit_core-3.10.1.tar.gz 42842 BLAKE2B bd17ab1fb955b1d829b4faaa42257176857b8a9b07132235455331cdd52943fa09fe5e4fd1091f1b15d477ec43e8084c2b409081d077c43a9a4cdbae9e8741b1 SHA512 ac0d39b6ee35b553fc8f7f3f6e558fdc32714ed64d6c506da7913ef95d00780b5f86894d9b042f32cdc51d38ec515fa02f1154b0edbc81d8e53475788c444b08 -DIST flit_core-3.9.0.tar.gz 41917 BLAKE2B 2fb053655a494736f5f9ce2d2c193d5d98622e410c0c0f18c92eb62d32ff98cbe830a1728461ed7e7e087d2fcf5f6a0c912717c2d534be688d688c4714c6865b SHA512 1205589930d2c51d6aa6b2533a122a912e63b157e94adba2a0649a58d324fa98a5b84609d9b53e9d236f1cdb6a6984de2cefcf2f11abc2cd83956df21f269ad6 diff --git a/dev-python/flit-core/flit-core-3.9.0.ebuild b/dev-python/flit-core/flit-core-3.9.0.ebuild deleted file mode 100644 index bbd23d9c0e2c..000000000000 --- a/dev-python/flit-core/flit-core-3.9.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 8 -- sys-apps/portage dep -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simplified packaging of Python modules (core module)" -HOMEPAGE=" - https://pypi.org/project/flit-core/ - https://github.com/pypa/flit/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{9..10}) -" -BDEPEND=" - test? ( dev-python/testpath[${PYTHON_USEDEP}] ) -" - -distutils_enable_tests pytest - -src_prepare() { - rm -r flit_core/vendor || die - sed -i -e 's:from \.vendor ::' flit_core/*.py || die - distutils-r1_src_prepare -} diff --git a/dev-python/httpx-socks/Manifest b/dev-python/httpx-socks/Manifest index 11bbe304ba44..9a069a6fdb1a 100644 --- a/dev-python/httpx-socks/Manifest +++ b/dev-python/httpx-socks/Manifest @@ -1,2 +1 @@ -DIST httpx-socks-0.9.1.gh.tar.gz 15210 BLAKE2B 88f38797110227c4e4f01fea7e47c9403573c3c06f6bd644858a6ad4947d90dcbd33c03a0d30a91f227b0e3f341c249dcdef2b009065447e95579e561fee7f4b SHA512 dec2a0eb2dbc692a7e45a2f0df3711057fdc50e7284985d234ed68b3af01372faaa532d070736a005eb49191d55927dc949e9297a6a471b89cf085ef38b56910 DIST httpx-socks-0.9.2.gh.tar.gz 15445 BLAKE2B 273380fc722780d090039aa74dd646ca3cd5dbc18d5ab3a030847fef0ad515f4ad171289d9cc125d1e8218b8e81a73c1b192caa2708238ed7ac288d3b2419c41 SHA512 41816f9dfa998b8a7e99ddc68d9e3473184fa44ecb08950234759dd9765496e92309852474d8688e392f6a25c4fcbeb7d6358b07bc574c68fd423e05bd052990 diff --git a/dev-python/httpx-socks/httpx-socks-0.9.1.ebuild b/dev-python/httpx-socks/httpx-socks-0.9.1.ebuild deleted file mode 100644 index 4086d7765a5e..000000000000 --- a/dev-python/httpx-socks/httpx-socks-0.9.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Proxy (HTTP, SOCKS) transports for httpx" -HOMEPAGE=" - https://github.com/romis2012/httpx-socks/ - https://pypi.org/project/httpx-socks/ -" -# no tests in sdist, as of 0.7.6 -SRC_URI=" - https://github.com/romis2012/httpx-socks/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/httpx-0.21.0[${PYTHON_USEDEP}] - >=dev-python/httpcore-0.17.3[${PYTHON_USEDEP}] - >=dev-python/python-socks-2.0.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/async-timeout-4.0.0[${PYTHON_USEDEP}] - >=dev-python/hypercorn-0.14.3[${PYTHON_USEDEP}] - >=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}] - >=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}] - >=dev-python/starlette-0.25.0[${PYTHON_USEDEP}] - >=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}] - >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] - >=dev-python/trustme-0.9.0[${PYTHON_USEDEP}] - >=dev-python/yarl-1.6.3[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # unpin dependencies - sed -i -e 's:,<[0-9.]*::' setup.py || die - - distutils-r1_src_prepare -} diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest index 14c2b8924b47..03d90ba2ee5f 100644 --- a/dev-python/ipyparallel/Manifest +++ b/dev-python/ipyparallel/Manifest @@ -1,2 +1 @@ -DIST ipyparallel-8.8.0.tar.gz 6800541 BLAKE2B ae40aa60eec2c07bb1ecce696df9f8429293e1602bced8e6220e6a93b780b44131a4fcbd01c921952cae9945fc509f6084570b96ce0c3da7ce4f0cc1d853db1b SHA512 9b0a03e1f581acbe56e3b51331d9fb97c422469e1d93348e6403d7c95a985f1f5a2a390645222fc4b60c0027ba168933679662561adb618d19ae7d680a2bb680 DIST ipyparallel-9.0.0.tar.gz 4403287 BLAKE2B 18248d6ee1eda409ff5de54ec7dbcdb75ac4a6dbd7af4fee23ec826d4c179e67454c980c6db00d180ddf078bd802a4b6f2e0245c63cf9bd55c99ead1bf1ba044 SHA512 4c89edba0bbad9ce75deaaa1e2486b1c50ca3f7a1a8f3c22b6dadc72f5b1f86958fe8c559e4548c69518494fd51c4ebe65f6019b154c8ffd3ef51eebb9bf1f03 diff --git a/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch b/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch deleted file mode 100644 index 2b0614e95d7d..000000000000 --- a/dev-python/ipyparallel/files/ipyparallel-7.1.0-test-timeouts.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.gentoo.org/823458 - -From: Sam James <sam@gentoo.org> -Date: Sun, 14 Nov 2021 08:34:15 +0000 -Subject: [PATCH] Crank up test timeouts - ---- a/ipyparallel/tests/__init__.py -+++ b/ipyparallel/tests/__init__.py -@@ -74,7 +74,7 @@ def setup(): - while not os.path.exists(engine_json) or not os.path.exists(client_json): - if cp.poll() is not None: - raise RuntimeError("The test controller exited with status %s" % cp.poll()) -- elif time.time() - tic > 15: -+ elif time.time() - tic > 60: - raise RuntimeError("Timeout waiting for the test controller to start.") - time.sleep(0.1) - add_engines(1) -@@ -107,7 +107,7 @@ def add_engines(n=1, profile='iptest', total=False): - while len(rc) < base + n: - if any([ep.poll() is not None for ep in eps]): - raise RuntimeError("A test engine failed to start.") -- elif time.time() - tic > 15: -+ elif time.time() - tic > 60: - raise RuntimeError("Timeout waiting for engines to connect.") - time.sleep(0.1) - rc.close() ---- a/ipyparallel/tests/test_lbview.py -+++ b/ipyparallel/tests/test_lbview.py -@@ -21,7 +21,7 @@ class TestLoadBalancedView(ClusterTestCase): - self.assertRaisesRemote(error.EngineError, ar.get, 10) - eid = ar.engine_id - tic = time.time() -- while eid in self.client.ids and time.time() - tic < 5: -+ while eid in self.client.ids and time.time() - tic < 30: - time.sleep(0.01) - assert eid not in self.client.ids - ---- a/ipyparallel/tests/test_view.py -+++ b/ipyparallel/tests/test_view.py -@@ -47,7 +47,7 @@ class TestView(ClusterTestCase): - ar = view.apply_async(conditional_crash, ipp.Reference("should_crash")) - self.assertRaisesRemote(error.EngineError, ar.get, 10) - tic = time.perf_counter() -- while eid in self.client.ids and time.perf_counter() - tic < 5: -+ while eid in self.client.ids and time.perf_counter() - tic < 30: - time.sleep(0.05) - assert eid not in self.client.ids - diff --git a/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild deleted file mode 100644 index 914e39f18627..000000000000 --- a/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="Interactive Parallel Computing with IPython" -HOMEPAGE=" - https://ipyparallel.readthedocs.io/ - https://github.com/ipython/ipyparallel/ - https://pypi.org/project/ipyparallel/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - dev-python/entrypoints[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - >=dev-python/pyzmq-18[${PYTHON_USEDEP}] - >=dev-python/traitlets-4.3[${PYTHON_USEDEP}] - >=dev-python/ipython-4[${PYTHON_USEDEP}] - >=dev-python/jupyter-client-5[${PYTHON_USEDEP}] - dev-python/jupyter-server[${PYTHON_USEDEP}] - >=dev-python/ipykernel-4.4[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - >=dev-python/tornado-5.1[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/flit-core[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-tornado[${PYTHON_USEDEP}] - dev-python/testpath[${PYTHON_USEDEP}] - ) -" - -# TODO: package myst_parser -# distutils_enable_sphinx docs/source -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch -) - -src_configure() { - export IPP_DISABLE_JS=1 -} - -python_test() { - local EPYTEST_DESELECT=( - # we don't run a mongo instance for tests - ipyparallel/tests/test_mongodb.py::TestMongoBackend - # TODO - ipyparallel/tests/test_util.py::test_disambiguate_ip - # Gets upset that a timeout _doesn't_ occur, presumably because - # we're cranking up too many test timeouts. Oh well. - # bug #823458#c3 - ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send - # We could patch the timeout for these too but they're going to be inherently - # fragile anyway based on what they do. - ipyparallel/tests/test_client.py::TestClient::test_activate - ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets - ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines - ) - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p asyncio -p tornado -} - -python_install_all() { - distutils-r1_python_install_all - # move /usr/etc stuff to /etc - mv "${ED}/usr/etc" "${ED}/etc" || die -} - -pkg_postinst() { - optfeature "Jupyter Notebook integration" dev-python/notebook -} diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest index 3cfd2242ced0..1b0b9fdc100f 100644 --- a/dev-python/kgb/Manifest +++ b/dev-python/kgb/Manifest @@ -1,2 +1 @@ -DIST kgb-7.1.1.tar.gz 61504 BLAKE2B 37aa4c78e0e74c2ad10db047453229d903c72dc9f359ce916f66b24ddc390e89126869e8e52942854911952e995b45f9a304e48574c7c79319f388d0f70d148f SHA512 29e5d78270f55b82b917a1e448307397f813502cc3a262fd6af082417f3875c88732b3f7c11c6001120bb0cba4079c2c6351b2b24287b1f5a3b3c891cf3f8d55 DIST kgb-7.2.tar.gz 61228 BLAKE2B 3c4d922629fb40792b0a37e7390a468f3b2ec71fd197846f25081dff799d7b2bb6fb0c298a1251e32b5142923fffa26dc2516ddee96c6c1829bd2345ff6beac2 SHA512 2311a524d4e5266399fddbf8c12644dd6d265b4a0538cd820421a7fb4f8d291f662209b6642daf3777bfca16b8eb976ead12e063dad1242f897619070e5cfd27 diff --git a/dev-python/kgb/kgb-7.1.1.ebuild b/dev-python/kgb/kgb-7.1.1.ebuild deleted file mode 100644 index c91e01ad0b6b..000000000000 --- a/dev-python/kgb/kgb-7.1.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Python function spy support for unit tests" -HOMEPAGE=" - https://github.com/beanbaginc/kgb/ - https://pypi.org/project/kgb/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64 x86" - -distutils_enable_tests pytest - -src_prepare() { - # remove .dev tag that breaks revdeps - sed -i -e '/tag_build/d' setup.cfg || die - distutils-r1_src_prepare -} diff --git a/dev-python/mediafile/mediafile-0.13.0.ebuild b/dev-python/mediafile/mediafile-0.13.0.ebuild index 9b38f47ff8dc..f8ec0eacd34d 100644 --- a/dev-python/mediafile/mediafile-0.13.0.ebuild +++ b/dev-python/mediafile/mediafile-0.13.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" RDEPEND=" >=dev-python/filetype-1.2.0[${PYTHON_USEDEP}] diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild index 1ad2af7ab97d..d1977cb2e919 100644 --- a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild +++ b/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" IUSE="social" RDEPEND=" diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.2.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.2.ebuild index b683a29bfa18..d32a09e1729a 100644 --- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.2.ebuild +++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" RDEPEND=" >=dev-python/mkdocs-1.1.1[${PYTHON_USEDEP}] diff --git a/dev-python/moto/moto-5.0.20.ebuild b/dev-python/moto/moto-5.0.20.ebuild index 6b7e14c1d8c7..467b620e50cc 100644 --- a/dev-python/moto/moto-5.0.20.ebuild +++ b/dev-python/moto/moto-5.0.20.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 arm64 ~riscv ~x86" RDEPEND=" >=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}] diff --git a/dev-python/numpy/numpy-2.1.3.ebuild b/dev-python/numpy/numpy-2.1.3.ebuild index f4d7c122732e..7f8fdbe96642 100644 --- a/dev-python/numpy/numpy-2.1.3.ebuild +++ b/dev-python/numpy/numpy-2.1.3.ebuild @@ -20,7 +20,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" # +lapack because the internal fallbacks are pretty slow. Building without blas # is barely supported anyway, see bug #914358. IUSE="big-endian +lapack" diff --git a/dev-python/orjson/orjson-3.10.11-r1.ebuild b/dev-python/orjson/orjson-3.10.11-r1.ebuild index 70e2ba0ce4dd..73878c5fac40 100644 --- a/dev-python/orjson/orjson-3.10.11-r1.ebuild +++ b/dev-python/orjson/orjson-3.10.11-r1.ebuild @@ -64,7 +64,7 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016 " SLOT="0" -KEYWORDS="~amd64 arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" +KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" BDEPEND=" test? ( diff --git a/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild index 9a8e2700c1e1..1b46cf0b5cef 100644 --- a/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild +++ b/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" RDEPEND=" >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest index 9955c7f8f3ee..d65c17f40bfa 100644 --- a/dev-python/pyrfc3339/Manifest +++ b/dev-python/pyrfc3339/Manifest @@ -1,2 +1 @@ -DIST pyrfc3339-1.1.gh.tar.gz 11727 BLAKE2B 210104e5e7c3ed917d6a3475335fce74e4da1c55fddbb76c539b3dd37ec4ce943334e530a9558d13954bc625d4f7f1a7ac2296abf0fd01e87a9664167f7de4be SHA512 96627bcaa64556cc0a87be985fd4f42e7733b342882a4dc5bc5b7d0712bf3f197e09d7c9b7f760117a772bb012829176a61b848903fc41584f26776d3f18ec8f DIST pyrfc3339-2.0.1.gh.tar.gz 12986 BLAKE2B 1e029db52c3230994865bf5a065a8aa56d501dba0ced4fd3d94411fa29cc928fe745ed73445b9ea8d7485695f7d5770f9c5338323b9ce8bcc1e73681638a7117 SHA512 4557810fca1720ee628ef3614a599edbcec36090e88c63f78c3d607e87f6636601efeb6e9a1ee72a553f28f24011e7c1731c3dbc0a6bc87951b9a7d4a9acc39a diff --git a/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch b/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch deleted file mode 100644 index 82dbbb32f3dc..000000000000 --- a/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch +++ /dev/null @@ -1,193 +0,0 @@ -https://github.com/kurtraschke/pyRFC3339/pull/16 -From: Matthew Davis <github@virtual.drop.net> -Date: Thu, 7 Apr 2022 18:29:02 -0400 -Subject: [PATCH] Remove python-nose requirements from tests - -Converted nose related tests to pytest. ---- a/pyrfc3339/tests/tests.py -+++ b/pyrfc3339/tests/tests.py -@@ -8,12 +8,11 @@ - - from pyrfc3339 import generate, parse - from pyrfc3339.utils import timezone -+import unittest -+import pytest - import pytz - --from nose.tools import eq_, raises -- -- --class TestCore(): -+class TestCore(unittest.TestCase): - ''' - This test suite contains tests to address cases not tested in the doctests, - as well as additional tests for end-to-end verification. -@@ -24,8 +23,11 @@ def test_timezone_rounding(self): - Test rounding of timezone values to the nearest second. - - ''' -- eq_(timezone(5429), '+01:30') -- eq_(timezone(5431), '+01:31') -+ if not timezone(5429) == '+01:30': -+ raise AssertionError("%r != %r" % (timezone(5429), '+01:30')) -+ -+ if not timezone(5431) == '+01:31': -+ raise AssertionError("%r != %r" % (timezone(5431), '+01:31')) - - def test_zero_offset(self): - ''' -@@ -34,11 +36,13 @@ def test_zero_offset(self): - ''' - timestamp = '2009-01-01T10:02:03+00:00' - dt = parse(timestamp) -- eq_(dt.tzinfo, pytz.utc) -+ if not dt.tzinfo == pytz.utc: -+ raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) - - timestamp = '2009-01-01T10:02:03-00:00' - dt = parse(timestamp) -- eq_(dt.tzinfo, pytz.utc) -+ if not dt.tzinfo == pytz.utc: -+ raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc)) - - def test_deepcopy(self): - ''' -@@ -56,7 +60,8 @@ def test_parse_microseconds(self): - ''' - timestamp = '2009-01-01T10:02:03.25Z' - dt = parse(timestamp) -- eq_(dt.microsecond, 250000) -+ if not dt.microsecond == 250000: -+ raise AssertionError("%r != %r" % (dt.microsecond, 250000)) - - def test_generate_microseconds(self): - ''' -@@ -65,7 +70,8 @@ def test_generate_microseconds(self): - ''' - dt = datetime(2009, 1, 1, 10, 2, 3, 500000, pytz.utc) - timestamp = generate(dt, microseconds=True) -- eq_(timestamp, '2009-01-01T10:02:03.500000Z') -+ if not timestamp == '2009-01-01T10:02:03.500000Z': -+ raise AssertionError("%r != %r" % (timestamp, '2009-01-01T10:02:03.500000Z')) - - def test_mixed_case(self): - ''' -@@ -76,7 +82,8 @@ def test_mixed_case(self): - dt1 = parse('2009-01-01t10:01:02z') - dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc) - -- eq_(dt1, dt2) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) - - def test_parse_naive_utc(self): - ''' -@@ -84,15 +91,17 @@ def test_parse_naive_utc(self): - - ''' - dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True) -- eq_(dt1.tzinfo, None) -+ if not dt1.tzinfo == None: -+ raise AssertionError("%r != %r" % (dt1.tzinfo, None)) - -- @raises(ValueError) - def test_parse_naive_local(self): - ''' - Test that parsing a local timestamp to a naive datetime fails. - - ''' -- parse('2009-01-01T10:01:02-04:00', produce_naive=True) -+ with self.assertRaises(ValueError) as context: -+ parse('2009-01-01T10:01:02-04:00', produce_naive=True) -+ - - def test_generate_utc_parse_utc(self): - ''' -@@ -103,7 +112,8 @@ def test_generate_utc_parse_utc(self): - dt1 = dt1.replace(tzinfo=pytz.utc) - - dt2 = parse(generate(dt1, microseconds=True)) -- eq_(dt1, dt2) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) - - def test_generate_local_parse_local(self): - ''' -@@ -113,7 +123,8 @@ def test_generate_local_parse_local(self): - eastern = pytz.timezone('US/Eastern') - dt1 = eastern.localize(datetime.utcnow()) - dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False) -- eq_(dt1, dt2) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) - - def test_generate_local_parse_utc(self): - ''' -@@ -123,10 +134,12 @@ def test_generate_local_parse_utc(self): - eastern = pytz.timezone('US/Eastern') - dt1 = eastern.localize(datetime.utcnow()) - dt2 = parse(generate(dt1, utc=False, microseconds=True)) -- eq_(dt1, dt2) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) - - --class TestExhaustiveRoundtrip(): -+@pytest.mark.parametrize('tz_name', pytz.all_timezones) -+class TestExhaustiveRoundtrip: - ''' - This test suite exhaustively tests parsing and generation by generating - a local RFC 3339 timestamp for every timezone supported by pytz, -@@ -135,36 +148,32 @@ class TestExhaustiveRoundtrip(): - - slow = True - -- def test_local_roundtrip(self): -- for tz_name in pytz.all_timezones: -- yield self.local_roundtrip, tz_name -- -- def local_roundtrip(self, tz_name): -+ def test_local_roundtrip(self, tz_name): - ''' - Generates a local datetime using the given timezone, - produces a local timestamp from the datetime, parses the timestamp - to a local datetime, and verifies that the two datetimes are equal. - - ''' -- tzinfo = pytz.timezone(tz_name) -- dt1 = tzinfo.localize(datetime.utcnow()) -- timestamp = generate(dt1, utc=False, microseconds=True) -- dt2 = parse(timestamp, utc=False) -- eq_(dt1, dt2) -- -- def test_utc_roundtrip(self): -- for tz_name in pytz.all_timezones: -- yield self.utc_roundtrip, tz_name -+ if not tz_name == 'leapseconds': -+ tzinfo = pytz.timezone(tz_name) -+ dt1 = tzinfo.localize(datetime.utcnow()) -+ timestamp = generate(dt1, utc=False, microseconds=True) -+ dt2 = parse(timestamp, utc=False) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) - -- def utc_roundtrip(self, tz_name): -+ def test_utc_roundtrip(self, tz_name): - ''' - Generates a local datetime using the given timezone, - produces a local timestamp from the datetime, parses the timestamp - to a UTC datetime, and verifies that the two datetimes are equal. - - ''' -- tzinfo = pytz.timezone(tz_name) -- dt1 = tzinfo.localize(datetime.utcnow()) -- timestamp = generate(dt1, utc=False, microseconds=True) -- dt2 = parse(timestamp) -- eq_(dt1, dt2) -+ if not tz_name == 'leapseconds': -+ tzinfo = pytz.timezone(tz_name) -+ dt1 = tzinfo.localize(datetime.utcnow()) -+ timestamp = generate(dt1, utc=False, microseconds=True) -+ dt2 = parse(timestamp) -+ if not dt1 == dt2: -+ raise AssertionError("%r != %r" % (dt1, dt2)) diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild deleted file mode 100644 index 651bcc8a9c30..000000000000 --- a/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Generates and parses RFC 3339 timestamps" -HOMEPAGE="https://github.com/kurtraschke/pyRFC3339" -SRC_URI=" - https://github.com/kurtraschke/pyRFC3339/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" -S=${WORKDIR}/pyRFC3339-${PV} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" - -RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${P}-pytest.patch" -) - -distutils_enable_tests pytest - -python_test() { - epytest pyrfc3339/tests/tests.py -} diff --git a/dev-python/pysmi/pysmi-1.5.9.ebuild b/dev-python/pysmi/pysmi-1.5.9.ebuild index 3ccc6c84a329..a5e29b16ff4e 100644 --- a/dev-python/pysmi/pysmi-1.5.9.ebuild +++ b/dev-python/pysmi/pysmi-1.5.9.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86" RDEPEND=" >=dev-python/jinja2-3.1.3[${PYTHON_USEDEP}] diff --git a/dev-python/pysnmp/pysnmp-7.1.13.ebuild b/dev-python/pysnmp/pysnmp-7.1.13.ebuild index 8e1fe159f72f..ebcd56d7a2e0 100644 --- a/dev-python/pysnmp/pysnmp-7.1.13.ebuild +++ b/dev-python/pysnmp/pysnmp-7.1.13.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86" PROPERTIES="test_network" RESTRICT="test" diff --git a/dev-python/simpleeval/simpleeval-1.0.3.ebuild b/dev-python/simpleeval/simpleeval-1.0.3.ebuild index c2691f0c9b1f..c3f285110b5f 100644 --- a/dev-python/simpleeval/simpleeval-1.0.3.ebuild +++ b/dev-python/simpleeval/simpleeval-1.0.3.ebuild @@ -16,6 +16,6 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" distutils_enable_tests unittest diff --git a/dev-python/trimesh/trimesh-4.5.2.ebuild b/dev-python/trimesh/trimesh-4.5.2.ebuild index 7b71b21dd4d0..58c9f28ea269 100644 --- a/dev-python/trimesh/trimesh-4.5.2.ebuild +++ b/dev-python/trimesh/trimesh-4.5.2.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest index 0f60ac99c09b..8e0d96e110b4 100644 --- a/dev-python/typeguard/Manifest +++ b/dev-python/typeguard/Manifest @@ -1,3 +1 @@ -DIST typeguard-4.3.0.tar.gz 73374 BLAKE2B 0a7cd0dfa2c3caa19160cd66fffeeafe21cb1d195271b82e67d26fa471615768c48f8dd7d92a004db187b9b231f1bce12f1054d98f4157b784854dbb32b18320 SHA512 ce085f0655beede2d3e1178c64cea0a6fbebe9e7eeece3f9ff656233d74d3d9be5c4119aaecdc0541e9adf9c6f1458b06e6c2056b8e5394ded3f7ae4101e9e11 -DIST typeguard-4.4.0.tar.gz 74399 BLAKE2B 2f4131e3ebf632660d2aa8838c729049b5a2e0864a2e18527a9a14527497341425507cb152fa48f507eb698f54b13f2a25caa173017619d5e6456ea582fd6433 SHA512 7c15cc724b8e4b0a5b777a14727a45cb0c039be18ade1ba6d8b00cfaaa3c2c7fc0c98320a53e172d07ad069f10b995384894e262a5bd14c00d6a04a7595e26aa DIST typeguard-4.4.1.tar.gz 74959 BLAKE2B 1b08e7404045d128bbecf5c16c0b24dbc42a59a3e78d0516f458989d6874d7795332017ac87ce59a7ed05edf4df6b918516d63d90723c702b5d05d7acc0193df SHA512 af862371b22237cc39efad4840bb0bbd632116bee6e095531426dbaff606b6c1b2b58c82ddc083f816c340b4151421ff911ffd689dc3dc2fb7a031c067182aba diff --git a/dev-python/typeguard/typeguard-4.3.0.ebuild b/dev-python/typeguard/typeguard-4.3.0.ebuild deleted file mode 100644 index 725ce2370edd..000000000000 --- a/dev-python/typeguard/typeguard-4.3.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Run-time type checker for Python" -HOMEPAGE=" - https://pypi.org/project/typeguard/ - https://github.com/agronholm/typeguard/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/typing-extensions-4.10.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - # mypy changes results from version to version - # (we can't use EPYTEST_IGNORE because pytest_ignore_collect breaks it) - rm -rf tests/mypy || die - - local -x PYTHONDONTWRITEBYTECODE= - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # the XFAIL test pass due to some package being installed - epytest -o xfail_strict=False -p typeguard -} diff --git a/dev-python/typeguard/typeguard-4.4.0.ebuild b/dev-python/typeguard/typeguard-4.4.0.ebuild deleted file mode 100644 index 2fb152939008..000000000000 --- a/dev-python/typeguard/typeguard-4.4.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Run-time type checker for Python" -HOMEPAGE=" - https://pypi.org/project/typeguard/ - https://github.com/agronholm/typeguard/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -RDEPEND=" - >=dev-python/typing-extensions-4.10.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_test() { - # mypy changes results from version to version - # (we can't use EPYTEST_IGNORE because pytest_ignore_collect breaks it) - rm -rf tests/mypy || die - - local -x PYTHONDONTWRITEBYTECODE= - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # the XFAIL test pass due to some package being installed - epytest -o xfail_strict=False -p typeguard -} diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest index 9e5d3d7f50e7..bb51bbb4a63d 100644 --- a/dev-python/werkzeug/Manifest +++ b/dev-python/werkzeug/Manifest @@ -1,3 +1 @@ -DIST werkzeug-3.0.6.tar.gz 805170 BLAKE2B 7aa02e3e979d9375ec676d02f43738b96410fc3dddf60ca96fc9709790caa47e590952e7675f9226af9f8111271463e82a7069d0ed6e8e672188bc824d3d04a8 SHA512 500f47e13546a3d0ce3a41f21157649571ea70b332ca22758bad939cb42aee4d1b58b64cecc4ed83a857ad466f37de8256cf7b53ad28e5fe0fd353455df3639b -DIST werkzeug-3.1.2.tar.gz 806496 BLAKE2B e7020f4044889f105473300ac3e14faf98f4f840fe6ac03c7a99c43ab31c8e48544ee1bf04e0d0633229f6f2043b7e2d440080d99a56ec7292422310175f8011 SHA512 f8628364dcd999ab4c50c3c4fbf8de78da24f541d2fb768be313296a116de901c9a8c3001c6280f07a0ffba102f7dcf02658f3f9a2c48517c029df5753d44c35 DIST werkzeug-3.1.3.tar.gz 806925 BLAKE2B 1bb69dfb9ec0b8e40e4df9098d5e7e69aa74c419c0a9ab3c798a3d2a92599744aecb22a8e4b3d14840355bf21457171456630d30a4d3bf7f9344a3ea5d87ee4f SHA512 922c7c377cb10baa76ba9457a2334716969fe058cbc75725989a3d8c61c061a8cf5c6e8bdce70ec098db7822dd12db3391fb8c1471f51d99f48c54df00b182e1 diff --git a/dev-python/werkzeug/files/werkzeug-3.0.2-pytest-xprocess-1.patch b/dev-python/werkzeug/files/werkzeug-3.0.2-pytest-xprocess-1.patch deleted file mode 100644 index 3993b0847957..000000000000 --- a/dev-python/werkzeug/files/werkzeug-3.0.2-pytest-xprocess-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index b73202cd..905f3f4b 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -107,10 +107,12 @@ def dev_server(xprocess, request, tmp_path): - # Unbuffered output so the logs update immediately. - env = {**os.environ, "PYTHONPATH": str(tmp_path), "PYTHONUNBUFFERED": "1"} - -- @cached_property -- def pattern(self): -- client.request("/ensure") -- return "GET /ensure" -+ def startup_check(self): -+ try: -+ client.request("/ensure") -+ return True -+ except (ConnectionRefusedError, FileNotFoundError): -+ return False - - # Each test that uses the fixture will have a different log. - xp_name = f"dev_server-{request.node.name}" diff --git a/dev-python/werkzeug/werkzeug-3.0.6.ebuild b/dev-python/werkzeug/werkzeug-3.0.6.ebuild deleted file mode 100644 index 7f6712b44f6d..000000000000 --- a/dev-python/werkzeug/werkzeug-3.0.6.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Collection of various utilities for WSGI applications" -HOMEPAGE=" - https://palletsprojects.com/p/werkzeug/ - https://pypi.org/project/Werkzeug/ - https://github.com/pallets/werkzeug/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - >=dev-python/pytest-xprocess-1[${PYTHON_USEDEP}] - >=dev-python/watchdog-2.3[${PYTHON_USEDEP}] - test-rust? ( - dev-python/cryptography[${PYTHON_USEDEP}] - ) - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/pallets/werkzeug/issues/2875 - "${FILESDIR}/${PN}-3.0.2-pytest-xprocess-1.patch" -) - -python_test() { - local EPYTEST_DESELECT=( - # RequestRedirect class started incidentally being tested - # with pytest-8, though the test isn't prepared for that - # https://github.com/pallets/werkzeug/issues/2845 - 'tests/test_exceptions.py::test_response_body[RequestRedirect]' - ) - if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - "tests/test_serving.py::test_server[https]" - tests/test_serving.py::test_ssl_dev_cert - tests/test_serving.py::test_ssl_object - ) - fi - - # the default portage tempdir is too long for AF_UNIX sockets - local -x TMPDIR=/tmp - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p xprocess -p timeout tests -} diff --git a/dev-python/werkzeug/werkzeug-3.1.2.ebuild b/dev-python/werkzeug/werkzeug-3.1.2.ebuild deleted file mode 100644 index 886c4e4621ba..000000000000 --- a/dev-python/werkzeug/werkzeug-3.1.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Collection of various utilities for WSGI applications" -HOMEPAGE=" - https://palletsprojects.com/p/werkzeug/ - https://pypi.org/project/Werkzeug/ - https://github.com/pallets/werkzeug/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - >=dev-python/pytest-xprocess-1[${PYTHON_USEDEP}] - >=dev-python/watchdog-2.3[${PYTHON_USEDEP}] - test-rust? ( - dev-python/cryptography[${PYTHON_USEDEP}] - ) - ) -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=() - if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then - EPYTEST_DESELECT+=( - "tests/test_serving.py::test_server[https]" - tests/test_serving.py::test_ssl_dev_cert - tests/test_serving.py::test_ssl_object - ) - fi - - # the default portage tempdir is too long for AF_UNIX sockets - local -x TMPDIR=/tmp - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p xprocess -p timeout tests -} diff --git a/dev-python/yappi/yappi-1.6.9.ebuild b/dev-python/yappi/yappi-1.6.9.ebuild index c96c9bcafc47..aa0709d6e13f 100644 --- a/dev-python/yappi/yappi-1.6.9.ebuild +++ b/dev-python/yappi/yappi-1.6.9.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86" distutils_enable_tests unittest diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index 8399a7affcd0..2947d3d66990 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -1,3 +1,5 @@ DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512 DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d +DIST gnu-efi-3.0.19.tar.gz 218588 BLAKE2B 78db87904e644406ce2eb1a0ef0f325e7ad0f004dd56199e319985c5d035b4755d545c1a6bcf749da08c7670132de28a3e53ba059956b841034c6b059e39042b SHA512 78a79f51bd271043edbf534427d8fbba3d8099e831a9643019899453e8363ebd4d43f6e5448cdde31d43a6bdb94ec32e73425138bfb614617b8886df90fc1665 +DIST gnu-efi-4.0.0.tar.gz 228852 BLAKE2B 30a22785b43b586596e9b4cfd281815715529185fbfdb800947ee08a94b3dac80ee13e9f2a8f5cf4acc46b7844cef9e92de97e97801d085249dce3afb2b0fcf0 SHA512 737fda41a45a63ab652f3e8dd5c035bc40dd66e839218c33478fe2ce81346f004b1bed79a5ec29cc282f0d699ad21256e0915482a3fa04b880dea21cae9e2b7f diff --git a/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch b/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch new file mode 100644 index 000000000000..858200e3010f --- /dev/null +++ b/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/888829 + +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -41,9 +41,7 @@ + + include $(SRCDIR)/../Make.defaults + +-LINUX_HEADERS = /usr/src/sys/build + APPSDIR = $(LIBDIR)/gnuefi/apps +-CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include + + ifneq ($(HAVE_EFI_OBJCOPY),) + ifeq ($(SYSTEM_HAS_EFI_OBJCOPY),0) diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild new file mode 100644 index 000000000000..ad0bc6c1ac36 --- /dev/null +++ b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild @@ -0,0 +1,143 @@ +# Copyright 2004-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Library for build EFI Applications" +HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" +SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz" + +# inc/, lib/ dirs (README.efilib) +# - BSD-2 +# gnuefi dir: +# - BSD (3-cluase): crt0-efi-ia32.S +# - GPL-2+ : setjmp_ia32.S +LICENSE="GPL-2+ BSD BSD-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="abi_x86_32 abi_x86_64 custom-cflags" +REQUIRED_USE=" + amd64? ( || ( abi_x86_32 abi_x86_64 ) ) + x86? ( || ( abi_x86_32 abi_x86_64 ) ) +" + +# for ld.bfd and objcopy +BDEPEND="sys-devel/binutils" + +# These objects get run early boot (i.e. not inside of Linux), +# so doing these QA checks on them doesn't make sense. +QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o" +RESTRICT="strip" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.18-clang.patch + "${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch +) + +check_and_set_objcopy() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + # bug #931792 + # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail + tc-export OBJCOPY + OBJCOPY="${OBJCOPY/llvm-/}" + # Test OBJCOPY to see if it supports EFI targets, and return if it does + LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0 + # If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is + # still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the + # '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if + # so, we use the absolute path explicitly. + local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}" + if [[ -e "${binutils_objcopy}" ]]; then + OBJCOPY="${binutils_objcopy}" + fi + if ! use arm && ! use riscv; then + # bug #939338 + # objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le + # gnu-efi containes a workaround + LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" + fi + fi +} + +check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + tc-is-gcc || tc-is-clang || die "Unsupported compiler" + fi +} + +pkg_pretend() { + check_compiler +} + +pkg_setup() { + check_compiler + check_and_set_objcopy +} + +src_prepare() { + default + sed -i -e "s/-Werror//" Make.defaults || die +} + +efimake() { + local arch= + case ${CHOST} in + arm*) arch=arm ;; + aarch64*) arch=aarch64 ;; + ia64*) arch=ia64 ;; + i?86*) arch=ia32 ;; + riscv64*) arch=riscv64;; + x86_64*) arch=x86_64 ;; + *) die "Unknown CHOST" ;; + esac + + local args=( + ARCH="${arch}" + HOSTCC="${BUILD_CC}" + CC="${CC}" + AS="${AS}" + LD="${LD}" + AR="${AR}" + OBJCOPY="${OBJCOPY}" + PREFIX="${EPREFIX}/usr" + LIBDIR='$(PREFIX)'/$(get_libdir) + ) + emake -j1 "${args[@]}" "$@" +} + +src_compile() { + tc-export BUILD_CC AR AS CC LD OBJCOPY + + if ! use custom-cflags; then + unset CFLAGS CPPFLAGS LDFLAGS + fi + + # work around musl: include first the compiler include dir, then the system one + # bug #933080, #938012 + local CPPINCLUDEDIR + if tc-is-gcc; then + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include + elif tc-is-clang; then + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include + fi + append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include" + + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake + else + efimake + fi +} + +src_install() { + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install + else + efimake INSTALLROOT="${D}" install + fi + einstalldocs +} diff --git a/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild new file mode 100644 index 000000000000..991d495bd8d8 --- /dev/null +++ b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild @@ -0,0 +1,144 @@ +# Copyright 2004-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Library for build EFI Applications" +HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" +SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz" + +# inc/, lib/ dirs (README.efilib) +# - BSD-2 +# gnuefi dir: +# - BSD (3-cluase): crt0-efi-ia32.S +# - GPL-2+ : setjmp_ia32.S +LICENSE="GPL-2+ BSD BSD-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="abi_x86_32 abi_x86_64 custom-cflags" +REQUIRED_USE=" + amd64? ( || ( abi_x86_32 abi_x86_64 ) ) + x86? ( || ( abi_x86_32 abi_x86_64 ) ) +" + +# for ld.bfd and objcopy +BDEPEND="sys-devel/binutils" + +# These objects get run early boot (i.e. not inside of Linux), +# so doing these QA checks on them doesn't make sense. +QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o" +RESTRICT="strip" + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.0-remove-linux-headers.patch +) + +DOCS="README* SECURITY* docs/*" + +check_and_set_objcopy() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + # bug #931792 + # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail + tc-export OBJCOPY + OBJCOPY="${OBJCOPY/llvm-/}" + # Test OBJCOPY to see if it supports EFI targets, and return if it does + LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0 + # If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is + # still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the + # '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if + # so, we use the absolute path explicitly. + local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}" + if [[ -e "${binutils_objcopy}" ]]; then + OBJCOPY="${binutils_objcopy}" + fi + if ! use arm && ! use riscv; then + # bug #939338 + # objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le + # gnu-efi containes a workaround + LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" + fi + fi +} + +check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + tc-is-gcc || tc-is-clang || die "Unsupported compiler" + fi +} + +pkg_pretend() { + check_compiler +} + +pkg_setup() { + check_compiler + check_and_set_objcopy +} + +src_prepare() { + default + sed -i -e "s/-Werror//" Make.defaults || die +} + +efimake() { + local arch= + case ${CHOST} in + arm*) arch=arm ;; + aarch64*) arch=aarch64 ;; + ia64*) arch=ia64 ;; + i?86*) arch=ia32 ;; + riscv64*) arch=riscv64;; + x86_64*) arch=x86_64 ;; + *) die "Unknown CHOST" ;; + esac + + local args=( + ARCH="${arch}" + HOSTCC="${BUILD_CC}" + CC="${CC}" + AS="${AS}" + LD="${LD}" + AR="${AR}" + OBJCOPY="${OBJCOPY}" + PREFIX="${EPREFIX}/usr" + LIBDIR='$(PREFIX)'/$(get_libdir) + ) + emake -j1 "${args[@]}" "$@" +} + +src_compile() { + tc-export BUILD_CC AR AS CC LD OBJCOPY + + if ! use custom-cflags; then + unset CFLAGS CPPFLAGS LDFLAGS + fi + + # work around musl: include first the compiler include dir, then the system one + # bug #933080, #938012 + local CPPINCLUDEDIR + if tc-is-gcc; then + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include + elif tc-is-clang; then + CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include + fi + append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include" + + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake + else + efimake + fi +} + +src_install() { + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install + else + efimake INSTALLROOT="${D}" install + fi + einstalldocs +} diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild b/sys-boot/refind/refind-0.14.2-r2.ebuild index 9897b9108ce3..85984c41cc6d 100644 --- a/sys-boot/refind/refind-0.14.2-r2.ebuild +++ b/sys-boot/refind/refind-0.14.2-r2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 x86" FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" IUSE="${FS_USE} doc" -DEPEND="sys-boot/gnu-efi" +DEPEND="<sys-boot/gnu-efi-4.0.0" # for ld.bfd and objcopy BDEPEND="sys-devel/binutils" diff --git a/sys-boot/refind/refind-0.14.2-r3.ebuild b/sys-boot/refind/refind-0.14.2-r3.ebuild index ee7c4a3ed0ca..1ae2bbe01929 100644 --- a/sys-boot/refind/refind-0.14.2-r3.ebuild +++ b/sys-boot/refind/refind-0.14.2-r3.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs" IUSE="${FS_USE} doc" -DEPEND="sys-boot/gnu-efi" +DEPEND="<sys-boot/gnu-efi-4.0.0" # for ld.bfd and objcopy BDEPEND="sys-devel/binutils" diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild index 2f5223f474b9..49f2a0af1795 100644 --- a/sys-fs/compsize/compsize-1.5.ebuild +++ b/sys-fs/compsize/compsize-1.5.ebuild @@ -22,6 +22,8 @@ IUSE="debug" DEPEND="sys-fs/btrfs-progs" +PATCHES=( "${FILESDIR}/${P}-btrfs-progs.patch" ) + src_prepare() { default # Don't try to install a gzipped manfile during emake install diff --git a/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch new file mode 100644 index 000000000000..3d2d75e370c0 --- /dev/null +++ b/sys-fs/compsize/files/compsize-1.5-btrfs-progs.patch @@ -0,0 +1,35 @@ +diff --git a/compsize.c b/compsize.c +index 42ec304..0f533e5 100644 +--- a/compsize.c ++++ b/compsize.c +@@ -5,12 +5,14 @@ + #include <unistd.h> + #include <fcntl.h> + #include <dirent.h> ++#include "kerncompat.h" + #include <btrfs/ioctl.h> + #include <btrfs/ctree.h> + #include <stdarg.h> + #include <stdlib.h> + #include <sys/ioctl.h> + #include <inttypes.h> ++#include <errno.h> + #include <linux/limits.h> + #include <getopt.h> + #include <signal.h> +diff --git a/radix-tree.h b/radix-tree.h +index bf96d83..d99ea7e 100644 +--- a/radix-tree.h ++++ b/radix-tree.h +@@ -37,11 +37,7 @@ + #ifndef _LINUX_RADIX_TREE_H + #define _LINUX_RADIX_TREE_H + +-#if BTRFS_FLAT_INCLUDES + #include "kerncompat.h" +-#else +-#include <btrfs/kerncompat.h> +-#endif /* BTRFS_FLAT_INCLUDES */ + + #define RADIX_TREE_MAX_TAGS 2 + diff --git a/sys-fs/compsize/metadata.xml b/sys-fs/compsize/metadata.xml index ba656c0ab8ac..76c8a8ae2eb8 100644 --- a/sys-fs/compsize/metadata.xml +++ b/sys-fs/compsize/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>davidroman96@gmail.com</email> + <name>David Roman</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">kilobyte/compsize</remote-id> </upstream> |