gentoo resync : 14.05.2020

3 files changed, 92 insertions, 2 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 094a4b2b6414..3c99955c9193 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.8.2.tar.gz 2218360 BLAKE2B 26b1c0bffa6972f085538323b8836917ed4384aec5c0374bd0dbec35a150ad62912c6fd08e94fe66bfaa43928619a73a41286baa28edac2eb3da4ae8dc7aa0e9 SHA512 323806ed9af067760403d2e8c6262222640f40e76819fa31a96e34fd4e0e745dbe3c9e516540df71022d3deb03499b8529c436e7a1fda254c56b5425aa993ecf
-EBUILD kid3-3.8.2.ebuild 1762 BLAKE2B 23517d00c3fc2f141dca78d2528bd08529270531e91d5fa7ca00d95be5335779e8192174afcf41f021aab7148b994f424be7b9cf3a659ae1480091d4a28b5aa0 SHA512 8a856b599b8864b3ce947fe45d3cf8367a481edbc9cd5fbe733e246addc727036c2fa2f9b31244ed2be1b127706f950a184801775cad176899d2308d2ffdf525
+DIST kid3-3.8.3.tar.gz 3091795 BLAKE2B 245009d074c4b0734ee9fd39eb796e2679c416915e03773ca4f6fe7d570e17fefc73eaaaa03f4c42a3d81c2f2c4778b500bc8dfdff0a0cf07293d39571b8ab9f SHA512 5381c76b032e30b4a6382d160406f5ed75915c0e23bed62b3070dd875a1c812f907a7ecae833b82753fd2372f96d460b17a879ca9043c3786109074391199a5a
+EBUILD kid3-3.8.2-r1.ebuild 1766 BLAKE2B b8407b370472b539a3150aa9ca0c726da25635dca41852a09e47b374ba64533d73a2b09b949c205dc05650fe9949b3d0bf68744b1d6e97d1a37d20ea18bbae1a SHA512 18f1e7c11b5cff32cd49c7e70821288e85613f64279127104af80c99974df0b685af771a3c678a1e1b471d1ceada84e421655cd9e63938886a8099af81076ccb
+EBUILD kid3-3.8.3.ebuild 1761 BLAKE2B e300726d3a49a489bcd7136e708d2098a4065a57dd01dd0912a2f27530ea0dcbb039db97368df7008f0855823568d68a1ab3c1d65cc0b536b48f1f1ce9ca303b SHA512 3108889b713f895f3b2ef863a10944ec1925ff950bc7d85976cf4276e377602b99ccd5b6de47ea639175bf906c28f041eb9c4e0501381a5683b66bbe88fdece0
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.8.2.ebuild b/media-sound/kid3/kid3-3.8.2-r1.ebuild
index e1eed069495b..515d09aff193 100644
--- a/media-sound/kid3/kid3-3.8.2.ebuild
+++ b/media-sound/kid3/kid3-3.8.2-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	sys-libs/readline:0=
 	acoustid? (
 		media-libs/chromaprint
-		virtual/ffmpeg
+		media-video/ffmpeg
 	)
 	flac? (
 		media-libs/flac[cxx]
diff --git a/media-sound/kid3/kid3-3.8.3.ebuild b/media-sound/kid3/kid3-3.8.3.ebuild
new file mode 100644
index 000000000000..fea30cf58c3f
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake 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 vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+DEPEND="
+	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/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
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}