Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkdepim/, kde-apps/libkdepim/files/
Date: Tue, 29 Dec 2020 16:03:17
Message-Id: 1609255707.624a04e1c1e0cf66b6ef5e7c89006caf552d74aa.asturm@gentoo
1 commit: 624a04e1c1e0cf66b6ef5e7c89006caf552d74aa
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 15:28:27 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 15:28:27 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=624a04e1
7
8 kde-apps/libkdepim: Drop unused DEPEND
9
10 Upstream commits:
11 6c468905d6d8b0a910a4f1d423a226815c630acb
12 8aff1b1cec5ee986d5b27998aa7e014e81ab18f4
13
14 Package-Manager: Portage-3.0.12, Repoman-3.0.2
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 .../files/libkdepim-20.12.1-unused-dep.patch | 37 ++++++++++++++++++++++
18 kde-apps/libkdepim/libkdepim-20.12.49.9999.ebuild | 4 +--
19 kde-apps/libkdepim/libkdepim-9999.ebuild | 2 --
20 3 files changed, 39 insertions(+), 4 deletions(-)
21
22 diff --git a/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch b/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch
23 new file mode 100644
24 index 0000000000..32bee46e71
25 --- /dev/null
26 +++ b/kde-apps/libkdepim/files/libkdepim-20.12.1-unused-dep.patch
27 @@ -0,0 +1,37 @@
28 +From 6c468905d6d8b0a910a4f1d423a226815c630acb Mon Sep 17 00:00:00 2001
29 +From: Laurent Montel <montel@×××.org>
30 +Date: Thu, 10 Dec 2020 07:15:35 +0100
31 +Subject: [PATCH] Remove KF5Codecs
32 +
33 +---
34 + CMakeLists.txt | 1 -
35 + src/libkdepim/CMakeLists.txt | 1 -
36 + 2 files changed, 2 deletions(-)
37 +
38 +diff --git a/CMakeLists.txt b/CMakeLists.txt
39 +index 5232c8d..a9b2c1b 100644
40 +--- a/CMakeLists.txt
41 ++++ b/CMakeLists.txt
42 +@@ -27,7 +27,6 @@ set(QT_REQUIRED_VERSION "5.13.0")
43 +
44 + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus Network)
45 +
46 +-find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
47 + find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
48 + find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED)
49 + find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
50 +diff --git a/src/libkdepim/CMakeLists.txt b/src/libkdepim/CMakeLists.txt
51 +index 9f5eaff..9ff0420 100644
52 +--- a/src/libkdepim/CMakeLists.txt
53 ++++ b/src/libkdepim/CMakeLists.txt
54 +@@ -59,7 +59,6 @@ target_include_directories(KF5Libkdepim PUBLIC "$<BUILD_INTERFACE:${libkdepim_SO
55 +
56 + target_link_libraries(KF5Libkdepim
57 + PRIVATE
58 +- KF5::Codecs
59 + KF5::Completion
60 + KF5::I18n
61 + KF5::ConfigGui
62 +--
63 +GitLab
64 +
65
66 diff --git a/kde-apps/libkdepim/libkdepim-20.12.49.9999.ebuild b/kde-apps/libkdepim/libkdepim-20.12.49.9999.ebuild
67 index 1cab72a28f..8a4da3b5cf 100644
68 --- a/kde-apps/libkdepim/libkdepim-20.12.49.9999.ebuild
69 +++ b/kde-apps/libkdepim/libkdepim-20.12.49.9999.ebuild
70 @@ -23,15 +23,15 @@ DEPEND="
71 >=dev-qt/qtgui-${QTMIN}:5
72 >=dev-qt/qtnetwork-${QTMIN}:5
73 >=dev-qt/qtwidgets-${QTMIN}:5
74 - >=kde-frameworks/kcodecs-${KFMIN}:5
75 >=kde-frameworks/kcompletion-${KFMIN}:5
76 >=kde-frameworks/kconfig-${KFMIN}:5
77 >=kde-frameworks/kconfigwidgets-${KFMIN}:5
78 >=kde-frameworks/kcoreaddons-${KFMIN}:5
79 - >=kde-frameworks/kguiaddons-${KFMIN}:5
80 >=kde-frameworks/ki18n-${KFMIN}:5
81 >=kde-frameworks/kitemviews-${KFMIN}:5
82 >=kde-frameworks/kjobwidgets-${KFMIN}:5
83 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
84 "
85 RDEPEND="${DEPEND}"
86 +
87 +PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" )
88
89 diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild
90 index 1cab72a28f..b57d617645 100644
91 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild
92 +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild
93 @@ -23,12 +23,10 @@ DEPEND="
94 >=dev-qt/qtgui-${QTMIN}:5
95 >=dev-qt/qtnetwork-${QTMIN}:5
96 >=dev-qt/qtwidgets-${QTMIN}:5
97 - >=kde-frameworks/kcodecs-${KFMIN}:5
98 >=kde-frameworks/kcompletion-${KFMIN}:5
99 >=kde-frameworks/kconfig-${KFMIN}:5
100 >=kde-frameworks/kconfigwidgets-${KFMIN}:5
101 >=kde-frameworks/kcoreaddons-${KFMIN}:5
102 - >=kde-frameworks/kguiaddons-${KFMIN}:5
103 >=kde-frameworks/ki18n-${KFMIN}:5
104 >=kde-frameworks/kitemviews-${KFMIN}:5
105 >=kde-frameworks/kjobwidgets-${KFMIN}:5