gentoo auto-resync : 07:04:2024 - 18:30:54

6 files changed, 7 insertions, 103 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 3bd9a474979e..9365998e1b66 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/chirp/Manifest b/media-radio/chirp/Manifest
index 2315c5912866..ed390f356145 100644
--- a/media-radio/chirp/Manifest
+++ b/media-radio/chirp/Manifest
@@ -1,8 +1,5 @@
-AUX chirp-20230818_no-future.patch 737 BLAKE2B 6ee7ad9736e5a5a3c66f72c492ab1587eda4df45a5cca69cc26356b1bd1ec315a9fb1cbce3adf68bd66626791fdb647fb5f70b61e7ac69b5e103d9948b8664d6 SHA512 24f86eacb695a2bacb2b78e65c379fa76e9e3a7d7c0d00905fbe5f959853066a2e9b039e908d033c270038269b8314046e2a9ead248ab592694d5e0345350423
-DIST chirp-20231223.tar.gz 1850008 BLAKE2B b0d1d68889975d03c5b6a454d64e6fe9ac9f254423aaa77eff81d74cf3760cab8df0e9a411bab85c2ffaffde75ca515b72d7efdd5b9bdc0fc7b68eb5ef233e16 SHA512 5d8bf781d994e33c7de678b2ed31469f43dce9bebc99ee0d57b88ddf6eb41e23d8ec3e3bf5ef5ad4258f31dc47cb2748eeb290bceec38f0c859a9783259ff8d0
-DIST chirp-20240217.tar.gz 1953875 BLAKE2B 50691cb74138831679c3fd764d35b2d19556ffd2865510d0072757bbf5b35ef92ec232a516e22f841a53ba886e151c4141ae14568237bd98275f8eefe5228497 SHA512 d25ee838eaef84ed31f10ecf0ee3eb786b0e2ee57059917e1da33f7b7a67e2b168fa13452b965d051b80792c7213fbecbabcc0e094845a434bd0d84b10522aa1
 DIST chirp-20240311.tar.gz 1960895 BLAKE2B 843b68d15c82a437904554c25a6e810db1273753201903a086dde3c68481f2b2457f1aa36c96793ef6491febfbc6ec857180434d10f6eebd3e3ca4fde009c126 SHA512 f2fdc3479dc6605385d521314be6a3b8748e0bd9465d3e1ce70f0ff9fa9f9a459225101f6d42624e67ae6a8065aa89d8678bbbe666e55a57275b6327e9387083
