gentoo resync : 08.01.2021

3 files changed, 61 insertions, 10 deletions

diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index d9b5308b1bbc..8c48abac89ee 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,6 @@
+AUX libkcddb-20.12.1-unused-dep.patch 1684 BLAKE2B 6089b00f04b370ff3a23b7604da284b5128aba90e959d8350003ad5945b111a3dc2804ff52d6170c69304f72e4aabe74bfbd2a639c71f328b0e8929dd712f095 SHA512 46aa91b2abbd47b1e49f1c51878437c16e6fe8ddadb19d257c7cdf5881f36f18ccaaca5165e9a818729aadde1fb3bf0577bad885a2a3f5967d02db7940740c04
 DIST libkcddb-20.08.3.tar.xz 425284 BLAKE2B 8300846872e4984876a4f872abea71df9a189ad317c2b8fdce386bb21be2e548a3487858944e71eeaea402f8ef81c44e1d3d1ac1e4af460770c370da1d2a66d6 SHA512 9ce75fd66d541b38408ec67810b27dee9b7939f306d6b6b956aab489c5887ef13d41d8ec95802b859f8a4d2605422bb4aa00467dcaeedcd22f149727b84bb1c6
-DIST libkcddb-20.12.0.tar.xz 425080 BLAKE2B a65ee00f79d260d8cd0b9e1ca8fdd93b622376af4cefcfab72572576f0c0690e2136c6ccd505139c29ce0a1f206eafc4763778b06c4c3395278a9591250f3fee SHA512 e4358b62a0b1f22177ede4e55b7c83544a58f62c14c023b70e75c9998ed3f3deb9fbefa0b21766e291cd9ae4ff1aff156539284cb0d88bd0b769dfab9c28d258
+DIST libkcddb-20.12.1.tar.xz 425016 BLAKE2B 75c8442fc75c60ed41e7fdc8c9ea4bb762813d50c70d25a9737cc982e147c28add13a5dd106920998650d8d85c5d7fef59c7d2d4936a01c9d5ffc2dd89c258c6 SHA512 62a0251f7766064f9bc994606679c0c86d1c0e413da3e8148e599a6bf7ea4262680bc6fee84a7df368062bfbe8a84974c45f6981fd05f983a994eb3b4472ff2a
 EBUILD libkcddb-20.08.3.ebuild 1150 BLAKE2B 29933978aac8e6582f917f5e6591eb9424389faba78b1b3cdae5236392abe890b1c9c178e5b5a706d46fffb3edebffb2ec0a43ced1d46e146d5de9466dd772f5 SHA512 ffd4754bf0f106f1978ed19ba43a931d71cd3c37d1e46119400e10ce354ddc371ac80923191df7d2939c2a7c1fb0071d147eba412fc521820c88daa64339b369
-EBUILD libkcddb-20.12.0.ebuild 1153 BLAKE2B 781ec7c8b98b906e2ad8343a8d08e99d35a9f48790c4076253c1aa81f8bf7f3a77b6bf99a89409cefd28a3ef7862448efc5d13f2d746d56640e3cb10b8816fb4 SHA512 b0a04343dc1c71eae50e049cfb9680d8da76a46f85002cf93b5e4ccfbfd12d707d21f9d7ae301ffdc234678c7a98bae801de829facb1c46cf3b346c0842d77cf
+EBUILD libkcddb-20.12.1.ebuild 1132 BLAKE2B 8da9528ca0640d7518c5c7af57d7526f954e082cd7db105ab18499b833eae200823a73a4f07a22b7fc4adca04004e55c89de78e547ab83e3d026af37da05505a SHA512 2f2a94587fd0e7b7d407dc76a6bff2f32edbbb1275562b394ce17f23eb74ef7ebf612811bb847793bb7bffb34625d47a4ef2e93d76713ac5393d8e130a4ba997
 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
new file mode 100644
index 000000000000..908d8ee93964
--- /dev/null
+++ b/kde-apps/libkcddb/files/libkcddb-20.12.1-unused-dep.patch
@@ -0,0 +1,54 @@
+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.0.ebuild b/kde-apps/libkcddb/libkcddb-20.12.1.ebuild
index 01875383aad3..5ad18475ba73 100644
--- a/kde-apps/libkcddb/libkcddb-20.12.0.ebuild
+++ b/kde-apps/libkcddb/libkcddb-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -35,14 +34,11 @@ RDEPEND="${DEPEND}"
 # bug 280996
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" )
+
 src_prepare() {
 	ecm_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {