Skip to content

Commit

Permalink
Merge branch 'gentoo:master' into genkernel-modular-features
Browse files Browse the repository at this point in the history
  • Loading branch information
timkenhan committed Oct 4, 2023
2 parents a1f0a97 + d4334fc commit 84cabf8
Show file tree
Hide file tree
Showing 855 changed files with 18,628 additions and 17,403 deletions.
Expand Up @@ -11,7 +11,7 @@ SRC_URI="http://leb.net/pub/blinux/emacspeak/blinux/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ppc x86"

RDEPEND=">=app-accessibility/emacspeak-18"

Expand Down
35 changes: 0 additions & 35 deletions app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild

This file was deleted.

2 changes: 1 addition & 1 deletion app-accessibility/sphinx2/sphinx2-0.6-r1.ebuild
Expand Up @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"

LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ppc x86"

DOCS=( AUTHORS ChangeLog README NEWS
doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}} )
Expand Down
40 changes: 0 additions & 40 deletions app-accessibility/sphinx2/sphinx2-0.6.ebuild

This file was deleted.

2 changes: 2 additions & 0 deletions app-admin/awscli/Manifest
Expand Up @@ -4,3 +4,5 @@ DIST aws-cli-1.29.54.gh.tar.gz 2550145 BLAKE2B 75c11a59218e4b0def9313f342c076c0c
DIST aws-cli-1.29.55.gh.tar.gz 2551493 BLAKE2B 79ea509819519d54c20068f6db7ba90aa9c43de83b1bf0ddad9d88e029b6a54f56c5f75a4aa30e5b29a5c84d5a7dd8ab7b07e0f451da67d96b440a25ea042df2 SHA512 32083c906650bf0e8dd6739220498d4c706cc3e844f7bbe1cf9934e25cfd0e85f349ebf56527366193d5a39af77afe030a8df77de1f49f3b75e110977d163873
DIST aws-cli-1.29.56.gh.tar.gz 2554744 BLAKE2B ed08837a56f8bf1f58dbd35a08aa79333b69428e20b47447f0cf9bef18def2b0f2ff3c552fa5394eb48d5f515831e4bc5ceaec582159be683af74c783ce3e1be SHA512 73a31164e099f70f689599df10d65e9bd5bcbfbe7398eeccd9b9ac4f6fee3701be37d5ac3946f3bf7a8588dd4755a15237848e5346bc66497f87d08dc2917b6b
DIST aws-cli-1.29.57.gh.tar.gz 2556732 BLAKE2B 8bbd17041c28e18f1b94421e624e3e7209a751bcd5508b75ff5473aba814e00453159151ddbc1daca5013d06cf418384af1703a34ddf9ecb7b6dbdfe5b91c3c9 SHA512 4cbc7df76930ce5626b45a100e1fe62695d470f02af025e483eb161f92828d2d535e91b3200f9c55dc50f30955b88e5f74e015e229649e2debac0acb2da5345b
DIST aws-cli-1.29.58.gh.tar.gz 2557504 BLAKE2B 3325dc80048feda09ebaa096b3c7be6b3da54991bf31d581a1f004844a7dd041e233d101f9f23bcfc977c02c5ed07ed08ee912a3b32b96292f68af507bec92af SHA512 5a84840be3e480651860962f8b9c6f9bf23bdef68bb521af840f4609aa4b577f43219f07e6c3440b0e25a9263359b342caec877696767a51daba6397f959aa7b
DIST aws-cli-1.29.59.gh.tar.gz 2558295 BLAKE2B 16d38585064cd75b1c2e1e804bc2fa4224634032b2eb905bb55f64be53b6737748ce688349ee51f54bedf73c3d2f50da92c9465fc2604fc288b6c07613ed3fe3 SHA512 7f7c850211ae172387809a04aeecafc250f31b513bc35028fb5ca6425190524071c51fc722962e1a069282a6281afb9baed0f5b5c2e66534c362e6947bf3b07e
85 changes: 85 additions & 0 deletions app-admin/awscli/awscli-1.29.58.ebuild
@@ -0,0 +1,85 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..12} )

inherit bash-completion-r1 distutils-r1 multiprocessing

MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"

# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"

distutils_enable_tests pytest

src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}

python_test() {
local EPYTEST_DESELECT=(
# broken xdist (signal() works only in main thread)
tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
tests/unit/test_help.py::TestHelpPager::test_can_render_contents
tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
)
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
}

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
}
85 changes: 85 additions & 0 deletions app-admin/awscli/awscli-1.29.59.ebuild
@@ -0,0 +1,85 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..12} )

inherit bash-completion-r1 distutils-r1 multiprocessing

MY_P=aws-cli-${PV}
DESCRIPTION="Universal Command Line Environment for AWS"
HOMEPAGE="
https://github.com/aws/aws-cli/
https://pypi.org/project/awscli/
"
SRC_URI="
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-> ${MY_P}.gh.tar.gz
"
S=${WORKDIR}/${MY_P}

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"

# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
RDEPEND="
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
!app-admin/awscli-bin
"
BDEPEND="
test? (
dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"

distutils_enable_tests pytest

src_prepare() {
# do not rely on bundled deps in botocore (sic!)
find -name '*.py' -exec sed -i \
-e 's:from botocore[.]vendored import:import:' \
-e 's:from botocore[.]vendored[.]:from :' \
{} + || die
# strip overzealous upper bounds on requirements
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
distutils-r1_src_prepare
}

python_test() {
local EPYTEST_DESELECT=(
# broken xdist (signal() works only in main thread)
tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_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/test_compat.py::TestIgnoreUserSignals
tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
tests/unit/test_help.py::TestHelpPager::test_can_render_contents
tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignore
)
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
# integration tests require AWS credentials and Internet access
epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
}

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
}
45 changes: 0 additions & 45 deletions app-admin/ccze/ccze-0.2.1-r4.ebuild

This file was deleted.

2 changes: 1 addition & 1 deletion app-admin/ccze/ccze-0.2.1-r5.ebuild
Expand Up @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~ppc x86"
KEYWORDS="amd64 ~arm ppc x86"

RESTRICT="test" # bug 913965

Expand Down
26 changes: 0 additions & 26 deletions app-admin/cronolog/cronolog-1.6.2-r5.ebuild

This file was deleted.

2 changes: 1 addition & 1 deletion app-admin/cronolog/cronolog-1.6.2-r6.ebuild
Expand Up @@ -11,7 +11,7 @@ SRC_URI="http://cronolog.org/download/${P}.tar.gz"

LICENSE="GPL-2+ Apache-1.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~ppc x86"
KEYWORDS="amd64 ~arm ppc x86"

PATCHES=(
"${FILESDIR}"/${PV}-patches
Expand Down
25 changes: 0 additions & 25 deletions app-admin/ide-smart/ide-smart-1.4-r2.ebuild

This file was deleted.

2 changes: 1 addition & 1 deletion app-admin/ide-smart/ide-smart-1.4-r3.ebuild
Expand Up @@ -11,7 +11,7 @@ SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc sparc x86"
KEYWORDS="amd64 ppc sparc x86"

src_compile() {
edo $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c
Expand Down

0 comments on commit 84cabf8

Please sign in to comment.