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/kolf/, kde-apps/kolf/files/
Date: Sat, 15 Sep 2018 07:45:43
Message-Id: 1536997530.0f811ecea6e8e0ace778b0d5b5f34ff0d174431b.asturm@gentoo
1 commit: 0f811ecea6e8e0ace778b0d5b5f34ff0d174431b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 15 07:44:28 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 15 07:45:30 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f811ece
7
8 kde-apps/kolf: Patch upstreamed
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 kde-apps/kolf/files/kolf-18.08.1-deps.patch | 38 -----------------------------
13 kde-apps/kolf/kolf-18.08.49.9999.ebuild | 2 --
14 kde-apps/kolf/kolf-9999.ebuild | 2 --
15 3 files changed, 42 deletions(-)
16
17 diff --git a/kde-apps/kolf/files/kolf-18.08.1-deps.patch b/kde-apps/kolf/files/kolf-18.08.1-deps.patch
18 deleted file mode 100644
19 index a6b89b4023..0000000000
20 --- a/kde-apps/kolf/files/kolf-18.08.1-deps.patch
21 +++ /dev/null
22 @@ -1,38 +0,0 @@
23 -From d5220258e7e652a6544cf80b2375c3fa185b1152 Mon Sep 17 00:00:00 2001
24 -From: Andreas Sturmlechner <asturm@g.o>
25 -Date: Wed, 12 Sep 2018 18:12:14 +0200
26 -Subject: [PATCH] Fix dependencies: add implicit, drop unused
27 -
28 ----
29 - CMakeLists.txt | 5 +++--
30 - 1 file changed, 3 insertions(+), 2 deletions(-)
31 -
32 -diff --git a/CMakeLists.txt b/CMakeLists.txt
33 -index 0221b84..d195569 100644
34 ---- a/CMakeLists.txt
35 -+++ b/CMakeLists.txt
36 -@@ -7,18 +7,19 @@ set (KF5_MIN_VERSION "5.30.0")
37 - find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
38 - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
39 -
40 --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets )
41 -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Widgets)
42 - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
43 -+ Completion
44 - Config
45 - ConfigWidgets
46 - CoreAddons
47 - Crash
48 - DBusAddons
49 -+ DocTools
50 - I18n
51 - KDELibs4Support
52 - KIO
53 - WidgetsAddons
54 -- WindowSystem
55 - XmlGui
56 - )
57 -
58 ---
59 -2.19.0
60 -
61
62 diff --git a/kde-apps/kolf/kolf-18.08.49.9999.ebuild b/kde-apps/kolf/kolf-18.08.49.9999.ebuild
63 index 003cc9de03..e04c39613e 100644
64 --- a/kde-apps/kolf/kolf-18.08.49.9999.ebuild
65 +++ b/kde-apps/kolf/kolf-18.08.49.9999.ebuild
66 @@ -34,5 +34,3 @@ DEPEND="
67 RDEPEND="${DEPEND}
68 !kde-apps/kde4-l10n
69 "
70 -
71 -PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )
72
73 diff --git a/kde-apps/kolf/kolf-9999.ebuild b/kde-apps/kolf/kolf-9999.ebuild
74 index 003cc9de03..e04c39613e 100644
75 --- a/kde-apps/kolf/kolf-9999.ebuild
76 +++ b/kde-apps/kolf/kolf-9999.ebuild
77 @@ -34,5 +34,3 @@ DEPEND="
78 RDEPEND="${DEPEND}
79 !kde-apps/kde4-l10n
80 "
81 -
82 -PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )