gentoo resync : 02.08.2019

3 files changed, 2 insertions, 54 deletions

diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 0b47cddbcece..92187e79bc52 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,3 @@
-DIST libkcddb-18.12.3.tar.xz 426548 BLAKE2B 01b0ed1e47866f089e9b9548c321877bacb31b798fdb77df3928cced45c3348c7a856de200becfc83bfa2d96460769693aca383ea3e805d406b1b87866f4b92a SHA512 e74809ec9009d452c2cfe0157e438570305e6b31050124b562f9880bab7e7749c77747ad0975aa4ac47d0e23530a6a406547d69b35db72dd387d2322c99d5772
 DIST libkcddb-19.04.3.tar.xz 423248 BLAKE2B 96dbea92cd22d3a515876679d30dbdeb389dbab35001faa6ace6f4edbbec08a2d469c33df69eaa54831ece11246fccde0f6279286a7cc0c8811a091598984d97 SHA512 5899063f1673415b41a1d0bd60b11f9279a1b98e5eb73d3aca9e30928e87b166d426acb8399372ec0bdab2ffaa140a3eb1514bbf9658be394c6abec262b82577
-EBUILD libkcddb-18.12.3.ebuild 1049 BLAKE2B 28ebc10310df77c7d6767c14587e605f98f8ca08f42b41e980eda7ed80268892080f35060b736aaaa1a563c9cfd0a3078b16a9369d944220aad6989a472002b8 SHA512 72aacd5019fee2cf6900773c2ded75c6e7edc00117ffbe540a6e5747120ae83a1a21f154ae1e0e2997608d0140df695d46ef5bd089a3bfb000fe83808788b52f
-EBUILD libkcddb-19.04.3.ebuild 1051 BLAKE2B e7d368873c294bd8d2d3f5ff72eca9f8500b593ca54dffa9fc9d3b820b5b216d15ea817fccdb5abcea55d3f20ccbc2e9b83b855402c70727c9c3fc49d09c3fd4 SHA512 9e06a82fa6a730bf865cfc8aed4b9ee41ceace67f9565f8a1a4ff4bbb3649c2ebd9968eca6704d630072662391c6ba08f6e54ebe820b4ebb062ff0d934684eea
+EBUILD libkcddb-19.04.3.ebuild 1048 BLAKE2B 7757e54e8daf169aed5d549e5abfa318d4b89c9ff20bd00ef641cb78e9422f15ece3444f9d943b0401100dc84c48dfa487eb1008cd7143371aa7ff24a218b4b7 SHA512 4abe273018bb8efdfd1b732fd9244202895624a8b81547b57d8fe814e3e5b25068ec1c847f99f9048622833cafc1061115a7da1954558638ce3d547f8463dc11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.12.3.ebuild b/kde-apps/libkcddb/libkcddb-18.12.3.ebuild
deleted file mode 100644
index 13e0ce87e076..000000000000
--- a/kde-apps/libkcddb/libkcddb-18.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="musicbrainz"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-19.04.3.ebuild b/kde-apps/libkcddb/libkcddb-19.04.3.ebuild
index 05aa44913966..28d5ea5fb1af 100644
--- a/kde-apps/libkcddb/libkcddb-19.04.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="musicbrainz"
 
 DEPEND="