Merge updates from master

8 files changed, 6 insertions, 132 deletions

diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index d65458d3f9ee..c1ed5571c370 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-lint-6.18.0.tar.gz 485342 BLAKE2B 8ec5a7aac4912518069adbb1b1f2a012658abd140e2d2f02808dbfdd0a8397d56bf40b66640ba299f488d1e9eababfa3105cc9c9e8e19c00eefa2a5d58c2669d SHA512 10dcb2cb92c2cf689a20dc9e12b27d2a3ee45c04f3a11470e19b62ee296e2d7fd42e49ff356929f4cea2f74f4269ae7c4d8c18b0c349bf59795898a4ed491c69
-DIST ansible-lint-6.20.3.tar.gz 502540 BLAKE2B 2958c0515d6567922c01b323ca44de80f81dc57715c8a61c64f3c3813139469bade696666b15ddbab4fe06781a1d480fa79b7b4d58516925022aec421d7e20b6 SHA512 fa5be67960478b0c93c18259239b192dc8ca06426e9dbb66a102eab1b37e5ea60c46cfbbc4304bc458312ce3ae95c52b14a5e6582073d266d6b325d19417a875
 DIST ansible-lint-6.21.1.tar.gz 508487 BLAKE2B 9a29a5d192675a8801846fc29641651c35be5cc4d120aad128ae248a86c8493aa9125b2abb428e0fa41b233cd669a8496c85a22de7d9bac99760bbcff222066c SHA512 538735ef89bcbb65077a0e02d6c9143c0aab2ce2160679d85c8dc5d222815230893f7c9bc4ee539c20d82cd7a8c1f72d3d7ee63666c49de603f4fa99964c260e
+DIST ansible-lint-6.22.1.tar.gz 511545 BLAKE2B 9e113ac230e34fca8c463658c84f1cccfab3100df6efc257d16345205ecee992b95d13d22d3fdd32947feaab0d44d1b7fd0532bb8f17b27724f1c78eac021654 SHA512 24ef68e6757e5efbcde847924cd193d64d623e1c0a7f7fa7f894d03c1f028876e9f1fa2a0b73e7b841f86d311f6305e7605984301ace64bd43e9596897386c44
diff --git a/app-admin/ansible-lint/ansible-lint-6.18.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.18.0.ebuild
deleted file mode 100644
index 8b7eb0519508..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.18.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible/ansible-lint"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-# Upstream has stated explicitly that all tests require Internet access
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-4.0.5[${PYTHON_USEDEP}]
-	>=dev-python/black-22.8.0[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.17.31[${PYTHON_USEDEP}]
-	<dev-python/ruamel-yaml-0.18[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
-	>=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}]
-	dev-vcs/git"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/spdx-tools-0.7.1:0/0.7[${PYTHON_USEDEP}]
-	)"
-
-# test_call_from_outside_venv doesn't play nicely with the sandbox
-# irrespective of whether Internet access is allowed or not
-EPYTEST_DESELECT=(
-	test/test_main.py::test_call_from_outside_venv
-)
-
-distutils_enable_tests pytest
-
-# Test suite fails to start without this
-python_test() {
-	epytest test
-}
diff --git a/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild
index c5b28bcf37c1..1bfe1dd81b97 100644
--- a/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.21.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 # Upstream has stated explicitly that all tests require Internet access
 PROPERTIES="test_network"
diff --git a/app-admin/ansible-lint/ansible-lint-6.20.3.ebuild b/app-admin/ansible-lint/ansible-lint-6.22.1.ebuild
index c5b28bcf37c1..6de509ee4b85 100644
--- a/app-admin/ansible-lint/ansible-lint-6.20.3.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.22.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ansible/ansible-lint"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 # Upstream has stated explicitly that all tests require Internet access
 PROPERTIES="test_network"
