3 files changed, 2 insertions, 97 deletions
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 6adb7052450a..51fd356ee5c2 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,6 +1,5 @@
 AUX kid3-3.9.6-no-ndebug.patch 1684 BLAKE2B 91f52e2ffb86d026ab206978b2d885c0b090e4ad94203af582e09d05b0d166c6c7e8817e85ded4e2a36f53d0408b33906ee84f90ff42bb918e4883f4e62fff47 SHA512 651116c2f1bc5a15611cf421286b073b3d5ae3980c3c28271801f95f6abb74d23aa6a11f43ec34a905fd61fab9cee2e6a3c9dd2cd2b9a913ef1e8011aa1cd011
 AUX kid3-3.9.6-oggflacmetadata-buildfix.patch 4265 BLAKE2B 0eacafec38615643d0a93ff73ba610c1f81270191e35c8aa450c80976b2da125e95ae4fbe7f3ce12a9307195fbf7e2c7eefc80423529f584814ce8d4d88ff8ca SHA512 31a3ef840d64a47f26394e560906d8bf45cbb13e64792f37f91b7ed5720979090c0641b9fcb21b3735a1f43f78b9d0e1c8d981762cce293cb56d31f32742b01b
 DIST kid3-3.9.6.tar.xz 1872012 BLAKE2B 3945ca19f08baf84373ba34bcb9917f58d20f9208479a3a2d1319bdf50aae5cc56b906f5ac2caee5eb3d5c5f042a0ecdeff3e3ac0ecb499e6e3a32db436f2b1d SHA512 1667b3f5d458f9cc54e5b9af839c849e990a333eab3cfaa8d310b4d46b925ca5b57ea0ac9365a023fecc1ac2429f761dd2bfc0b3a3df48f5d4dd351c8741455f
-EBUILD kid3-3.9.6-r3.ebuild 2192 BLAKE2B 8db186607b29f9b28cc15cca67e26b8d40d1802eca30ca2b032698d5ca385f6aee29c0ed2cd049d5eda65b85dbd1d6660b3565351b01204779678f968e900f50 SHA512 77bc4db056941294a978676c1177733c5652b390e668ce310a8f7bd52a30c7c4f54ddeec34a96fe0a298cf08582e94bccbcaf839ad30a76a28dc5ab6e3b09343
-EBUILD kid3-3.9.6.ebuild 1996 BLAKE2B fac6b3d6d8f5f71e7c1503e315202c7c3cece06e139b260547cfae20267d2a19382773d8918d60141232d08fb2e6cf37c99dff29e45971662f50c70280415191 SHA512 78b38e1e27231e237adf6b13d0ae37855b606953b847ce5f2b32bdc40d83dce7956e9df22b094258c18d77eb81e58d508842b12f6f77e06276505ef97e22ca80
+EBUILD kid3-3.9.6-r3.ebuild 2191 BLAKE2B c99d79108157aa70d9648b725fe0295283b77f76e1ac1a4d67e1990d2c47ad2c84bb19f674ee1112a887f4535b0de8132aac7771240d3c09a1f06b4e63d14093 SHA512 93cfaf9586b8b1c3eb98fe9f33a1f900b84af56d261bda65a48cf2760979f489be70dae8413acc8a81de80f0b169096557222cca1443f1d48a2251121ea26204
 MISC metadata.xml 735 BLAKE2B 1715c990ed5b2240f888bd2a6587ac4ebdeb88722a89567fb7f78c3f9b4002e27c2db4dbabb81617d203449bfbe809aebb188ddc2dad922c23858b2b5437324c SHA512 9e1261175451eee81451fb9012577d144c838be90d1e637a34c8866e9045e35425309fa35fd6fa4b8bc15ae09bb071cdef5b6d95e79d20122790c8c57c9e0b44
diff --git a/media-sound/kid3/kid3-3.9.6-r3.ebuild b/media-sound/kid3/kid3-3.9.6-r3.ebuild
index 638ffde75f28..e54f3c5ec2fc 100644
--- a/media-sound/kid3/kid3-3.9.6-r3.ebuild
+++ b/media-sound/kid3/kid3-3.9.6-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kid3.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/kid3/kid3-3.9.6.ebuild b/media-sound/kid3/kid3-3.9.6.ebuild
deleted file mode 100644
index d6f021c28d83..000000000000
--- a/media-sound/kid3/kid3-3.9.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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="0"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-qt/qtbase:6[gui,network,widgets,xml]
-	dev-qt/qtdeclarative:6
-	dev-qt/qtmultimedia:6
-	sys-libs/readline:=
-	acoustid? (
-		media-libs/chromaprint:=
-		media-video/ffmpeg:=
-	)
-	flac? (
-		media-libs/flac:=[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		kde-frameworks/kconfig:6
-		kde-frameworks/kconfigwidgets:6
-		kde-frameworks/kcoreaddons:6
-		kde-frameworks/kio:6
-		kde-frameworks/kwidgetsaddons:6
-		kde-frameworks/kxmlgui:6
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	mpris? ( dev-qt/qtbase:6[dbus] )
-	taglib? ( >=media-libs/taglib-1.9.1:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}
-	!media-sound/kid3:5
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/qttools:6[linguist]
-	kde? ( kde-frameworks/extra-cmake-modules:0 )
-"
-
-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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		-DWITH_QAUDIODECODER=ON # bug 855281
-		-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
-}