[gentoo-commits] proj/kde:master commit in: kde-apps/kolf/, kde-apps/kolf/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/kolf/, kde-apps/kolf/files/

[Andreas Sturmlechner]

commit:     0f811ecea6e8e0ace778b0d5b5f34ff0d174431b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 07:44:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 07:45:30 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0f811ece

kde-apps/kolf: Patch upstreamed

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 kde-apps/kolf/files/kolf-18.08.1-deps.patch | 38 -----------------------------
 kde-apps/kolf/kolf-18.08.49.9999.ebuild     |  2 --
 kde-apps/kolf/kolf-9999.ebuild              |  2 --
 3 files changed, 42 deletions(-)

diff --git a/kde-apps/kolf/files/kolf-18.08.1-deps.patch b/kde-apps/kolf/files/kolf-18.08.1-deps.patch
deleted file mode 100644
index a6b89b4023..0000000000
--- a/kde-apps/kolf/files/kolf-18.08.1-deps.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d5220258e7e652a6544cf80b2375c3fa185b1152 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 12 Sep 2018 18:12:14 +0200
-Subject: [PATCH] Fix dependencies: add implicit, drop unused
-
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0221b84..d195569 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,18 +7,19 @@ set (KF5_MIN_VERSION "5.30.0")
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets )
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Widgets)
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-+    Completion
-     Config
-     ConfigWidgets
-     CoreAddons
-     Crash
-     DBusAddons
-+    DocTools
-     I18n
-     KDELibs4Support
-     KIO
-     WidgetsAddons
--    WindowSystem
-     XmlGui
- )
- 
--- 
-2.19.0
-

diff --git a/kde-apps/kolf/kolf-18.08.49.9999.ebuild b/kde-apps/kolf/kolf-18.08.49.9999.ebuild
index 003cc9de03..e04c39613e 100644
--- a/kde-apps/kolf/kolf-18.08.49.9999.ebuild
+++ b/kde-apps/kolf/kolf-18.08.49.9999.ebuild
@@ -34,5 +34,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kde4-l10n
 "
-
-PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )

diff --git a/kde-apps/kolf/kolf-9999.ebuild b/kde-apps/kolf/kolf-9999.ebuild
index 003cc9de03..e04c39613e 100644
--- a/kde-apps/kolf/kolf-9999.ebuild
+++ b/kde-apps/kolf/kolf-9999.ebuild
@@ -34,5 +34,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-apps/kde4-l10n
 "
-
-PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )