6 files changed, 2 insertions, 151 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 35ae4a3e6bf8..01c6621b4e33 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index d2355391c8df..9843970f3593 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,3 @@
-DIST gpodder-3.11.1.tar.gz 1174163 BLAKE2B 703b545b576c8f119427e336e71e45301d4336fc82bca6ec6c4a0866591c8742866308da680564ff1543a5a65e2407295c46b3c5831d1e2d7335c5806d4cce5a SHA512 7570a4f0ac0c974fab58e30bb5bceb998cd7260ab91140a9801cf4fda1af3549ddf1ec4930081025215ecefd920a93c16252594915778e8ecb7524d3d7d3011b
 DIST gpodder-3.11.2.tar.gz 1177302 BLAKE2B de66191dd50f5041b10f52c18be31e059f6547c12f7e81f036939b3fdf1a9de5e18d6a25dac9db9487e3efa907c9967e220f41386929b9053fe1e5670b6babe7 SHA512 367c1e0eba7a5973b681e7b91463624b4e9ef2ad75ce1697f5d2e5937958c417bc3e6b1b34a54344f66ebb047479ab16a35dd913e54050f71ac54af05e62b30a
-EBUILD gpodder-3.11.1.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
 EBUILD gpodder-3.11.2.ebuild 2119 BLAKE2B e383de02cb4211b2b0ae1c6ba6365dc634a255082f69e703cda33fc9a3799ecbbc75ca8a65c6a6c01a32345ce7a358b0bf4269d24a38b397a6c5e6538d8a0bf3 SHA512 e1c488309668e0fd14bcc9dce93d5c950e940b5db442e6b1d2dc1fe13fdd00934d49b7c1204f46f072b8fe9bdf18324757815972978feee279b2e30a4a362dff
 MISC metadata.xml 358 BLAKE2B 272a71d2d7d519dca74a2d1dbbd25d0c48b55b265eca16962967f57dc29edfeca9d454100a84a7dd505f5bab7778778ff45b89f2ddaca152b562733e8c0dcce8 SHA512 31b12848c3f24a103f2bfa39bec4b2c4e3251ed70de194d569acfbe2b7df3f8ea28dd5ba274b4add0fbc1b55d998cf13f5b8f7bf89bb4a95fd1e60e988bce6f6