@@ -30,8 +30,7 @@ RDEPEND="
 	>=dev-python/pathspec-0.10.3[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
 	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.17.31[${PYTHON_USEDEP}]
-	<dev-python/ruamel-yaml-0.18[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.18.5[${PYTHON_USEDEP}]
 	>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
 	>=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/media-radio/chirp/Manifest b/media-radio/chirp/Manifest
index 9ab0a6d4d499..e9d2e3cab5bd 100644
--- a/media-radio/chirp/Manifest
+++ b/media-radio/chirp/Manifest
@@ -1,3 +1,2 @@
-DIST chirp-20230917.tar.gz 1754068 BLAKE2B 462f047310ac8ca15098365062109716ccd0a695ab86910f6c6bd6ef11b094b5cdb59949238e49e6baf3a08cc12e41766a9306d9fe685e35a2040eb9d7602ad5 SHA512 50ce4036d5ebeebbc2c4badb8c4f23ce13fcb66a3b016564655c25b30a032cbb8c0b62857ffbe5dac28967d2d70bb721ac45209eb6405a9c87263b225bd8d049
-DIST chirp-20231021.tar.gz 1776607 BLAKE2B 8958bcf5d8ba310c07772b9a2c214d5d2785d2e39cc60039c405728cedf0001f71ea2110cae7e67dca72c9ebe7a61834c9c308f56f49d24c8f7f962dfc5aa067 SHA512 131b8ab81a2b1618438e1c03129c19be57642fa05a01ddd3d4d2f5a09e2eb5a8184bea15b306af768d8c584935f81a145f91cc058ab57238981efd0ed2e73f09
 DIST chirp-20231125.tar.gz 1824835 BLAKE2B 327d34867324ddf326709c6e098ccd80810015023807e238a1f63650328236cf791c14a6cbfdbb4bcfea7875dad394846fe5eec3c2a167623fcfebf8980d4954 SHA512 cef4a7c26ae0784c5031db96d2b632e39ab7eb7d61ab1f486b4a4bc9842d16536de22651f2cabb21394e0382af0f5488cb65ac0e609d0936f8db3747f4a5aa7a
+DIST chirp-20231223.tar.gz 1850008 BLAKE2B b0d1d68889975d03c5b6a454d64e6fe9ac9f254423aaa77eff81d74cf3760cab8df0e9a411bab85c2ffaffde75ca515b72d7efdd5b9bdc0fc7b68eb5ef233e16 SHA512 5d8bf781d994e33c7de678b2ed31469f43dce9bebc99ee0d57b88ddf6eb41e23d8ec3e3bf5ef5ad4258f31dc47cb2748eeb290bceec38f0c859a9783259ff8d0
diff --git a/media-radio/chirp/chirp-20230917.ebuild b/media-radio/chirp/chirp-20230917.ebuild
deleted file mode 100644
index 01c85c3bb3d4..000000000000
--- a/media-radio/chirp/chirp-20230917.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# py3.12 blocked by wxpython
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A free, open-source tool for programming your radio"
-HOMEPAGE="https://chirp.danplanet.com/"
-SRC_URI="https://trac.chirp.danplanet.com/${PN}_next/next-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+gui radioreference"
-
-RDEPEND="$(python_gen_cond_dep '
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	gui? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		dev-python/yattag[${PYTHON_USEDEP}]
-	)
-	radioreference? ( dev-python/suds-community[${PYTHON_USEDEP}] )
-')"
-BDEPEND="test? ( $(python_gen_cond_dep '
-	dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-') )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20230818_no-future.patch
-)
-
-distutils_enable_tests pytest
-
-# The alias map is an internal developer file not included in release tarballs.
-# Other disabled tests require Internet access.
-EPYTEST_DESELECT=(
-	tests/unit/test_directory.py::TestAliasMap
-	tests/unit/test_network_sources.py
-	tests/unit/test_repeaterbook.py
-)
-
-python_test() {
-	# From the contents of tests/ upstream currently only runs unit and driver
-	# tests, and the latter can take so long that they have even got a special
-	# script for only running them on drivers whose code has changed
-	# with respect to origin/master.
-	epytest tests/unit/
-}
-
-src_install() {
-	distutils-r1_src_install
-	if ! use gui; then
-		rm "${ED}"/usr/bin/${PN} || die
-	fi
-}
diff --git a/media-radio/chirp/chirp-20231125.ebuild b/media-radio/chirp/chirp-20231125.ebuild
index 5b1a95d408b4..01c85c3bb3d4 100644
--- a/media-radio/chirp/chirp-20231125.ebuild
+++ b/media-radio/chirp/chirp-20231125.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://trac.chirp.danplanet.com/${PN}_next/next-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+gui radioreference"
 
 RDEPEND="$(python_gen_cond_dep '
diff --git a/media-radio/chirp/chirp-20231021.ebuild b/media-radio/chirp/chirp-20231223.ebuild
index 5b1a95d408b4..5b1a95d408b4 100644
--- a/media-radio/chirp/chirp-20231021.ebuild
+++ b/media-radio/chirp/chirp-20231223.ebuild