gentoo auto-resync : 08:08:2022 - 20:14:39

5 files changed, 104 insertions, 2 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1976c3686bd2..8ec72a95fdbb 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index c43153e0fac1..6b431ef47e56 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,7 +1,7 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
 DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
-EBUILD cmus-2.10.0.ebuild 3691 BLAKE2B 56fe6b20b8f83b24813c3b4da5697f34a8fdf1ed8b2133aed2bbd65274864125f558969edb83bcab62c028c1155667e00f78b256349e786d93e880fcbb3ef94c SHA512 852607299942c8316862d1892c5e136041b1d3665884ff88e0dc8c0337cdf830e6f63ad8a4b8bee448c5b446575562368e80a3c359c04fd1cc973e2f6685eb50
+EBUILD cmus-2.10.0.ebuild 3690 BLAKE2B c3a740eb918a79ab35a051537c0f0bfdf05f80e89daed892c33641e1424011d188cc55dd8dbbda7296d0a07731ba8cc76f6c058c79cb3e446ee03ffeb37b88f0 SHA512 e9fe262ce15f1e2c29f5ca14da5561b8b0e243eeb343ab0b55d28b0b40bfb5a6016a81b5c389459a2153a79f324adcb8fdcf817c6c60798a07a28cf0ee46dd75
 EBUILD cmus-2.9.1-r1.ebuild 3722 BLAKE2B fc54675860b8a3835fcec0f2d09c80f060365e21095bf87f4df8cd7d9eb3258329f7e87dfd9db9c17f55cac2069c39bc26ae945fb964434aa84fe3019b979a67 SHA512 6812d75688aa21e548679f788b16310ab95d7732304cc619915e4cf42cba924a0061846110c464113986b787ceb302525ddc0053d25729710df1d1a0e3c56add
 EBUILD cmus-9999.ebuild 3694 BLAKE2B 98129cb9b83de7e13b9a99df381dc075e35db72ae2227315da4fa3f8a4fd8953318b03e1fe9fb1c4ec643d9a03a01cedcbd9e45e95407e768ad8f356ed15526b SHA512 435470c60676204e8ebe1801993487b204f3cb8a247284de6cb988ae37a59883cecabf8af9ee120750b6b186e185669e6384d2ebd548db4f3f5929da5e51ef72
 MISC metadata.xml 885 BLAKE2B 567dfdb0b27aa4de21f2f0e1c26450d335365328623280881c04b8ebf43a4e56582bf9bc121375b11d1d80a8054f5606dd81e1afd7a71f429148ecbeb97ad168 SHA512 5731cffcef8ce3c0b9a04c71426b18909a8d0f1872ac97a3746f1c25eccb02263eb9cff9037a253d5db7dda7599a18b10f1c6d1f819ed1d769cf470e94aeed9b
diff --git a/media-sound/cmus/cmus-2.10.0.ebuild b/media-sound/cmus/cmus-2.10.0.ebuild
index 66aacec03810..046891023fbe 100644
--- a/media-sound/cmus/cmus-2.10.0.ebuild
+++ b/media-sound/cmus/cmus-2.10.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Ncurses based music player with plugin support for many formats"
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index c4438e879df4..70e92ae5f18d 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 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 2103 BLAKE2B dbc3f1c3add921abd5219bca554ef606e4aba517ab2fa730d9c03410079315e0b48a2204aaf6ade3c9a9623a337920a4ee1db76d0bbd13a8f024f49f58459b39 SHA512 ab4edb0001499df73cebf91c411739bdf58547d1411cf98f941129c04c7060727b4344d286fe8659b0dbdfd5cb11b369c8d23b9dbc0093fa5153bf103dbb816c
 MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
diff --git a/media-sound/kid3/kid3-3.9.2.ebuild b/media-sound/kid3/kid3-3.9.2.ebuild
new file mode 100644
index 000000000000..5e27fe36edd5
--- /dev/null
+++ b/media-sound/kid3/kid3-3.9.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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
+}