diff --git a/media-sound/gpodder/gpodder-3.11.1.ebuild b/media-sound/gpodder/gpodder-3.11.1.ebuild
deleted file mode 100644
index 08280b1bfa58..000000000000
--- a/media-sound/gpodder/gpodder-3.11.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature xdg
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus bluetooth mtp"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/podcastparser[${PYTHON_USEDEP}]
-		dev-python/mygpoclient[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	')
-	bluetooth? ( net-wireless/bluez )
-	mtp? ( media-libs/libmtp:= )
-	kernel_linux? ( sys-apps/iproute2 )
-"
-BDEPEND="
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/minimock[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	sed -i -e 's:--cov=gpodder::' makefile || die
-}
-
-python_test() {
-	# These are pulled out from the Makefile to give us more control
-	# See bug #795165
-	# Previously, we used 'emake releasetest' in src_test
-	LC_ALL=C epytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py \
-		-p no:localserver
-	LC_ALL=C epytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient \
-		-p no:localserver
-}
-
-src_install() {
-	emake PYTHON="${EPYTHON}" DESTDIR="${D}" install
-
-	distutils-r1_src_install
-
-	touch "${ED}"/usr/share/gpodder/no-update-check || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "track length detection for device sync (only one package is needed)" media-video/mplayer dev-python/eyeD3
-	optfeature "for the YouTube extension" net-misc/yt-dlp
-	optfeature "iPod sync support" media-libs/libgpod
-}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 43ba6fb650cf..90c8fa369dcf 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,6 @@
 DIST picard-2.9.1.tar.gz 5270234 BLAKE2B 51c84c9c344f5f9486e57caa2e47626329042f9e99acb5e651162fd0597c97e6d2f8e993bf735e83bdd4885c31183f9841c39a31db2f446449be9d10af39bd78 SHA512 935689fcaa7019fbdd391fe9df45fbb6f4528cec8652a852780e3bd1142dd8407bf76f97bdf24eec481448d69e3ed9ab40c0bb16095352006b874fe9fc46bc16
 DIST picard-2.9.2.tar.gz 5526511 BLAKE2B 6708cd82a8ccab4b07d626ccc5fccb47a78503262863e51e6f0dcdca705cc6fd719ed5958bcff701911e18464ea9b0450cec93d2e8834e5f7ec60708bafff8b5 SHA512 b204acde03ed88090459f7c47b81841e9de1acc71542f272b1191b4fe16a2ef294bf10f34e8bf85c6ebb78cbebad4ce2c9a1fa3acb55de55e9a6b8832ed92ad5
-DIST picard-2.9.tar.gz 6360770 BLAKE2B d843cbb249f79a7817f0d5a62f7f851a3acc9943c93e0130fa487c385d1dda3b14a51b7070212a4562553c39ac54e8b743391a28c3e916ceb11e5070f3801985 SHA512 837f70b239acc0d2846be79fb225e5bc7a3b7c3d2e928c34bd01730b6049809a58c274a4e49c5cc42f253f5c113c19b331ac1489427f8dbb3c31515d2511e4dc
-EBUILD picard-2.9.1.ebuild 1469 BLAKE2B e19ac8acc115beb25339c3a8b3fc9f94f872793cfe20e9c0c6761a594b4cf61fbda6067fb42039c271f2eb5966d69e78f9fc116a247b539acf59e7711ccb93fc SHA512 371b372e3c33dcd5f11626f4d6a71c45acdabcd3108917843c86fe38690375bdb1ffbf18114e325b34336e2afdeff3af946a8783de91b47d045a5cdc458499c0
+EBUILD picard-2.9.1.ebuild 1467 BLAKE2B 6d7506cde4eb39289b413af7731a9c2b4d54d3c8b227a6f85d96bad7c8ea6cc578b27105aec85234d51d6c0b16041bbe481afd2da730bece133b78bdb4452daf SHA512 885615e163e8c90099f43f487a60edc73cb52a61b2d59e70ee9451e39a63b4becc1a995f3dc786148eecd12bd914c386e9195cd7a65203b99fbd33abedfa6d1e
 EBUILD picard-2.9.2.ebuild 1469 BLAKE2B e19ac8acc115beb25339c3a8b3fc9f94f872793cfe20e9c0c6761a594b4cf61fbda6067fb42039c271f2eb5966d69e78f9fc116a247b539acf59e7711ccb93fc SHA512 371b372e3c33dcd5f11626f4d6a71c45acdabcd3108917843c86fe38690375bdb1ffbf18114e325b34336e2afdeff3af946a8783de91b47d045a5cdc458499c0
-EBUILD picard-2.9.ebuild 1471 BLAKE2B c80c011bb0e467748e26a64309a7c314c961f848f22d85376f9a4863184650963214fa64b11ac7f665eab953a5c4278d4d8656ff4de589a6029b19533826ede1 SHA512 0dee9f466695e6f38900aa477da836b0cdaf30b8086056b4a3eff91afbfc9368b7b4dbba91be1e5ad11aa2ca995990df3d4366ba4211c553e1734a44d12cbc4f
 EBUILD picard-9999.ebuild 1469 BLAKE2B e19ac8acc115beb25339c3a8b3fc9f94f872793cfe20e9c0c6761a594b4cf61fbda6067fb42039c271f2eb5966d69e78f9fc116a247b539acf59e7711ccb93fc SHA512 371b372e3c33dcd5f11626f4d6a71c45acdabcd3108917843c86fe38690375bdb1ffbf18114e325b34336e2afdeff3af946a8783de91b47d045a5cdc458499c0
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.9.1.ebuild b/media-sound/picard/picard-2.9.1.ebuild
index 7cc9e324b322..4d5605c54bdd 100644
--- a/media-sound/picard/picard-2.9.1.ebuild
+++ b/media-sound/picard/picard-2.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cross-platform music tagger"
diff --git a/media-sound/picard/picard-2.9.ebuild b/media-sound/picard/picard-2.9.ebuild
deleted file mode 100644
index 7f4ca4261326..000000000000
--- a/media-sound/picard/picard-2.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_EXT=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}