gentoo resync : 25.01.2018

3 files changed, 3 insertions, 101 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index c28a4ffd9118..55de3f9567a6 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,7 +1,5 @@
 AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
-DIST kid3-3.5.0.tar.gz 1414288 BLAKE2B b400c83ae611fe66387686441bfa02a55686f474f14c04589d81693ae6bcc462b641d164088c010a2bbe4b32f253875fa4bcc2c350cf8ef5abd10cc6a2e53923 SHA512 a70aef4c775ec8a2d760856fdda38394384d71fbfb5847ba4da2d6396a1167c740a57a5609ef99a06ca99c090de974e91a87b13344f2e123b33842c51860cf34
 DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
-EBUILD kid3-3.5.0.ebuild 2012 BLAKE2B b9653916a465980ed1e1ad0473a783f697a4f1d54d149814cc71316d144c04177540c248c381844392e1f79fb62f12bdf3ffb7d894788962d473188a41472964 SHA512 c2a9f141724d8073240a76a1c9e9a7c3352bb91f62c05298de81ecc085772dcccd9b0a90fff3c7ac39992dc7ba481c60f3f633e56e5e18cbcc573b275f7a3df6
-EBUILD kid3-3.5.1.ebuild 2014 BLAKE2B 3135e515c02f8a14b9a77676809b81595ff223df6e2803ad1e0cd4a8b3d62bbb370f56b4a3aed7514067149b4444ce76f658278eb5269b5850a78a0d666191ea SHA512 39077f8810c78da6d71ff2ccff9b6ac5d3ae31835844c25a49ac6500604a16c3ff60511fa0ddaebab938f805611ff0ada2b4a5649e093be2160757f543194cf7
+EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
 MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.5.0.ebuild b/media-sound/kid3/kid3-3.5.0.ebuild
deleted file mode 100644
index 64def7acd3df..000000000000
--- a/media-sound/kid3/kid3-3.5.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-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 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-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
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.5.1.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
index 98825f9596ae..a2e641496a1d 100644
--- a/media-sound/kid3/kid3-3.5.1.ebuild
+++ b/media-sound/kid3/kid3-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"