1 |
commit: e52e8da5a548d5167ab72eded42a5a33accf2e4b |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Mar 6 17:47:35 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 7 15:13:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e52e8da5 |
7 |
|
8 |
kde-apps/krdc: Frameworks merged to master |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
kde-apps/krdc/krdc-5.9999.ebuild | 50 ---------------------------------------- |
13 |
kde-apps/krdc/krdc-9999.ebuild | 41 +++++++++++++++++++++----------- |
14 |
2 files changed, 27 insertions(+), 64 deletions(-) |
15 |
|
16 |
diff --git a/kde-apps/krdc/krdc-5.9999.ebuild b/kde-apps/krdc/krdc-5.9999.ebuild |
17 |
deleted file mode 100644 |
18 |
index b5460f1..0000000 |
19 |
--- a/kde-apps/krdc/krdc-5.9999.ebuild |
20 |
+++ /dev/null |
21 |
@@ -1,50 +0,0 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
-# Distributed under the terms of the GNU General Public License v2 |
24 |
-# $Id$ |
25 |
- |
26 |
-EAPI=5 |
27 |
- |
28 |
-EGIT_BRANCH="frameworks" |
29 |
-KDE_HANDBOOK="forceoptional" |
30 |
-inherit kde5 |
31 |
- |
32 |
-DESCRIPTION="Remote desktop connection (RDP and VNC) client" |
33 |
-HOMEPAGE="https://www.kde.org/applications/internet/krdc/" |
34 |
-KEYWORDS="" |
35 |
-IUSE="+rdesktop vnc" |
36 |
- |
37 |
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 |
38 |
- |
39 |
-DEPEND=" |
40 |
- $(add_frameworks_dep kbookmarks) |
41 |
- $(add_frameworks_dep kcmutils) |
42 |
- $(add_frameworks_dep kcompletion) |
43 |
- $(add_frameworks_dep kconfig) |
44 |
- $(add_frameworks_dep kconfigwidgets) |
45 |
- $(add_frameworks_dep kcoreaddons) |
46 |
- $(add_frameworks_dep kdnssd) |
47 |
- $(add_frameworks_dep ki18n) |
48 |
- $(add_frameworks_dep kiconthemes) |
49 |
- $(add_frameworks_dep knotifications) |
50 |
- $(add_frameworks_dep knotifyconfig) |
51 |
- $(add_frameworks_dep kservice) |
52 |
- $(add_frameworks_dep kwallet) |
53 |
- $(add_frameworks_dep kwidgetsaddons) |
54 |
- $(add_frameworks_dep kxmlgui) |
55 |
- $(add_qt_dep qtgui) |
56 |
- $(add_qt_dep qtwidgets) |
57 |
- $(add_qt_dep qtxml) |
58 |
- net-dns/avahi |
59 |
- vnc? ( >=net-libs/libvncserver-0.9 ) |
60 |
-" |
61 |
-RDEPEND="${DEPEND} |
62 |
- rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) |
63 |
-" |
64 |
- |
65 |
-src_configure() { |
66 |
- local mycmakeargs=( |
67 |
- -DWITH_LibVNCServer=$(usex vnc) |
68 |
- ) |
69 |
- |
70 |
- kde5_src_configure |
71 |
-} |
72 |
|
73 |
diff --git a/kde-apps/krdc/krdc-9999.ebuild b/kde-apps/krdc/krdc-9999.ebuild |
74 |
index f06d46c..366963f 100644 |
75 |
--- a/kde-apps/krdc/krdc-9999.ebuild |
76 |
+++ b/kde-apps/krdc/krdc-9999.ebuild |
77 |
@@ -2,23 +2,39 @@ |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
# $Id$ |
80 |
|
81 |
-EAPI=5 |
82 |
+EAPI=6 |
83 |
|
84 |
-KDE_HANDBOOK="optional" |
85 |
-inherit kde4-base |
86 |
+KDE_HANDBOOK="forceoptional" |
87 |
+inherit kde5 |
88 |
|
89 |
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client" |
90 |
+DESCRIPTION="Remote desktop connection (RDP and VNC) client" |
91 |
HOMEPAGE="https://www.kde.org/applications/internet/krdc/" |
92 |
KEYWORDS="" |
93 |
-IUSE="debug jpeg +rdesktop telepathy vnc zeroconf" |
94 |
+IUSE="+rdesktop vnc" |
95 |
|
96 |
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1 |
97 |
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24 |
98 |
|
99 |
DEPEND=" |
100 |
- jpeg? ( virtual/jpeg:0 ) |
101 |
- telepathy? ( >=net-libs/telepathy-qt-0.9[qt4] ) |
102 |
+ $(add_frameworks_dep kbookmarks) |
103 |
+ $(add_frameworks_dep kcmutils) |
104 |
+ $(add_frameworks_dep kcompletion) |
105 |
+ $(add_frameworks_dep kconfig) |
106 |
+ $(add_frameworks_dep kconfigwidgets) |
107 |
+ $(add_frameworks_dep kcoreaddons) |
108 |
+ $(add_frameworks_dep kdnssd) |
109 |
+ $(add_frameworks_dep ki18n) |
110 |
+ $(add_frameworks_dep kiconthemes) |
111 |
+ $(add_frameworks_dep knotifications) |
112 |
+ $(add_frameworks_dep knotifyconfig) |
113 |
+ $(add_frameworks_dep kservice) |
114 |
+ $(add_frameworks_dep kwallet) |
115 |
+ $(add_frameworks_dep kwidgetsaddons) |
116 |
+ $(add_frameworks_dep kxmlgui) |
117 |
+ $(add_qt_dep qtgui) |
118 |
+ $(add_qt_dep qtwidgets) |
119 |
+ $(add_qt_dep qtxml) |
120 |
+ net-dns/avahi |
121 |
vnc? ( >=net-libs/libvncserver-0.9 ) |
122 |
- zeroconf? ( net-dns/avahi ) |
123 |
" |
124 |
RDEPEND="${DEPEND} |
125 |
rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) |
126 |
@@ -26,11 +42,8 @@ RDEPEND="${DEPEND} |
127 |
|
128 |
src_configure() { |
129 |
local mycmakeargs=( |
130 |
- $(cmake-utils_use_with jpeg) |
131 |
- $(cmake-utils_use_with telepathy TelepathyQt4) |
132 |
- $(cmake-utils_use_with vnc LibVNCServer) |
133 |
- $(cmake-utils_use_with zeroconf DNSSD) |
134 |
+ -DWITH_LibVNCServer=$(usex vnc) |
135 |
) |
136 |
|
137 |
- kde4-base_src_configure |
138 |
+ kde5_src_configure |
139 |
} |