gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 175 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 90c3afe47237..094a4b2b6414 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,7 +1,3 @@
-DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
-DIST kid3-3.8.1.tar.gz 1516211 BLAKE2B ab07ffddd5c8b2780d910eefdf71a4f290d1d354b1d73faead0d268a6d795a6963ec678a4dcefbd8aa18ce8b8bfecb84f949f63a5adea950d4cccb2de5647bdf SHA512 b625753a40f3290b5aa26fda5c20270b5e428c5b383ddb06e81d515f016f475c41bad92fff3fdfd5f6228c017ba18f547515bd8e948832831f9daa501222168f
 DIST kid3-3.8.2.tar.gz 2218360 BLAKE2B 26b1c0bffa6972f085538323b8836917ed4384aec5c0374bd0dbec35a150ad62912c6fd08e94fe66bfaa43928619a73a41286baa28edac2eb3da4ae8dc7aa0e9 SHA512 323806ed9af067760403d2e8c6262222640f40e76819fa31a96e34fd4e0e745dbe3c9e516540df71022d3deb03499b8529c436e7a1fda254c56b5425aa993ecf
-EBUILD kid3-3.7.1.ebuild 1660 BLAKE2B 981b960e888c8072870b68a397180149beed99440cb17df12181609f838b750ac73c3ca72ad29448da48a7b040e428e97f7f1fa5be67b2d3e511bbe7c7ef46fc SHA512 7aa3b748afd9e1f3b4b468a6c8fceec462a2190eebfa64c8de24dd51ba747433746cf40bd24cb7ca6c60c01d04bc929c6424f583d9fb287ee4a241d5084f42c8
-EBUILD kid3-3.8.1.ebuild 1709 BLAKE2B 3d32fc69b9340e7729d43d687e46c97d60a39a4272986b48b2b1890abc3f933585f9c014fa4a9df3bdee982f82cd1afc886df7e5933f4c75d2f52f520f6e72e2 SHA512 9924e8068ef9e79853f343b0bdc57320ff6e9edd5f6ca13a24a99343feacb2529dd6078ce928a9a3da4baefe8ff900ad48734802506488d16b562269138cb9b2
-EBUILD kid3-3.8.2.ebuild 1764 BLAKE2B 5f174c6604c26969d320ccc994b614c9e7d730bc6216240fbcc68db153adce84f7ed5b0156bb79714b88e4f0104b7a1a9eaa3c1cb9851f94566e448478f406c0 SHA512 873487e09b70931e85c9397d80dd8bdc05b880e6ee08ea86b9d6af619bbf66d6e4dd0bc6fc81d789eeebfdad504469abb9de861e6cabc0323c493d1d8c4aae4b
+EBUILD kid3-3.8.2.ebuild 1762 BLAKE2B 23517d00c3fc2f141dca78d2528bd08529270531e91d5fa7ca00d95be5335779e8192174afcf41f021aab7148b994f424be7b9cf3a659ae1480091d4a28b5aa0 SHA512 8a856b599b8864b3ce947fe45d3cf8367a481edbc9cd5fbe733e246addc727036c2fa2f9b31244ed2be1b127706f950a184801775cad176899d2308d2ffdf525
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
deleted file mode 100644
index 172085a01f3f..000000000000
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-BDEPEND="
-	dev-qt/linguist-tools: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
-		virtual/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
-}
diff --git a/media-sound/kid3/kid3-3.8.1.ebuild b/media-sound/kid3/kid3-3.8.1.ebuild
deleted file mode 100644
index 5fdb33123072..000000000000
--- a/media-sound/kid3/kid3-3.8.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-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
-		virtual/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
-}
diff --git a/media-sound/kid3/kid3-3.8.2.ebuild b/media-sound/kid3/kid3-3.8.2.ebuild
index 1ef20213b0af..e1eed069495b 100644
--- a/media-sound/kid3/kid3-3.8.2.ebuild
+++ b/media-sound/kid3/kid3-3.8.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://kid3.sourceforge.io/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"