[gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     a41a4f9b1c2b7ebc9dd87ab149af3cf7fcf3e35f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 09:57:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 11:14:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41a4f9b

media-sound/soundkonverter: Update deps.patch

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/soundkonverter-3.0.0-deps.patch          | 11 --------
 .../files/soundkonverter-3.0.1-deps.patch          | 30 ++++++++++++++++++++++
 .../soundkonverter/soundkonverter-3.0.1-r2.ebuild  |  2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
deleted file mode 100644
index aa5f68af939..00000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2017-09-12 23:39:15.648029711 +0200
-+++ b/CMakeLists.txt	2017-09-12 23:44:47.944469934 +0200
-@@ -30,7 +30,7 @@
- include(ECMInstallIcons)
- include(FeatureSummary)
- 
--find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
-+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
- find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
- find_package(KF5Cddb)
- find_package(Phonon4Qt5 REQUIRED)

diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
new file mode 100644
index 00000000000..b7009d33125
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
@@ -0,0 +1,30 @@
+From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Jul 2020 11:43:30 +0200
+Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt
+
+- Drop unused Qt5Network
+- Search for Qt5Xml once instead of in most plugins
+- KF5WidgetsAddons and KF5KIO were already being searched for
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                             | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521d0da..7e578f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers)
+ include(ECMInstallIcons)
+ include(FeatureSummary)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
+ find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
+ find_package(KF5Cddb)
+ find_package(Phonon4Qt5 REQUIRED)
+-- 
+2.27.0
+

diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
index 0beceea2e00..5730b13cb60 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-deps.patch"
+	"${FILESDIR}/${P}-deps.patch" # pending upstream
 	"${FILESDIR}/${P}-fix-add-dirs.patch"
 	"${FILESDIR}/${P}-metainfodir.patch"
 )