| 1 |
kensington 15/01/29 15:22:13 |
| 2 |
|
| 3 |
Modified: trojita-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@×××××.com> wrt bug #533600. |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.25 mail-client/trojita/trojita-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.25&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?rev=1.25&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/trojita-9999.ebuild?r1=1.24&r2=1.25 |
| 15 |
|
| 16 |
Index: trojita-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v |
| 19 |
retrieving revision 1.24 |
| 20 |
retrieving revision 1.25 |
| 21 |
diff -u -r1.24 -r1.25 |
| 22 |
--- trojita-9999.ebuild 29 Apr 2014 16:44:18 -0000 1.24 |
| 23 |
+++ trojita-9999.ebuild 29 Jan 2015 15:22:13 -0000 1.25 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.24 2014/04/29 16:44:18 johu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.25 2015/01/29 15:22:13 kensington Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
-QT_REQUIRED="4.8.0" |
| 34 |
+QT4_REQUIRED="4.8.0" |
| 35 |
EGIT_REPO_URI="git://anongit.kde.org/${PN}.git" |
| 36 |
[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2" |
| 37 |
|
| 38 |
@@ -23,20 +23,36 @@ |
| 39 |
|
| 40 |
LICENSE="|| ( GPL-2 GPL-3 )" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="debug +password test +zlib" |
| 43 |
+IUSE="debug +password qt5 test +zlib" |
| 44 |
for MY_LANG in ${MY_LANGS} ; do |
| 45 |
IUSE="${IUSE} linguas_${MY_LANG}" |
| 46 |
done |
| 47 |
|
| 48 |
RDEPEND=" |
| 49 |
- >=dev-qt/qtbearer-${QT_REQUIRED}:4 |
| 50 |
- >=dev-qt/qtgui-${QT_REQUIRED}:4 |
| 51 |
- >=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite] |
| 52 |
- >=dev-qt/qtwebkit-${QT_REQUIRED}:4 |
| 53 |
+ qt5? ( |
| 54 |
+ dev-qt/linguist-tools:5 |
| 55 |
+ dev-qt/qtgui:5 |
| 56 |
+ dev-qt/qtnetwork:5 |
| 57 |
+ dev-qt/qtsql:5[sqlite] |
| 58 |
+ dev-qt/qtwebkit:5 |
| 59 |
+ dev-qt/qtwidgets:5 |
| 60 |
+ ) |
| 61 |
+ !qt5? ( |
| 62 |
+ >=dev-qt/qtbearer-${QT4_REQUIRED}:4 |
| 63 |
+ >=dev-qt/qtgui-${QT4_REQUIRED}:4 |
| 64 |
+ >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite] |
| 65 |
+ >=dev-qt/qtwebkit-${QT4_REQUIRED}:4 |
| 66 |
+ ) |
| 67 |
" |
| 68 |
DEPEND="${RDEPEND} |
| 69 |
- password? ( dev-libs/qtkeychain[qt4] ) |
| 70 |
- test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 ) |
| 71 |
+ password? ( |
| 72 |
+ qt5? ( dev-libs/qtkeychain[qt5] ) |
| 73 |
+ !qt5? ( dev-libs/qtkeychain[qt4] ) |
| 74 |
+ ) |
| 75 |
+ test? ( |
| 76 |
+ qt5? ( dev-qt/qttest:5 ) |
| 77 |
+ !qt5? ( >=dev-qt/qttest-${QT4_REQUIRED}:4 ) |
| 78 |
+ ) |
| 79 |
zlib? ( |
| 80 |
virtual/pkgconfig |
| 81 |
sys-libs/zlib |
| 82 |
@@ -47,6 +63,7 @@ |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
local mycmakeargs=( |
| 86 |
+ $(cmake-utils_use_with qt5 QT5) |
| 87 |
$(cmake-utils_use_with password QTKEYCHAIN_PLUGIN) |
| 88 |
$(cmake-utils_use_with test TESTS) |
| 89 |
$(cmake-utils_use_with zlib ZLIB) |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.37 mail-client/trojita/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.37&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?rev=1.37&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/trojita/ChangeLog?r1=1.36&r2=1.37 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v |
| 102 |
retrieving revision 1.36 |
| 103 |
retrieving revision 1.37 |
| 104 |
diff -u -r1.36 -r1.37 |
| 105 |
--- ChangeLog 14 Jun 2014 10:34:50 -0000 1.36 |
| 106 |
+++ ChangeLog 29 Jan 2015 15:22:13 -0000 1.37 |
| 107 |
@@ -1,6 +1,10 @@ |
| 108 |
# ChangeLog for mail-client/trojita |
| 109 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.36 2014/06/14 10:34:50 phajdan.jr Exp $ |
| 111 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.37 2015/01/29 15:22:13 kensington Exp $ |
| 113 |
+ |
| 114 |
+ 29 Jan 2015; Michael Palimaka <kensington@g.o> trojita-9999.ebuild: |
| 115 |
+ Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@×××××.com> wrt |
| 116 |
+ bug #533600. |
| 117 |
|
| 118 |
14 Jun 2014; Pawel Hajdan jr <phajdan.jr@g.o> trojita-0.4.1.ebuild: |
| 119 |
x86 stable wrt bug #508776 |
Archives