Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kmail/files/, kde-base/kmail/
Date: Wed, 01 Jul 2015 20:04:32
Message-Id: 1435780994.954fdb4e1f067f089eb8e51baa7b9bde0870f466.dilfridge@gentoo
1 commit: 954fdb4e1f067f089eb8e51baa7b9bde0870f466
2 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 1 20:03:14 2015 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 1 20:03:14 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=954fdb4e
7
8 [kde-base/kmail] Add 4.4-noakonadi snapshot
9
10 Package-Manager: portage-2.2.20
11
12 kde-base/kmail/files/kmail-4.4.9-nodbus.patch | 83 +++++++++++++++++++++++++++
13 kde-base/kmail/kmail-4.4.2015.06.ebuild | 77 +++++++++++++++++++++++++
14 2 files changed, 160 insertions(+)
15
16 diff --git a/kde-base/kmail/files/kmail-4.4.9-nodbus.patch b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
17 new file mode 100644
18 index 0000000..af3237d
19 --- /dev/null
20 +++ b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
21 @@ -0,0 +1,83 @@
22 +diff -ruN kmail-4.4.9.orig/kmail/tests/CMakeLists.txt kmail-4.4.9/kmail/tests/CMakeLists.txt
23 +--- kmail-4.4.9.orig/kmail/tests/CMakeLists.txt 2010-12-22 18:52:24.000000000 +0100
24 ++++ kmail-4.4.9/kmail/tests/CMakeLists.txt 2011-01-25 23:52:38.953021223 +0100
25 +@@ -9,14 +9,14 @@
26 + add_definitions(-DKMAIL_UNITTESTS=YES)
27 +
28 + ########### htmlquotecolorertest ###############
29 +-set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
30 +-kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
31 +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
32 +-target_link_libraries(htmlquotecolorertest
33 +- ${QT_QTTEST_LIBRARY}
34 +- ${QT_QTCORE_LIBRARY}
35 +- ${KDE4_KHTML_LIBRARY}
36 +-)
37 ++# set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
38 ++# kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
39 ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
40 ++# target_link_libraries(htmlquotecolorertest
41 ++# ${QT_QTTEST_LIBRARY}
42 ++# ${QT_QTCORE_LIBRARY}
43 ++# ${KDE4_KHTML_LIBRARY}
44 ++# )
45 +
46 + ########### utiltests ###############
47 +
48 +diff -ruN kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt kmail-4.4.9/messagecore/tests/CMakeLists.txt
49 +--- kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt 2010-12-22 18:52:15.000000000 +0100
50 ++++ kmail-4.4.9/messagecore/tests/CMakeLists.txt 2011-01-25 23:50:54.421021223 +0100
51 +@@ -13,6 +13,6 @@
52 + # Attachment tests.
53 + add_messagecore_test( attachmentcompressjobtest.cpp )
54 + add_messagecore_test( attachmentfrommimecontentjobtest.cpp )
55 +-add_messagecore_test( attachmentfromurljobtest.cpp )
56 ++# add_messagecore_test( attachmentfromurljobtest.cpp )
57 + add_messagecore_test( attachmentparttest.cpp )
58 +-add_messagecore_test( attachmentpropertiesdialogtest.cpp )
59 ++# add_messagecore_test( attachmentpropertiesdialogtest.cpp )
60 +diff -ruN kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt kmail-4.4.9/messageviewer/tests/CMakeLists.txt
61 +--- kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt 2010-12-22 18:52:47.000000000 +0100
62 ++++ kmail-4.4.9/messageviewer/tests/CMakeLists.txt 2011-01-25 23:51:58.374021223 +0100
63 +@@ -6,23 +6,23 @@
64 + )
65 +
66 + ########### htmlquotecolorertest ###############
67 +-set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
68 +-kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
69 +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
70 +-target_link_libraries(messageviewer_htmlquotecolorertest
71 +- ${QT_QTTEST_LIBRARY}
72 +- ${QT_QTCORE_LIBRARY}
73 +- ${KDE4_KHTML_LIBRARY}
74 +- messageviewer
75 +-)
76 ++# set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
77 ++# kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
78 ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
79 ++# target_link_libraries(messageviewer_htmlquotecolorertest
80 ++# ${QT_QTTEST_LIBRARY}
81 ++# ${QT_QTCORE_LIBRARY}
82 ++# ${KDE4_KHTML_LIBRARY}
83 ++# messageviewer
84 ++# )
85 +
86 + ########### stringutiltest ###############
87 +-set(stringutiltest_SRCS stringutiltest.cpp)
88 +-kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
89 +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
90 +-target_link_libraries(stringutiltest
91 +- ${QT_QTTEST_LIBRARY}
92 +- ${QT_QTCORE_LIBRARY}
93 +- ${KDE4_KHTML_LIBRARY}
94 +- messageviewer
95 +-)
96 ++# set(stringutiltest_SRCS stringutiltest.cpp)
97 ++# kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
98 ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
99 ++# target_link_libraries(stringutiltest
100 ++# ${QT_QTTEST_LIBRARY}
101 ++# ${QT_QTCORE_LIBRARY}
102 ++# ${KDE4_KHTML_LIBRARY}
103 ++# messageviewer
104 ++# )
105
106 diff --git a/kde-base/kmail/kmail-4.4.2015.06.ebuild b/kde-base/kmail/kmail-4.4.2015.06.ebuild
107 new file mode 100644
108 index 0000000..72bb84a
109 --- /dev/null
110 +++ b/kde-base/kmail/kmail-4.4.2015.06.ebuild
111 @@ -0,0 +1,77 @@
112 +# Copyright 1999-2015 Gentoo Foundation
113 +# Distributed under the terms of the GNU General Public License v2
114 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.11.1-r2.ebuild,v 1.5 2015/02/16 08:31:41 ago Exp $
115 +
116 +EAPI=5
117 +
118 +KMNAME="kdepim"
119 +KDE_HANDBOOK=optional
120 +VIRTUALX_REQUIRED=test
121 +inherit flag-o-matic kde4-meta
122 +
123 +DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE (noakonadi branch)"
124 +KEYWORDS=""
125 +IUSE="debug"
126 +
127 +DEPEND="
128 + $(add_kdebase_dep kdelibs 'nepomuk' 4.13.1)
129 + $(add_kdebase_dep kdepimlibs '' 4.13.1)
130 + $(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
131 + $(add_kdebase_dep libkleo)
132 + $(add_kdebase_dep libkpgp)
133 +"
134 +RDEPEND="${DEPEND}
135 + $(add_kdebase_dep kdepim-runtime)
136 +"
137 +
138 +KMEXTRACTONLY="
139 + korganizer/org.kde.Korganizer.Calendar.xml
140 + libkleo/
141 + libkpgp/
142 +"
143 +KMEXTRA="
144 + kmailcvt/
145 + ksendemail/
146 + libksieve/
147 + messagecore/
148 + messagelist/
149 + messageviewer/
150 + mimelib/
151 + plugins/kmail/
152 +"
153 +KMLOADLIBS="libkdepim"
154 +
155 +PATCHES=(
156 + "${FILESDIR}/${PN}-4.4.9-nodbus.patch"
157 +)
158 +
159 +src_configure() {
160 + # Bug 308903
161 + use ppc64 && append-flags -mminimal-toc
162 +
163 + mycmakeargs=(
164 + -DWITH_IndicateQt=OFF
165 + )
166 +
167 + kde4-meta_src_configure
168 +}
169 +
170 +src_compile() {
171 + kde4-meta_src_compile kmail_xml
172 + kde4-meta_src_compile
173 +}
174 +
175 +pkg_postinst() {
176 + kde4-meta_pkg_postinst
177 +
178 + if ! has_version kde-base/kdepim-kresources:${SLOT}; then
179 + echo
180 + elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
181 + echo
182 + fi
183 + if ! has_version kde-base/kleopatra:${SLOT}; then
184 + echo
185 + elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
186 + echo
187 + fi
188 +}