3 files changed, 6 insertions, 108 deletions
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 4acdb59cf0c6..7a2c47eb2d04 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.9.1.tar.xz 1796320 BLAKE2B 3404c6016a7d5195cc2e9826ef8daf452f5419566ffa9b50b20dd21072c0e34159e39bb8eeec08b7e12fe7f14df96517e929163ae4c14e28509cc51a0e96de08 SHA512 865fc2abfffd9533347ecfee037dfa15c6cedfc33ed0378b6d8dfef3436c6ec78c2100a317edf0882b16d345ea14b564cfb4055f74317634b4863ec477a80669
 DIST kid3-3.9.2.tar.xz 1952344 BLAKE2B 5a44a05f614f97dc7ddab39694a1773e1e6c55af7a9dc4ac7b793a520e54a8892c2181903a58f150885b3b4e17ebf921db719863f7ac4fd540f711a444990df3 SHA512 fc0b9db33ea948a2345968ab5da65f959bea829130f4250604d68df778218173d49f92b015d9be4e43f57ba5ae3388b0e97f558774df590b5959aa6f6293acd3
-EBUILD kid3-3.9.1.ebuild 2101 BLAKE2B ae7f775742394404cd286ab5cfd15024f83913926866722012cb3d51ffb7cb52bb2674a8cf1d5390b47e57ce9fe7e32414557473a85937b0700035ac517c76a0 SHA512 0fb1385b4ea2f539a62989633ad69a47e3b808227412fd6ac7e4b16957d85e75cf1a979f59ead5127dd08e0e1c1f54d08735c8147b8e1ba767d720d63b00fcb0
-EBUILD kid3-3.9.2.ebuild 2101 BLAKE2B e3bc7e4a9f05d7472afd0b4c3541e90e7017f542e9c2b1f5a472b18b870e4de2403e2babf12f7dea3839e3eb0fd348566c760be1422a2de29c7c6dbe4eda27e6 SHA512 dafb20b1d03c33fe0267b6e7f40f01d9d6561de1028b34de5947a32a8e664b0d93d8bcd62246d07cf5d8f173aa34b76a06cc2b57805f062d41fb4e965da50c86
+EBUILD kid3-3.9.2-r1.ebuild 2104 BLAKE2B b8ee06b4ec666f0c5c84da0abfec18680860c824229d497da365b0d0b0a26f6e12577cbed9207d3262f8fbff6cf707558af998617f507c53ded1cbad2e95c5d3 SHA512 5b6e113f3134c7e2691982031680cc1cd11a081f9c214dbf0af3bf8307264857969c1f209e1a88e0d540f333234335581b105781e0a7a73db8b0df8d9d7ee7b2
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
diff --git a/media-sound/kid3/kid3-3.9.1.ebuild b/media-sound/kid3/kid3-3.9.1.ebuild
deleted file mode 100644
index a3361e1c7c99..000000000000
--- a/media-sound/kid3/kid3-3.9.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake kde.org python-any-r1 xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	mpris? ( dev-qt/qtdbus:5 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# overengineered upstream build system
-	cmake_src_prepare
-	# applies broken python hacks, bug #614950
-	cmake_comment_add_subdirectory doc
-
-	sed -e "/^find_package.*QT NAMES/s/Qt6 //" \
-		-i CMakeLists.txt || die # ensure Qt5 build
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_DBUS=$(usex mpris)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.9.2.ebuild b/media-sound/kid3/kid3-3.9.2-r1.ebuild
index 6469613eec18..b298c0f7a0d9 100644
--- a/media-sound/kid3/kid3-3.9.2.ebuild
+++ b/media-sound/kid3/kid3-3.9.2-r1.ebuild
@@ -29,13 +29,13 @@ RDEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	sys-libs/readline:0=
+	sys-libs/readline:=
 	acoustid? (
-		media-libs/chromaprint
-		media-video/ffmpeg
+		media-libs/chromaprint:=
+		media-video/ffmpeg:=
 	)
 	flac? (
-		media-libs/flac[cxx]
+		media-libs/flac:=[cxx]
 		media-libs/libvorbis
 	)
 	kde? (
@@ -47,7 +47,7 @@ RDEPEND="
 		kde-frameworks/kxmlgui:5
 	)
 	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
+	mp4? ( media-libs/libmp4v2 )
 	mpris? ( dev-qt/qtdbus:5 )
 	taglib? ( >=media-libs/taglib-1.9.1 )
 	vorbis? (