1 |
commit: c04c058c778515b4757693f8371ebcf801b23772 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 29 07:50:11 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 29 08:39:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c058c |
7 |
|
8 |
mail-client/trojita: various live ebuild updates |
9 |
|
10 |
* Port to EAPI 6 |
11 |
* Drop Qt 4 support as it is being removed upstream |
12 |
* Drop linguas USE flags as they only control small text iles |
13 |
* Introduce dbus USE flag |
14 |
* Add missing dev-qt/qtnetwork USE dependency |
15 |
* Update icon and mime caches |
16 |
|
17 |
Gentoo-bug: 572894 |
18 |
|
19 |
Package-Manager: portage-2.2.27 |
20 |
|
21 |
mail-client/trojita/trojita-9999.ebuild | 103 ++++++++++++++------------------ |
22 |
1 file changed, 45 insertions(+), 58 deletions(-) |
23 |
|
24 |
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild |
25 |
index e7c71ee..32da654 100644 |
26 |
--- a/mail-client/trojita/trojita-9999.ebuild |
27 |
+++ b/mail-client/trojita/trojita-9999.ebuild |
28 |
@@ -1,89 +1,76 @@ |
29 |
-# Copyright 1999-2015 Gentoo Foundation |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
# $Id$ |
33 |
|
34 |
-EAPI=5 |
35 |
+EAPI=6 |
36 |
|
37 |
-QT4_REQUIRED="4.8.0" |
38 |
EGIT_REPO_URI="git://anongit.kde.org/${PN}.git" |
39 |
-[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2" |
40 |
- |
41 |
-inherit cmake-utils virtualx ${GIT_ECLASS} |
42 |
+inherit cmake-utils fdo-mime gnome2-utils virtualx |
43 |
+[[ ${PV} == 9999 ]] && inherit git-r3 |
44 |
|
45 |
DESCRIPTION="A Qt IMAP e-mail client" |
46 |
HOMEPAGE="http://trojita.flaska.net/" |
47 |
-if [[ ${PV} == "9999" ]]; then |
48 |
- SRC_URI="" |
49 |
- KEYWORDS="" |
50 |
-else |
51 |
+if [[ ${PV} != 9999 ]]; then |
52 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
53 |
- KEYWORDS="~amd64 ~ppc ~x86" |
54 |
- MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW" |
55 |
+ KEYWORDS="~amd64 ~x86" |
56 |
fi |
57 |
|
58 |
LICENSE="|| ( GPL-2 GPL-3 )" |
59 |
SLOT="0" |
60 |
-IUSE="debug +password qt5 test +zlib" |
61 |
-for MY_LANG in ${MY_LANGS} ; do |
62 |
- IUSE="${IUSE} linguas_${MY_LANG}" |
63 |
-done |
64 |
+IUSE="debug +dbus +password test +zlib" |
65 |
|
66 |
RDEPEND=" |
67 |
- qt5? ( |
68 |
- dev-qt/qtgui:5 |
69 |
- dev-qt/qtnetwork:5 |
70 |
- dev-qt/qtsql:5[sqlite] |
71 |
- dev-qt/qtwebkit:5 |
72 |
- dev-qt/qtwidgets:5 |
73 |
- ) |
74 |
- !qt5? ( |
75 |
- >=dev-qt/qtbearer-${QT4_REQUIRED}:4 |
76 |
- >=dev-qt/qtgui-${QT4_REQUIRED}:4 |
77 |
- >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite] |
78 |
- >=dev-qt/qtwebkit-${QT4_REQUIRED}:4 |
79 |
- ) |
80 |
+ dev-qt/qtcore:5 |
81 |
+ dev-qt/qtgui:5 |
82 |
+ dev-qt/qtnetwork:5[ssl] |
83 |
+ dev-qt/qtsql:5[sqlite] |
84 |
+ dev-qt/qtwebkit:5 |
85 |
+ dev-qt/qtwidgets:5 |
86 |
+ dbus? ( dev-qt/qtdbus:5 ) |
87 |
+ password? ( dev-libs/qtkeychain[qt5] ) |
88 |
+ zlib? ( sys-libs/zlib ) |
89 |
" |
90 |
DEPEND="${RDEPEND} |
91 |
- password? ( |
92 |
- qt5? ( dev-libs/qtkeychain[qt5] ) |
93 |
- !qt5? ( dev-libs/qtkeychain[qt4] ) |
94 |
- ) |
95 |
- qt5? ( dev-qt/linguist-tools:5 ) |
96 |
- test? ( |
97 |
- qt5? ( dev-qt/qttest:5 ) |
98 |
- !qt5? ( >=dev-qt/qttest-${QT4_REQUIRED}:4 ) |
99 |
- ) |
100 |
- zlib? ( |
101 |
- virtual/pkgconfig |
102 |
- sys-libs/zlib |
103 |
- ) |
104 |
+ dev-qt/linguist-tools:5 |
105 |
+ test? ( dev-qt/qttest:5 ) |
106 |
+ zlib? ( virtual/pkgconfig ) |
107 |
" |
108 |
|
109 |
DOCS="README LICENSE" |
110 |
|
111 |
-src_configure() { |
112 |
- local mycmakeargs=( |
113 |
- $(cmake-utils_use_with qt5 QT5) |
114 |
- $(cmake-utils_use_with password QTKEYCHAIN_PLUGIN) |
115 |
- $(cmake-utils_use_with test TESTS) |
116 |
- $(cmake-utils_use_with zlib ZLIB) |
117 |
- ) |
118 |
- if [[ ${MY_LANGS} ]]; then |
119 |
- rm po/trojita_common_x-test.po |
120 |
- for x in po/*.po; do |
121 |
- mylang=${x#po/trojita_common_} |
122 |
- mylang=${mylang%.po} |
123 |
- use linguas_$mylang || rm $x |
124 |
- done |
125 |
- fi |
126 |
+src_prepare() { |
127 |
+ cmake-utils_src_prepare |
128 |
|
129 |
# the build system is taking a look at `git describe ... --dirty` and |
130 |
# gentoo's modifications to CMakeLists.txt break these |
131 |
sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check" |
132 |
+} |
133 |
+ |
134 |
+src_configure() { |
135 |
+ local mycmakeargs=( |
136 |
+ -DWITH_DBUS=$(usex dbus) |
137 |
+ -DWITH_QTKEYCHAINPLUGIN=$(usex password) |
138 |
+ -DWITH_TESTS=$(usex test) |
139 |
+ -DWITH_ZLIB=$(usex zlib) |
140 |
+ ) |
141 |
|
142 |
cmake-utils_src_configure |
143 |
} |
144 |
|
145 |
src_test() { |
146 |
- VIRTUALX_COMMAND=cmake-utils_src_test virtualmake |
147 |
+ virtx cmake-utils_src_test |
148 |
+} |
149 |
+ |
150 |
+pkg_preinst() { |
151 |
+ gnome2_icon_savelist |
152 |
+} |
153 |
+ |
154 |
+pkg_postinst() { |
155 |
+ fdo-mime_desktop_database_update |
156 |
+ gnome2_icon_cache_update |
157 |
+} |
158 |
+ |
159 |
+pkg_postrm() { |
160 |
+ fdo-mime_desktop_database_update |
161 |
+ gnome2_icon_cache_update |
162 |
} |