-EBUILD chirp-20231223.ebuild 1698 BLAKE2B ed8c880ac349bf7f31a56f9e0f7a17e7f29f446b9b436072d7939aa9322e90cc16387e9df608ecab29a0650e29ff0950343bc8d6a27fe6c50baa84b070cc2594 SHA512 21876f81e1f0896b4cd2252de7ce238506871d3e4650317d6788bb23b9c719d077daf7f49db4b49769e74500f3caf3a8508335061c854183b5a5f2cfe694f1c9
-EBUILD chirp-20240217.ebuild 1640 BLAKE2B c29c6f8598cf442c7386e4aa81bb08fea1eec82ddc029ba1d4124c9fd31c794168c1d7a6561ba5663aaf08a337f221104ac7e4ac5cc69d39a009734cc71ec0de SHA512 daffb9300147d0aff1c76d3b051530e87abe618cbbcab1d119e112fe1d883a1f992faf82aa4810a718cb34faf9c88d8a1f7dfd2ba2dfe3c7e00400bf889ab4ab
-EBUILD chirp-20240311.ebuild 1637 BLAKE2B 1b7dca5d835e40116c9edc67be41c667cb7e743f180e23d7c1403cf6dd51be9ed9e1a8f739ecbe4fc1e7a4ab685fcd98beb00fb2bbbeb83507698a2ad57f7131 SHA512 93afa331f97b617e7f2cfe1a52f5378a55f951c25d0b15d0cc10753667fc5cc0410021ee5d0653a724074522b5925196f590103f44003b9b7dbead26718d4d88
+DIST chirp-20240404.tar.gz 1973257 BLAKE2B 566c0ed4ff9b0fe03bb1863e402b27b1b9a29c50b5467ca22bedf62e3b5584e82cde0c8cd430b92a223e0720e6b8c4ed5aa6b6632f660d7a01fc2f8dc7c78af9 SHA512 fc975eca574f2a230caeae7479675749b9d74340ebd7352069e4c51410b4c7c082f6fa3c027c499cdd58eed40479d1c4bfef75d29f2c4f809c88b4f8018f1feb
+EBUILD chirp-20240311.ebuild 1636 BLAKE2B 6a31bb1a5ebf49ed63996c50d5c5309fabc112bea64678ecc5ddce8cfeb9921eabe774f68123bd9eafda3ada5f513a34474f8301c313ac4476346fa271a035bd SHA512 6ffb5eb1a9a8a7d443542d61aab24f18d5649192f8ca82c0abb74d759209ed6adf9700f01bf4d651985458aada4dce6f5184e2764a59eba1e7feab1babc7a7ca
+EBUILD chirp-20240404.ebuild 1671 BLAKE2B 44d8a6e0aae3c7c32020164e4e3bb7f758a363e907ae1f05c610342ca95800ea0e4804d6a13dd25254ce8277fc3dbd9c8fc12bc605f79ee2e04e999284760ca3 SHA512 3d008b275f1ac6da3ab05931db7f0da00f85a7302eda1c9cc512884e948a4ba3752194b1ebb637f709208da843543e9a36b4460e03f764c8203b31d950cdeeae
 MISC metadata.xml 556 BLAKE2B 57e55670966c3b2f07a448d535b675e87685ab4223c989dce6fbc39faaa00d690159cf91ebd5c616c64b69fde35d14a74b2d2d32f0072d9db1f7f9f364cd0629 SHA512 63b89adae93837d1fe195fb7fe2d9aa9b31a481387c11c0008434e74fdbdadc86f074280db1b6456279b391ff162b1c5815c79d210f118501f379ef060bb392b
diff --git a/media-radio/chirp/chirp-20231223.ebuild b/media-radio/chirp/chirp-20231223.ebuild
deleted file mode 100644
index f81e601f2c9d..000000000000
--- a/media-radio/chirp/chirp-20231223.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
-
-# 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-20240311.ebuild b/media-radio/chirp/chirp-20240311.ebuild
index a920fe78a94d..06a371411e1d 100644
--- a/media-radio/chirp/chirp-20240311.ebuild
+++ b/media-radio/chirp/chirp-20240311.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.chirpmyradio.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-20240217.ebuild b/media-radio/chirp/chirp-20240404.ebuild
index 6993192e074f..dc7a62cfbb52 100644
--- a/media-radio/chirp/chirp-20240217.ebuild
+++ b/media-radio/chirp/chirp-20240404.ebuild
@@ -11,8 +11,8 @@ 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"
+HOMEPAGE="https://chirpmyradio.com/"
+SRC_URI="https://archive.chirpmyradio.com/${PN}_next/next-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -30,6 +30,7 @@ RDEPEND="$(python_gen_cond_dep '
 	radioreference? ( dev-python/suds-community[${PYTHON_USEDEP}] )
 ')"
 BDEPEND="test? ( $(python_gen_cond_dep '
+	dev-python/ddt[${PYTHON_USEDEP}]
 	dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 ') )"
diff --git a/media-radio/chirp/files/chirp-20230818_no-future.patch b/media-radio/chirp/files/chirp-20230818_no-future.patch
deleted file mode 100644
index 554b614849bc..000000000000
--- a/media-radio/chirp/files/chirp-20230818_no-future.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-future.standard_library.install_aliases() is a no-op on Python3 anyway.
-
---- a/chirp/chirp_common.py
-+++ b/chirp/chirp_common.py
-@@ -14,7 +14,6 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from builtins import bytes
--from future import standard_library
- 
- import base64
- import json
-@@ -1920,7 +1919,6 @@
- def urlretrieve(url, fn):
-     """Grab an URL and save it in a specified file"""
- 
--    standard_library.install_aliases()
-     import urllib.request
-     import urllib.error
- 
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,6 @@
-           'pyserial',
-           'requests',
-           'six',
--          'future',
-           'importlib-resources;python_version<"3.10"',
-           'yattag',
-       ],