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

[Andreas Sturmlechner]

commit:     b1bb9633371b81649f2c8aa61084a3fdfdab76ec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 07:44:56 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=b1bb9633

kde-apps/kgoldrunner: Patch upstreamed

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/kgoldrunner-18.08.1-deps.patch           | 62 ----------------------
 .../kgoldrunner/kgoldrunner-18.08.49.9999.ebuild   |  2 -
 kde-apps/kgoldrunner/kgoldrunner-9999.ebuild       |  2 -
 3 files changed, 66 deletions(-)

diff --git a/kde-apps/kgoldrunner/files/kgoldrunner-18.08.1-deps.patch b/kde-apps/kgoldrunner/files/kgoldrunner-18.08.1-deps.patch
deleted file mode 100644
index 7258aabb72..0000000000
--- a/kde-apps/kgoldrunner/files/kgoldrunner-18.08.1-deps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 8ece3282220b67d44b02f6a4eddb5060333b0295 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Wed, 12 Sep 2018 18:32:52 +0200
-Subject: [PATCH] Drop unused dependencies, add implicit
-
-Test Plan: Still builds, starts fine after the change.
-
-Reviewers: #kde_games
-
-Subscribers: kde-games-devel
-
-Differential Revision: https://phabricator.kde.org/D15460
----
- CMakeLists.txt     | 9 +++++----
- src/CMakeLists.txt | 1 +
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9eb176..c7ea433 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,20 +7,21 @@ 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 Qml Quick QuickWidgets Svg Test)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Widgets)
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--    CoreAddons
-     Config
-     ConfigWidgets
-+    CoreAddons
-     Crash
-     DBusAddons
-     DocTools
-     I18n
-     KIO
--    XmlGui)
-+    WidgetsAddons
-+    XmlGui
-+)
- 
- find_package(KF5KDEGames 4.9.0 REQUIRED)
--find_package(Phonon4Qt5 CONFIG REQUIRED)
- 
- include_directories(BEFORE ${PHONON_INCLUDES})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 54c6acb..15e65b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -34,6 +34,7 @@ target_link_libraries(kgoldrunner
-     KF5::DBusAddons
-     KF5::KIOCore
-     KF5::Crash
-+    KF5::WidgetsAddons
-     KF5::XmlGui
- )
- 
--- 
-2.19.0
-

diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.08.49.9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.08.49.9999.ebuild
index 1a14a6d12a..21facff30d 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-18.08.49.9999.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.08.49.9999.ebuild
@@ -35,5 +35,3 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
 	$(add_qt_dep qtsvg)
 "
-
-PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )

diff --git a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
index 1a14a6d12a..21facff30d 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-9999.ebuild
@@ -35,5 +35,3 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
 	$(add_qt_dep qtsvg)
 "
-
-PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )