From 8e49340ce0aaf205556648d8fa27dd30e8cf4435 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Sep 2024 12:29:28 +0100 Subject: gentoo auto-resync : 08:09:2024 - 12:29:27 --- app-admin/Manifest.gz | Bin 32030 -> 32016 bytes app-admin/awscli/Manifest | 10 +- app-admin/awscli/awscli-1.34.0.ebuild | 90 --------------- app-admin/awscli/awscli-1.34.11.ebuild | 90 --------------- app-admin/awscli/awscli-1.34.12.ebuild | 90 --------------- app-admin/awscli/awscli-1.34.13.ebuild | 90 --------------- app-admin/awscli/awscli-1.34.5.ebuild | 2 +- app-admin/calamares/Manifest | 2 +- app-admin/calamares/calamares-3.3.6-r1.ebuild | 155 -------------------------- app-admin/calamares/calamares-3.3.6-r2.ebuild | 115 +++++++++++++++++++ 10 files changed, 118 insertions(+), 526 deletions(-) delete mode 100644 app-admin/awscli/awscli-1.34.0.ebuild delete mode 100644 app-admin/awscli/awscli-1.34.11.ebuild delete mode 100644 app-admin/awscli/awscli-1.34.12.ebuild delete mode 100644 app-admin/awscli/awscli-1.34.13.ebuild delete mode 100644 app-admin/calamares/calamares-3.3.6-r1.ebuild create mode 100644 app-admin/calamares/calamares-3.3.6-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 3803b8b373ab..2b20a4e182de 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index 04faf1db7aa2..ba486014f09d 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,15 +1,7 @@ -DIST aws-cli-1.34.0.gh.tar.gz 2773056 BLAKE2B c6c9d89fe719116faad47417dd1aa9a98125b65efaf61476582cf7fec16e7ab5bd9823b6973bde51891a8bdad8ec9bfade305abfcee2eb70f6cf2679ef815d1b SHA512 914efb62ec94825529e981c934f617b0c1ae3c367b7215bff7160b8bef7c3ea73d0400d3e04ff237546731e3586077c83ed918c0747f75ff4079e8b5e1159809 DIST aws-cli-1.34.10.gh.tar.gz 2788517 BLAKE2B 8b110119087836435f3e0ef29a6cfe35dd3a387bff4051cc94b9beb4e8a2d929460ac14c659ef0c3a37cb6378e7910eca7c92975f04ac2d1b2140e2aedd0eb60 SHA512 46844c919a3998040897ccdf48cf4ed616a9debc125d03386f53bce66597a8cc077f9be7735b133085c3225c9402acd94da85fffbd1205e732ad5cd5b56bf9a2 -DIST aws-cli-1.34.11.gh.tar.gz 2788896 BLAKE2B ad93904c6c18f2ac036bd0b0e02c40f8c8e28cb0390affb61670f9d3732cc957a51d47122d644990a0cb425f6cdf255d00c9119f030593341ddd3c0627f4e09e SHA512 e52789ca4bf8cfe8f8020d99ba133bb4b5ee6f456185370f9ef358245677ec05e8bfe8bd034a7b4f29fe85ca3ed27ff0537b383ab8958085d755521436f2092c -DIST aws-cli-1.34.12.gh.tar.gz 2789609 BLAKE2B 2434e61520302fe73cfcff0a380791b995d2720e411eef48bcb9614b38aa4724f0b9ae820af5c6f3af1e3a79a12ead81883239658c05dbe4eb1485ab9e0ec917 SHA512 2a585f388d1e9d27871202907b74479cfdc07776b8d491c225bbfd60f4a9c4017d4b20a81b357c11f99f97cb1876411aea12da48b87cb126a9be24293a2c5d22 -DIST aws-cli-1.34.13.gh.tar.gz 2790086 BLAKE2B db4944dbfaea7599e8c277e781b069fdeb10170330a3c529e8244dfa7a961afa09dd254e3612434ce41368b77264048fe1f84a6264a661510cbb71ddeb3bbca8 SHA512 d7e8cf5584df70e490766f0f107babd8b60068c614cd813fe00b489a7bfee00ab1c977407ca66e8374e8856141e84c6a993b2d6ae61e0c742de831f830073565 DIST aws-cli-1.34.14.gh.tar.gz 2790437 BLAKE2B df3355ac11561ac7f6e2a7c707d08de0b3335b4321ef3f5730a9abd6a23dfa909e0ba27367e705c56ce7223bbb7d1d436759457f0f92a0d7b4da21e6392a0c6b SHA512 be707816a1f6a53ab32870eaed498bfd47782b07c146af79d6f5cc1153e0b180788be1cc48cbf21f8850d04a79b3255bcfa2456079c57585e4779083bc5353e1 DIST aws-cli-1.34.5.gh.tar.gz 2774000 BLAKE2B 34368cc257a99a9c7212972bcff91c46352db8659c5fe98101c9192cb674663b9090b3608d88875875d24488869fcb571e8602532219cf0a25bc3159f3bf285c SHA512 4dc305e4e659fbbd17a265b6c9589e20c63eec671114a67687c225081f8095a8627499441f78d76e6fa0da59b03ae078833227db0434c97572a7f5f7c4a43e5a -EBUILD awscli-1.34.0.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1 EBUILD awscli-1.34.10.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 -EBUILD awscli-1.34.11.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 -EBUILD awscli-1.34.12.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 -EBUILD awscli-1.34.13.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 EBUILD awscli-1.34.14.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 -EBUILD awscli-1.34.5.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0 +EBUILD awscli-1.34.5.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.34.0.ebuild b/app-admin/awscli/awscli-1.34.0.ebuild deleted file mode 100644 index 96357b5055a1..000000000000 --- a/app-admin/awscli/awscli-1.34.0.ebuild +++ /dev/null @@ -1,90 +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 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.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[@]}" ) - # 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.34.11.ebuild b/app-admin/awscli/awscli-1.34.11.ebuild deleted file mode 100644 index 599b9bd389b9..000000000000 --- a/app-admin/awscli/awscli-1.34.11.ebuild +++ /dev/null @@ -1,90 +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 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.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[@]}" ) - # 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.34.12.ebuild b/app-admin/awscli/awscli-1.34.12.ebuild deleted file mode 100644 index 599b9bd389b9..000000000000 --- a/app-admin/awscli/awscli-1.34.12.ebuild +++ /dev/null @@ -1,90 +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 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.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[@]}" ) - # 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.34.13.ebuild b/app-admin/awscli/awscli-1.34.13.ebuild deleted file mode 100644 index 599b9bd389b9..000000000000 --- a/app-admin/awscli/awscli-1.34.13.ebuild +++ /dev/null @@ -1,90 +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 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)" -RDEPEND=" - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/rsa[${PYTHON_USEDEP}] - >=dev-python/s3transfer-0.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[@]}" ) - # 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.34.5.ebuild b/app-admin/awscli/awscli-1.34.5.ebuild index 599b9bd389b9..96357b5055a1 100644 --- a/app-admin/awscli/awscli-1.34.5.ebuild +++ b/app-admin/awscli/awscli-1.34.5.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" # botocore is x.(y+1).z BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)" diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 17403847123a..79b949eb1a1d 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,4 +1,4 @@ AUX calamares-gentoo-branding.desc 10382 BLAKE2B 1a8f68c54d1e7d4392f4545b4d5cb3bebfb16c2d15320be3b0b63382ed255ebf79ac6286f6111b8b357603abde5b58f12da9ad2713bbfdf7445f7a135ba37637 SHA512 b2136662e2d580679dd13c4e642364329231c5636421911a0012f6763fe602959b54616323bb81f857b78fa12187f0331fb290611c720a45ec3c122b4e6e65f8 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 -EBUILD calamares-3.3.6-r1.ebuild 4107 BLAKE2B fec52736168a9530e1928d057fac111003f87ac4c985266c9d8ffda42e2480db91c9d98be72c08b30634dd3b67fdb75a9177a22a840eed93ec88c5b6b15a706e SHA512 dbfce01620be1c0b7a6bd4a6943cf69ad1f38b044bccad5c11897ef95c5a0fc8c7bc62b869670b718998ae659a804f2f95edb851919b58572ebb4e7410193678 +EBUILD calamares-3.3.6-r2.ebuild 2983 BLAKE2B e4d9ea9d806879c895cf1e0e418feae9458dc19d65ac9187efafd29267b31da86ec12b1e2aa0b67f960742528c7c27d5bd2d7ae5bccbbafae85ace3b24c59554 SHA512 ae386faa344907006672393aa7355fc6aeaed4e8a234cf65444fda66235f41227be751bdb8435ff2dd9acf3850ed87084ce5b494a39ceac2a911fea49f5705c4 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72 diff --git a/app-admin/calamares/calamares-3.3.6-r1.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild deleted file mode 100644 index 2036bb2bfb26..000000000000 --- a/app-admin/calamares/calamares-3.3.6-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_{10..12} ) - -inherit ecm python-single-r1 - -DESCRIPTION="Distribution-independent installer framework" -HOMEPAGE="https://calamares.io" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="~amd64" -IUSE="+networkmanager qt6 +upower" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -QT5_MIN="5.15.0" -KF_QT5_MIN="5.78" -QT6_MIN="6.5.0" -KF_QT6_MIN="5.240" - -BDEPEND=" - qt6? ( - >=dev-qt/qttools-${QT6_MIN}:6[linguist] - >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN} - ) - !qt6? ( - >=dev-qt/linguist-tools-${QT5_MIN}:5 - >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN} - ) -" -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/yaml-cpp:= - $(python_gen_cond_dep ' - >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] - ') - qt6? ( - >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT6_MIN}:6 - >=dev-qt/qtsvg-${QT6_MIN}:6 - >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] - >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 - >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 - >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 - >=kde-frameworks/ki18n-${KF_QT6_MIN}:6 - >=kde-frameworks/kpackage-${KF_QT6_MIN}:6 - >=kde-frameworks/kparts-${KF_QT6_MIN}:6 - >=kde-frameworks/kservice-${KF_QT6_MIN}:6 - >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6 - sys-auth/polkit-qt[qt6(-)] - >=sys-libs/kpmcore-24.01.75:6= - ) - !qt6? ( - >=dev-qt/qtconcurrent-${QT5_MIN}:5 - >=dev-qt/qtdbus-${QT5_MIN}:5 - >=dev-qt/qtdeclarative-${QT5_MIN}:5 - >=dev-qt/qtgui-${QT5_MIN}:5 - >=dev-qt/qtnetwork-${QT5_MIN}:5 - >=dev-qt/qtsvg-${QT5_MIN}:5 - >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] - >=dev-qt/qtwidgets-${QT5_MIN}:5 - >=dev-qt/qtxml-${QT5_MIN}:5 - >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 - >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 - >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 - >=kde-frameworks/ki18n-${KF_QT5_MIN}:5 - >=kde-frameworks/kpackage-${KF_QT5_MIN}:5 - >=kde-frameworks/kparts-${KF_QT5_MIN}:5 - >=kde-frameworks/kservice-${KF_QT5_MIN}:5 - >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5 - sys-auth/polkit-qt[qt5(+)] - >=sys-libs/kpmcore-20.04.0:5= - ) - sys-apps/dbus - sys-apps/dmidecode - virtual/libcrypt:= -" -DEPEND="${COMMON_DEPEND} - test? ( - !qt6? ( dev-qt/qttest:5 ) - ) -" -RDEPEND="${COMMON_DEPEND} - app-admin/sudo - dev-libs/libatasmart - net-misc/rsync - || ( - sys-boot/grub:2 - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot] - ) - sys-boot/os-prober - sys-fs/squashfs-tools - sys-libs/timezone-data - virtual/udev - networkmanager? ( net-misc/networkmanager ) - upower? ( sys-power/upower ) -" - -src_prepare() { - ecm_src_prepare - export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ - PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ - PYTHON_CFLAGS="$(python_get_CFLAGS)"\ - PYTHON_LIBS="$(python_get_LIBS)" - - cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DINSTALL_COMPLETION=ON - -DINSTALL_POLKIT=ON - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - -DWITH_PYTHON=ON - # Use system instead - -DWITH_PYBIND11=OFF - -DBUILD_APPDATA=ON - -DWITH_QT6="$(usex qt6)" - ) - - ecm_src_configure -} - -src_test() { - local myctestargs=( - # Skipped tests: - # load-dracut: tries and fails to find Dracut config - # libcalamaresnetworktest: needs network - # libcalamaresutilstest: inspects /tmp (expects namespace?) - # - # Need investigation: - # test_libcalamaresuipaste - # validate-netinstall - # validate-services-systemd - # localetest - # machineidtest - # packagechoosertest - # - # Requires removed dev-python/toml - # lint-displaymanager - # - # E1101 - # lint-dummypython - -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" - ) - - cmake_src_test -} diff --git a/app-admin/calamares/calamares-3.3.6-r2.ebuild b/app-admin/calamares/calamares-3.3.6-r2.ebuild new file mode 100644 index 000000000000..633a53a5ce26 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.6-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{10..12} ) + +QTMIN="6.7.1" +KFMIN="6.0.0" +inherit ecm python-single-r1 + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+networkmanager +upower" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + sys-auth/polkit-qt[qt6(-)] + >=sys-libs/kpmcore-24.01.75:6= + sys-apps/dbus + sys-apps/dmidecode + virtual/libcrypt:= +" +RDEPEND="${DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( + sys-boot/grub:2 + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot] + ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_prepare() { + ecm_src_prepare + export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ + PYTHON_INCLUDE_PATH="$(python_get_library_path)"\ + PYTHON_CFLAGS="$(python_get_CFLAGS)"\ + PYTHON_LIBS="$(python_get_LIBS)" + + cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DINSTALL_COMPLETION=ON + -DINSTALL_POLKIT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHON=ON + # Use system instead + -DWITH_PYBIND11=OFF + -DBUILD_APPDATA=ON + -DWITH_QT6=ON + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( + # Skipped tests: + # load-dracut: tries and fails to find Dracut config + # libcalamaresnetworktest: needs network + # libcalamaresutilstest: inspects /tmp (expects namespace?) + # + # Need investigation: + # test_libcalamaresuipaste + # validate-netinstall + # validate-services-systemd + # localetest + # machineidtest + # packagechoosertest + # + # Requires removed dev-python/toml + # lint-displaymanager + # + # E1101 + # lint-dummypython + -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" + ) + + cmake_src_test +} -- cgit v1.2.3