1 |
commit: ee16002c620a2a56bfbccfc8e4a231fe1a5468a0 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed May 4 23:06:58 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 6 15:07:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee16002c |
7 |
|
8 |
kde-apps/ktuberling: Drop unused deps |
9 |
|
10 |
Gentoo-bug: 581588 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
Signed-off-by: Johannes Huber <johu <AT> gentoo.org> |
15 |
|
16 |
.../ktuberling/files/ktuberling-15.12.3-deps.patch | 53 ++++++++++++++++++++++ |
17 |
kde-apps/ktuberling/ktuberling-15.12.3.ebuild | 6 +-- |
18 |
2 files changed, 56 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch |
21 |
new file mode 100644 |
22 |
index 0000000..e948222 |
23 |
--- /dev/null |
24 |
+++ b/kde-apps/ktuberling/files/ktuberling-15.12.3-deps.patch |
25 |
@@ -0,0 +1,53 @@ |
26 |
+commit ed566185fe698c71714009602c4dfbe4a91e0313 |
27 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
28 |
+Date: Thu May 5 00:32:34 2016 +0200 |
29 |
+ |
30 |
+ Fix dependencies (drop unused, add missing) |
31 |
+ |
32 |
+ REVIEW: 127832 |
33 |
+ |
34 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
35 |
+index 2df6ca6..884a4b5 100644 |
36 |
+--- a/CMakeLists.txt |
37 |
++++ b/CMakeLists.txt |
38 |
+@@ -6,23 +6,18 @@ set (QT_MIN_VERSION "5.3.0") |
39 |
+ find_package(ECM 1.7.0 REQUIRED CONFIG) |
40 |
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
41 |
+ |
42 |
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) |
43 |
+-find_package(KF5 REQUIRED COMPONENTS |
44 |
+- CoreAddons |
45 |
+- Config |
46 |
+- ItemModels |
47 |
+- WidgetsAddons |
48 |
+- WindowSystem |
49 |
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS PrintSupport Svg Widgets Xml) |
50 |
++find_package(KF5 REQUIRED COMPONENTS |
51 |
++ Completion |
52 |
+ Config |
53 |
++ ConfigWidgets |
54 |
++ CoreAddons |
55 |
+ DBusAddons |
56 |
+ I18n |
57 |
+- ConfigWidgets |
58 |
+- TextWidgets |
59 |
++ KDELibs4Support #TODO eventually remove kdelibs4support |
60 |
++ WidgetsAddons |
61 |
+ XmlGui |
62 |
+- KIO |
63 |
+- NotifyConfig |
64 |
+- NewStuff |
65 |
+- KDELibs4Support) #TODO eventually remove kdelibs4support |
66 |
++) |
67 |
+ |
68 |
+ find_package(KF5KDEGames 4.9.0 REQUIRED) |
69 |
+ find_package(Phonon4Qt5 CONFIG REQUIRED) |
70 |
+@@ -58,7 +53,7 @@ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-ktuberling.png") |
71 |
+ ecm_add_app_icon(ktuberling_SRCS ICONS ${ICONS_SRCS}) |
72 |
+ add_executable(ktuberling ${ktuberling_SRCS}) |
73 |
+ |
74 |
+-target_link_libraries(ktuberling KF5::KIOCore KF5KDEGames Phonon::phonon4qt5 Qt5::Svg Phonon::phonon4qt5 KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support) |
75 |
++target_link_libraries(ktuberling KF5KDEGames Phonon::phonon4qt5 Qt5::Svg KF5::DBusAddons KF5::XmlGui KF5::Completion Qt5::PrintSupport KF5::KDELibs4Support) |
76 |
+ |
77 |
+ install(TARGETS ktuberling ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) |
78 |
+ |
79 |
|
80 |
diff --git a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild b/kde-apps/ktuberling/ktuberling-15.12.3.ebuild |
81 |
index 9fd065c..ceea7be 100644 |
82 |
--- a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild |
83 |
+++ b/kde-apps/ktuberling/ktuberling-15.12.3.ebuild |
84 |
@@ -4,8 +4,7 @@ |
85 |
|
86 |
EAPI=6 |
87 |
|
88 |
-KDE_HANDBOOK="true" |
89 |
-KDE_PUNT_BOGUS_DEPS="true" |
90 |
+KDE_HANDBOOK="forceoptional" |
91 |
KDE_SELINUX_MODULE="games" |
92 |
inherit kde5 |
93 |
|
94 |
@@ -35,5 +34,6 @@ DEPEND=" |
95 |
$(add_qt_dep qtxml) |
96 |
media-libs/phonon[qt5] |
97 |
" |
98 |
- |
99 |
RDEPEND="${DEPEND}" |
100 |
+ |
101 |
+PATCHES=( "${FILESDIR}/${P}-deps.patch" ) |