gentoo resync : 02.02.2022

3 files changed, 4 insertions, 103 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 6e1586a8889f..c4438e879df4 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
-DIST kid3-3.8.7.tar.gz 3356781 BLAKE2B 967a7af8f3ca5413716b1f246d07fa1723f57113369f466f853c00106e81648efb19c54abbb27b802ca9dae308c44683764356ebbbc708c7454e9669ae0201f4 SHA512 9d1a2c64d05e19c7a8c33f5447f896043ffd68ec95387dc04502549d59cb0398dd6946d17bfce12ed57ea445e0b39c8b3769918069ee9f1862f2480482bf2a01
-DIST kid3-3.9.0.tar.xz 1778964 BLAKE2B 946d4bed60de8774460d26d54de69df6a208e4a0eb25f5d7f54a66c31716a4ba479d1a75979f2febb9a398c5a1429d1822230dad7d9eed77e3e5c912c65fb1c3 SHA512 276a1e564b82cb2091008a8a532fc2b86a522ac3a5d83e8388b22c1172d88422555cb330ab51037e04d674dfb172f994d2494d4f6527b5c9ab635346531b4f7c
-EBUILD kid3-3.8.7.ebuild 2005 BLAKE2B ada62f924eb468088bc94361fff8fc2985a9654a271035890e4680458f76f6bf0ea09fa8bd4e6aa3188602a3f08fa42d61e284189fbe12e8603f810c018b27a8 SHA512 d1f1ddaebcb873bf9d8b344b09a529317a0d9ce8232487e0ab53baecab22b71a083fe3d0302cfb9006c83f994b12b718153450cb2b723bfa7442815a8ec72d27
-EBUILD kid3-3.9.0.ebuild 2103 BLAKE2B 33964353ab6279a21fe1ebf75cd27fc28ec5aea490f43593ef13c9ca07234832e749167f79f29185edd68950ed0c579e94f21ef9675e2d02646292c5bf5bdbff SHA512 afc1d48ccdc39872b7d0a879d26181f4b8e614d12682651ca27670eae1146dd23249f49f16b63f7596deba07bc617e8f3ef6e0f3e2ade6f8d5f2840b0c6910bb
+DIST kid3-3.9.1.tar.xz 1796320 BLAKE2B 3404c6016a7d5195cc2e9826ef8daf452f5419566ffa9b50b20dd21072c0e34159e39bb8eeec08b7e12fe7f14df96517e929163ae4c14e28509cc51a0e96de08 SHA512 865fc2abfffd9533347ecfee037dfa15c6cedfc33ed0378b6d8dfef3436c6ec78c2100a317edf0882b16d345ea14b564cfb4055f74317634b4863ec477a80669
+EBUILD kid3-3.9.1.ebuild 2101 BLAKE2B ae7f775742394404cd286ab5cfd15024f83913926866722012cb3d51ffb7cb52bb2674a8cf1d5390b47e57ce9fe7e32414557473a85937b0700035ac517c76a0 SHA512 0fb1385b4ea2f539a62989633ad69a47e3b808227412fd6ac7e4b16957d85e75cf1a979f59ead5127dd08e0e1c1f54d08735c8147b8e1ba767d720d63b00fcb0
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
diff --git a/media-sound/kid3/kid3-3.8.7.ebuild b/media-sound/kid3/kid3-3.8.7.ebuild
deleted file mode 100644
index 752bd1daaff3..000000000000
--- a/media-sound/kid3/kid3-3.8.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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://sourceforge/${PN}/${P}.tar.gz"
-	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
-}
-
-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.0.ebuild b/media-sound/kid3/kid3-3.9.1.ebuild
index 417c35f22d21..a3361e1c7c99 100644
--- a/media-sound/kid3/kid3-3.9.0.ebuild
+++ b/media-sound/kid3/kid3-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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+"