1 |
commit: cabd376285ddfb2ba8329762314055e69e4fe3c7 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 13 18:33:32 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 13 18:33:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cabd3762 |
7 |
|
8 |
kde-apps/kolourpaint: Frameworks merged to master |
9 |
|
10 |
Spotted by Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>. |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
kde-apps/kolourpaint/kolourpaint-5.9999.ebuild | 43 -------------------------- |
15 |
kde-apps/kolourpaint/kolourpaint-9999.ebuild | 30 ++++++++++++------ |
16 |
2 files changed, 21 insertions(+), 52 deletions(-) |
17 |
|
18 |
diff --git a/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild b/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild |
19 |
deleted file mode 100644 |
20 |
index 9bc6b44..0000000 |
21 |
--- a/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,43 +0,0 @@ |
24 |
-# Copyright 1999-2016 Gentoo Foundation |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Id$ |
27 |
- |
28 |
-EAPI=6 |
29 |
- |
30 |
-EGIT_BRANCH="frameworks" |
31 |
-inherit kde5 |
32 |
- |
33 |
-DESCRIPTION="Paint Program by KDE" |
34 |
-HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/" |
35 |
-KEYWORDS="" |
36 |
-LICENSE="BSD LGPL-2" |
37 |
-IUSE="scanner" |
38 |
- |
39 |
-RDEPEND=" |
40 |
- $(add_frameworks_dep kconfig) |
41 |
- $(add_frameworks_dep kconfigwidgets) |
42 |
- $(add_frameworks_dep kcoreaddons) |
43 |
- $(add_frameworks_dep kdelibs4support) |
44 |
- $(add_frameworks_dep kguiaddons) |
45 |
- $(add_frameworks_dep ki18n) |
46 |
- $(add_frameworks_dep kiconthemes) |
47 |
- $(add_frameworks_dep kservice) |
48 |
- $(add_frameworks_dep ktextwidgets) |
49 |
- $(add_frameworks_dep kwidgetsaddons) |
50 |
- $(add_frameworks_dep kxmlgui) |
51 |
- $(add_qt_dep qtgui) |
52 |
- $(add_qt_dep qtprintsupport) |
53 |
- $(add_qt_dep qtwidgets) |
54 |
- scanner? ( $(add_kdeapps_dep libksane) ) |
55 |
-" |
56 |
-DEPEND="${RDEPEND} |
57 |
- sys-devel/gettext |
58 |
-" |
59 |
- |
60 |
-src_configure() { |
61 |
- local mycmakeargs=( |
62 |
- $(cmake-utils_use_find_package scanner KF5Sane) |
63 |
- ) |
64 |
- |
65 |
- kde5_src_configure |
66 |
-} |
67 |
|
68 |
diff --git a/kde-apps/kolourpaint/kolourpaint-9999.ebuild b/kde-apps/kolourpaint/kolourpaint-9999.ebuild |
69 |
index b30e54f..34ab03c 100644 |
70 |
--- a/kde-apps/kolourpaint/kolourpaint-9999.ebuild |
71 |
+++ b/kde-apps/kolourpaint/kolourpaint-9999.ebuild |
72 |
@@ -4,27 +4,39 @@ |
73 |
|
74 |
EAPI=6 |
75 |
|
76 |
-KDE_HANDBOOK="optional" |
77 |
-inherit kde4-base |
78 |
+inherit kde5 |
79 |
|
80 |
DESCRIPTION="Paint Program by KDE" |
81 |
HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/" |
82 |
KEYWORDS="" |
83 |
LICENSE="BSD LGPL-2" |
84 |
-IUSE="debug scanner" |
85 |
+IUSE="scanner" |
86 |
|
87 |
-DEPEND=" |
88 |
- media-libs/qimageblitz |
89 |
+RDEPEND=" |
90 |
+ $(add_frameworks_dep kconfig) |
91 |
+ $(add_frameworks_dep kconfigwidgets) |
92 |
+ $(add_frameworks_dep kcoreaddons) |
93 |
+ $(add_frameworks_dep kdelibs4support) |
94 |
+ $(add_frameworks_dep kguiaddons) |
95 |
+ $(add_frameworks_dep ki18n) |
96 |
+ $(add_frameworks_dep kiconthemes) |
97 |
+ $(add_frameworks_dep kservice) |
98 |
+ $(add_frameworks_dep ktextwidgets) |
99 |
+ $(add_frameworks_dep kwidgetsaddons) |
100 |
+ $(add_frameworks_dep kxmlgui) |
101 |
+ $(add_qt_dep qtgui) |
102 |
+ $(add_qt_dep qtprintsupport) |
103 |
+ $(add_qt_dep qtwidgets) |
104 |
scanner? ( $(add_kdeapps_dep libksane) ) |
105 |
" |
106 |
-RDEPEND="${DEPEND} |
107 |
- scanner? ( $(add_kdeapps_dep ksaneplugin) ) |
108 |
+DEPEND="${RDEPEND} |
109 |
+ sys-devel/gettext |
110 |
" |
111 |
|
112 |
src_configure() { |
113 |
local mycmakeargs=( |
114 |
- $(cmake-utils_use_find_package scanner KSane) |
115 |
+ $(cmake-utils_use_find_package scanner KF5Sane) |
116 |
) |
117 |
|
118 |
- kde4-base_src_configure |
119 |
+ kde5_src_configure |
120 |
} |