gentoo resync : 14.08.2021

3 files changed, 4 insertions, 61 deletions

diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index d852f68b11f1..7910ac9b9d7d 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,6 +1,5 @@
-AUX libkcddb-20.12.1-unused-dep.patch 1684 BLAKE2B 6089b00f04b370ff3a23b7604da284b5128aba90e959d8350003ad5945b111a3dc2804ff52d6170c69304f72e4aabe74bfbd2a639c71f328b0e8929dd712f095 SHA512 46aa91b2abbd47b1e49f1c51878437c16e6fe8ddadb19d257c7cdf5881f36f18ccaaca5165e9a818729aadde1fb3bf0577bad885a2a3f5967d02db7940740c04
-DIST libkcddb-20.12.3.tar.xz 425180 BLAKE2B 5dd7c8c75c505d3eebe4ec0bac3a342779fe4af3db56b7f87cb4ed5b0f8d55d8aafa5b0911f415b2d871df4a6d9b276112853fdde0bed4538893f84eac58ed89 SHA512 7659ccb25555a3c9ae496f7ed695a69bd6ac7df1002c94379f5e637a85673ca1194311b8aa04c2b53a2d3b9f41013e38ecd33403ba5fe66c1afc473cefe08af1
 DIST libkcddb-21.04.3.tar.xz 430108 BLAKE2B 414d6d6fd117aa5e6dceae349280a7920dea4fbcc14d79e01da1849a8da7c2e256cb8aa7eeb19bc5c545ce65ec8f7b3081bc420e9a15ba0ee8775f32ca8b6f70 SHA512 48df1dafd22fc323ab546f927e8a6f4059fdcd2ede5bfceb4b67014ce3d526a9f07a16cc66593c58575196a34a1d68a22882bcc391823ec4deb61af3fe09cd80
-EBUILD libkcddb-20.12.3.ebuild 1129 BLAKE2B 9ef03539de766ab9b235d2a7a41084c5e2b560218a6b61e44a4af5ad250f65ee50f2afb32fb47b8dc17f5e8fc82fbb48ef3228a921ebb7289b2d9560abcb1c61 SHA512 7165f458cfbb4f7b5d892623861685c098b20b32ea8407fe9225e53dbafa437f2f510792d55f21ae50713ebbdd19baa56580b3addbaa7a551905bae8c1615e56
+DIST libkcddb-21.08.0.tar.xz 430120 BLAKE2B d284e7c5a49778f9842ba68d9de3f43ee564e3e915140a4037c84717c0f6246bee4075cfc2a71aa55cc65f402e1c0644c90ddd1aab1de44534059efab5b20050 SHA512 fd6e59b88fd89a132e838ea42fad9a44eeb60ca2b71954ad242d6e871257a15a2eb7b3ec7fa50df2a77c093f0ba73ca4ab3d671f034245430f297d7ba1f8cc2d
 EBUILD libkcddb-21.04.3.ebuild 1071 BLAKE2B d57f0d78dc7db933865ba61338b7e3d2f0773fb9c50e8801e0f8495230a84fce21fb6f97454828e543cd02712df4b6514c9704091b7c63405168bc03ddb6087a SHA512 1455a061c51b45db9e412166b54f58cde921bdb6d50d9036552e0236160b1d20f4405b889fc1578901c245deb6376bb656966fd1a56f89aef3df26313bf9ac35
+EBUILD libkcddb-21.08.0.ebuild 1074 BLAKE2B f4c6fb27f31bef51aa6b3556f33b8cb3626bb46206ea252fa136ab2b267cfd3b0aad369b1b2cb0645064c5514206fcfcf4fa1977d61ce500da0475c4ee207324 SHA512 9bed59d9f99bb04f3eb91413e390d258cb3926877cd7d1f8a6214d4a723d967dcec0cad990e5886de80ae4cbc613bb4e01d48339ac409126301105df8646cc35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch
deleted file mode 100644
index 908d8ee93964..000000000000
--- a/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From fdddc63be6b5a2b95bd3ff7177b02e58d922bed2 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 29 Dec 2020 09:10:33 +0100
-Subject: [PATCH] Drop unused linkage to KF5::Codecs
-
-GIT_SILENT
-
-* asturm 2020-12-29: rebased, added relevant include cleanup part from 44a7ec47
----
- CMakeLists.txt          | 2 +-
- libkcddb/CMakeLists.txt | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9ee121..30a6717 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@
- set(REQUIRED_QT_VERSION 5.4.0)
- 
- find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Network Widgets)
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools Codecs I18n KIO WidgetsAddons)
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons)
- 
- ecm_setup_version("5.0.0"
-     VARIABLE_PREFIX KCDDB
-diff --git a/libkcddb/CMakeLists.txt b/libkcddb/CMakeLists.txt
-index e0c0e6a..3b239a9 100644
---- a/libkcddb/CMakeLists.txt
-+++ b/libkcddb/CMakeLists.txt
-@@ -52,7 +52,6 @@ target_link_libraries(KF5Cddb
-     PUBLIC
-         KF5::ConfigGui
-     PRIVATE
--        KF5::Codecs
-         KF5::I18n
-         KF5::KIOCore
-         Qt5::Network)
-diff --git a/libkcddb/musicbrainz/musicbrainzlookup.cpp b/libkcddb/musicbrainz/musicbrainzlookup.cpp
-index b8e7261..89b89db 100644
---- a/libkcddb/musicbrainz/musicbrainzlookup.cpp
-+++ b/libkcddb/musicbrainz/musicbrainzlookup.cpp
-@@ -21,8 +21,6 @@
- #include <musicbrainz5/NameCredit.h>
- #include <musicbrainz5/SecondaryType.h>
- 
--#include <KCodecs/KCodecs>
--
- #include <QCryptographicHash>
- #include <QDebug>
- 
--- 
-GitLab
-
diff --git a/kde-apps/libkcddb/libkcddb-20.12.3.ebuild b/kde-apps/libkcddb/libkcddb-21.08.0.ebuild
index 7f29d02bc669..c55a3a730087 100644
--- a/kde-apps/libkcddb/libkcddb-20.12.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.08.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.75.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +13,7 @@ DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="musicbrainz"
 
 DEPEND="
@@ -34,8 +34,6 @@ RDEPEND="${DEPEND}"
 # bug 280996
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" )
-
 src_prepare() {
 	ecm_src_prepare
 	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc