Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: sets/, kde-apps/noteshared/, Documentation/package.accept_keywords/, ...
Date: Sat, 28 Nov 2015 10:25:23
Message-Id: 1448706189.463ac743f4e008360b91d577e91f669e5513e45e.johu@gentoo
1 commit: 463ac743f4e008360b91d577e91f669e5513e45e
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 10:23:09 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 10:23:09 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=463ac743
7
8 kde-apps/noteshared: Included into knotes in master
9
10 .../.kde-applications-live/kdepim-live | 1 -
11 .../kde-applications-live.keywords | 1 -
12 Documentation/package.mask/kde-applications-live | 1 -
13 Documentation/package.unmask/kde-applications-live | 1 -
14 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild | 1 -
15 kde-apps/kdepim/kdepim-9999.ebuild | 3 +-
16 kde-apps/noteshared/noteshared-9999.ebuild | 49 ----------------------
17 sets/kdepim-live | 1 -
18 8 files changed, 1 insertion(+), 57 deletions(-)
19
20 diff --git a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
21 index 5be8293..c0c3511 100644
22 --- a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
23 +++ b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
24 @@ -46,7 +46,6 @@
25 ~kde-apps/messagecore-9999 **
26 ~kde-apps/messagelist-9999 **
27 ~kde-apps/messageviewer-9999 **
28 -~kde-apps/noteshared-9999 **
29 ~kde-apps/pimcommon-9999 **
30 ~kde-apps/syndication-9999 **
31 ~kde-apps/templateparser-9999 **
32
33 diff --git a/Documentation/package.accept_keywords/kde-applications-live.keywords b/Documentation/package.accept_keywords/kde-applications-live.keywords
34 index 5c0cbb5..11609a4 100644
35 --- a/Documentation/package.accept_keywords/kde-applications-live.keywords
36 +++ b/Documentation/package.accept_keywords/kde-applications-live.keywords
37 @@ -138,7 +138,6 @@
38 ~kde-apps/messagecore-9999 **
39 ~kde-apps/messagelist-9999 **
40 ~kde-apps/messageviewer-9999 **
41 -~kde-apps/noteshared-9999 **
42 ~kde-apps/pimcommon-9999 **
43 ~kde-apps/syndication-9999 **
44 ~kde-apps/templateparser-9999 **
45
46 diff --git a/Documentation/package.mask/kde-applications-live b/Documentation/package.mask/kde-applications-live
47 index 7716b28..ab42b94 100644
48 --- a/Documentation/package.mask/kde-applications-live
49 +++ b/Documentation/package.mask/kde-applications-live
50 @@ -138,7 +138,6 @@
51 ~kde-apps/messagecore-9999
52 ~kde-apps/messagelist-9999
53 ~kde-apps/messageviewer-9999
54 -~kde-apps/noteshared-9999
55 ~kde-apps/pimcommon-9999
56 ~kde-apps/syndication-9999
57 ~kde-apps/templateparser-9999
58
59 diff --git a/Documentation/package.unmask/kde-applications-live b/Documentation/package.unmask/kde-applications-live
60 index 7716b28..ab42b94 100644
61 --- a/Documentation/package.unmask/kde-applications-live
62 +++ b/Documentation/package.unmask/kde-applications-live
63 @@ -138,7 +138,6 @@
64 ~kde-apps/messagecore-9999
65 ~kde-apps/messagelist-9999
66 ~kde-apps/messageviewer-9999
67 -~kde-apps/noteshared-9999
68 ~kde-apps/pimcommon-9999
69 ~kde-apps/syndication-9999
70 ~kde-apps/templateparser-9999
71
72 diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
73 index e84bb27..c5a3250 100644
74 --- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
75 +++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
76 @@ -61,7 +61,6 @@ RDEPEND="
77 $(add_kdeapps_dep messagecore)
78 $(add_kdeapps_dep messagelist)
79 $(add_kdeapps_dep messageviewer)
80 - $(add_kdeapps_dep noteshared)
81 $(add_kdeapps_dep pimcommon)
82 $(add_kdeapps_dep syndication)
83 $(add_kdeapps_dep templateparser)
84
85 diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild
86 index 2d05612..5031738 100644
87 --- a/kde-apps/kdepim/kdepim-9999.ebuild
88 +++ b/kde-apps/kdepim/kdepim-9999.ebuild
89 @@ -92,7 +92,6 @@ DEPEND="
90 $(add_kdeapps_dep messagecore)
91 $(add_kdeapps_dep messagelist)
92 $(add_kdeapps_dep messageviewer)
93 - $(add_kdeapps_dep noteshared)
94 $(add_kdeapps_dep pimcommon)
95 $(add_kdeapps_dep syndication)
96 $(add_kdeapps_dep templateparser)
97 @@ -121,6 +120,7 @@ DEPEND="
98 )
99 "
100 RDEPEND="${DEPEND}
101 + !kde-apps/noteshared
102 !kde-base/akonadiconsole:4
103 !kde-base/akregator:4
104 !kde-base/blogilo:4
105 @@ -172,7 +172,6 @@ src_prepare() {
106 messagecore \
107 messagelist \
108 messageviewer \
109 - noteshared \
110 pimcommon \
111 templateparser \
112 || die "Failed to remove split libraries"
113
114 diff --git a/kde-apps/noteshared/noteshared-9999.ebuild b/kde-apps/noteshared/noteshared-9999.ebuild
115 deleted file mode 100644
116 index 0766153..0000000
117 --- a/kde-apps/noteshared/noteshared-9999.ebuild
118 +++ /dev/null
119 @@ -1,49 +0,0 @@
120 -# Copyright 1999-2015 Gentoo Foundation
121 -# Distributed under the terms of the GNU General Public License v2
122 -# $Id$
123 -
124 -EAPI=5
125 -
126 -KDE_TEST="true"
127 -KMNAME="kdepim"
128 -inherit kde5
129 -
130 -DESCRIPTION="Common notes library"
131 -LICENSE="LGPL-2+"
132 -KEYWORDS=""
133 -IUSE=""
134 -
135 -COMMON_DEPEND="
136 - $(add_frameworks_dep kcompletion)
137 - $(add_frameworks_dep kconfig)
138 - $(add_frameworks_dep kconfigwidgets)
139 - $(add_frameworks_dep kcoreaddons)
140 - $(add_frameworks_dep kdelibs4support)
141 - $(add_frameworks_dep kdnssd)
142 - $(add_frameworks_dep ki18n)
143 - $(add_frameworks_dep knewstuff)
144 - $(add_frameworks_dep kwidgetsaddons)
145 - $(add_kdeapps_dep akonadi-contact)
146 - $(add_kdeapps_dep akonadi-mime)
147 - $(add_kdeapps_dep akonadi-notes)
148 - $(add_kdeapps_dep kcontacts)
149 - $(add_kdeapps_dep kimap)
150 - $(add_kdeapps_dep kmime)
151 - $(add_kdeapps_dep libakonadi)
152 - $(add_kdeapps_dep pimcommon)
153 - dev-libs/libxslt
154 - dev-qt/designer:5
155 - dev-qt/qtdbus:5
156 - dev-qt/qtgui:5
157 - dev-qt/qtnetwork:5
158 - dev-qt/qtwidgets:5
159 -"
160 -DEPEND="${COMMON_DEPEND}
161 - sys-devel/gettext
162 -"
163 -RDEPEND="${COMMON_DEPEND}
164 - !<kde-apps/kdepim-15.08.50:5
165 - !kde-base/kdepim-common-libs:4
166 -"
167 -
168 -S="${WORKDIR}/${P}/${PN}"
169
170 diff --git a/sets/kdepim-live b/sets/kdepim-live
171 index 4978025..e1029d2 100644
172 --- a/sets/kdepim-live
173 +++ b/sets/kdepim-live
174 @@ -46,7 +46,6 @@
175 ~kde-apps/messagecore-9999
176 ~kde-apps/messagelist-9999
177 ~kde-apps/messageviewer-9999
178 -~kde-apps/noteshared-9999
179 ~kde-apps/pimcommon-9999
180 ~kde-apps/syndication-9999
181 ~kde-apps/templateparser-9999