1 |
commit: 5146febc7e747ed0dcd66c99394e693c32d8b9ca |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 31 19:59:27 2015 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 31 20:59:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5146febc |
7 |
|
8 |
Remove conflicting KDE4-based RDEPENDs from meta |
9 |
|
10 |
kgpg - depends on kde-base/kdepimlibs:4 |
11 |
kopete - depends on kde-base/kdepimlibs:4 |
12 |
kuser - depends on kde-base/kdepimlibs:4 |
13 |
|
14 |
Package-Manager: portage-2.2.20 |
15 |
|
16 |
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org> |
17 |
|
18 |
kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild | 5 +++-- |
19 |
kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild | 3 ++- |
20 |
kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild | 5 +++-- |
21 |
kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild | 3 ++- |
22 |
kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild | 5 +++-- |
23 |
kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild | 3 ++- |
24 |
6 files changed, 15 insertions(+), 9 deletions(-) |
25 |
|
26 |
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
27 |
index a0fd2d0..938a219 100644 |
28 |
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
29 |
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.07.80.ebuild |
30 |
@@ -7,11 +7,12 @@ EAPI=5 |
31 |
inherit kde5-meta-pkg |
32 |
|
33 |
DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages" |
34 |
-KEYWORDS="~amd64 ~x86" |
35 |
+KEYWORDS="" |
36 |
IUSE="+cron" |
37 |
|
38 |
+# FIXME: Add back when ported |
39 |
+# $(add_kdeapps_dep kuser) |
40 |
RDEPEND=" |
41 |
$(add_kdeapps_dep ksystemlog) |
42 |
- $(add_kdeapps_dep kuser) |
43 |
cron? ( $(add_kdeapps_dep kcron) ) |
44 |
" |
45 |
|
46 |
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
47 |
index 084822c..938a219 100644 |
48 |
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
49 |
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.08.49.9999.ebuild |
50 |
@@ -10,8 +10,9 @@ DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-deriv |
51 |
KEYWORDS="" |
52 |
IUSE="+cron" |
53 |
|
54 |
+# FIXME: Add back when ported |
55 |
+# $(add_kdeapps_dep kuser) |
56 |
RDEPEND=" |
57 |
$(add_kdeapps_dep ksystemlog) |
58 |
- $(add_kdeapps_dep kuser) |
59 |
cron? ( $(add_kdeapps_dep kcron) ) |
60 |
" |
61 |
|
62 |
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
63 |
index 9de8b42..ba20d38 100644 |
64 |
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
65 |
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.07.80.ebuild |
66 |
@@ -7,13 +7,14 @@ EAPI=5 |
67 |
inherit kde5-meta-pkg |
68 |
|
69 |
DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages" |
70 |
-KEYWORDS="~amd64 ~x86" |
71 |
+KEYWORDS="" |
72 |
IUSE="ppp" |
73 |
|
74 |
+# FIXME: Add back when ported |
75 |
+# $(add_kdeapps_dep kopete) |
76 |
RDEPEND=" |
77 |
$(add_kdeapps_dep kdenetwork-filesharing) |
78 |
$(add_kdeapps_dep kget) |
79 |
- $(add_kdeapps_dep kopete) |
80 |
$(add_kdeapps_dep krdc) |
81 |
$(add_kdeapps_dep krfb) |
82 |
$(add_kdeapps_dep plasma-telepathy-meta) |
83 |
|
84 |
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
85 |
index 27b87a1..ba20d38 100644 |
86 |
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
87 |
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.08.49.9999.ebuild |
88 |
@@ -10,10 +10,11 @@ DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages" |
89 |
KEYWORDS="" |
90 |
IUSE="ppp" |
91 |
|
92 |
+# FIXME: Add back when ported |
93 |
+# $(add_kdeapps_dep kopete) |
94 |
RDEPEND=" |
95 |
$(add_kdeapps_dep kdenetwork-filesharing) |
96 |
$(add_kdeapps_dep kget) |
97 |
- $(add_kdeapps_dep kopete) |
98 |
$(add_kdeapps_dep krdc) |
99 |
$(add_kdeapps_dep krfb) |
100 |
$(add_kdeapps_dep plasma-telepathy-meta) |
101 |
|
102 |
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
103 |
index 8c5fe0a..aafae4f 100644 |
104 |
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
105 |
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.07.80.ebuild |
106 |
@@ -8,16 +8,17 @@ inherit kde5-meta-pkg |
107 |
|
108 |
DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages" |
109 |
HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org" |
110 |
-KEYWORDS="~amd64 ~x86" |
111 |
+KEYWORDS="" |
112 |
IUSE="cups floppy lirc" |
113 |
|
114 |
+# FIXME: Add back when ported |
115 |
+# $(add_kdeapps_dep kgpg) |
116 |
RDEPEND=" |
117 |
$(add_kdeapps_dep ark) |
118 |
$(add_kdeapps_dep filelight) |
119 |
$(add_kdeapps_dep kcalc) |
120 |
$(add_kdeapps_dep kcharselect) |
121 |
$(add_kdeapps_dep kdf) |
122 |
- $(add_kdeapps_dep kgpg) |
123 |
$(add_kdeapps_dep ktimer) |
124 |
$(add_kdeapps_dep kwalletmanager) |
125 |
$(add_kdeapps_dep superkaramba) |
126 |
|
127 |
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
128 |
index 2124052..aafae4f 100644 |
129 |
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
130 |
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.08.49.9999.ebuild |
131 |
@@ -11,13 +11,14 @@ HOMEPAGE="http://www.kde.org/applications/utilities http://utils.kde.org" |
132 |
KEYWORDS="" |
133 |
IUSE="cups floppy lirc" |
134 |
|
135 |
+# FIXME: Add back when ported |
136 |
+# $(add_kdeapps_dep kgpg) |
137 |
RDEPEND=" |
138 |
$(add_kdeapps_dep ark) |
139 |
$(add_kdeapps_dep filelight) |
140 |
$(add_kdeapps_dep kcalc) |
141 |
$(add_kdeapps_dep kcharselect) |
142 |
$(add_kdeapps_dep kdf) |
143 |
- $(add_kdeapps_dep kgpg) |
144 |
$(add_kdeapps_dep ktimer) |
145 |
$(add_kdeapps_dep kwalletmanager) |
146 |
$(add_kdeapps_dep superkaramba) |