diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-01-29 15:22:13 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-01-29 15:22:13 +0000 |
| commit | f0f87fc8816bc532529a20013be387e82a365d59 (patch) | |
| tree | 9afc35b09fd573dae70cfb49be0f68ff49ce0f7c /mail-client | |
| parent | Apply rst2man related fixes. Fallback from sphinx to rst2man was ending up (diff) | |
| download | gentoo-2-f0f87fc8816bc532529a20013be387e82a365d59.tar.gz gentoo-2-f0f87fc8816bc532529a20013be387e82a365d59.tar.bz2 gentoo-2-f0f87fc8816bc532529a20013be387e82a365d59.zip | |
Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@gmail.com> wrt bug #533600.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/trojita/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-client/trojita/trojita-9999.ebuild | 37 |
2 files changed, 33 insertions, 12 deletions
diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog index c5ec1f2c0bb6..968822618c35 100644 --- a/mail-client/trojita/ChangeLog +++ b/mail-client/trojita/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/trojita -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.36 2014/06/14 10:34:50 phajdan.jr Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.37 2015/01/29 15:22:13 kensington Exp $ + + 29 Jan 2015; Michael Palimaka <kensington@gentoo.org> trojita-9999.ebuild: + Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@gmail.com> wrt + bug #533600. 14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> trojita-0.4.1.ebuild: x86 stable wrt bug #508776 diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild index edda723fbc40..268ddb32aae4 100644 --- a/mail-client/trojita/trojita-9999.ebuild +++ b/mail-client/trojita/trojita-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.24 2014/04/29 16:44:18 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.25 2015/01/29 15:22:13 kensington Exp $ EAPI=5 -QT_REQUIRED="4.8.0" +QT4_REQUIRED="4.8.0" EGIT_REPO_URI="git://anongit.kde.org/${PN}.git" [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2" @@ -23,20 +23,36 @@ fi LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -IUSE="debug +password test +zlib" +IUSE="debug +password qt5 test +zlib" for MY_LANG in ${MY_LANGS} ; do IUSE="${IUSE} linguas_${MY_LANG}" done RDEPEND=" - >=dev-qt/qtbearer-${QT_REQUIRED}:4 - >=dev-qt/qtgui-${QT_REQUIRED}:4 - >=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite] - >=dev-qt/qtwebkit-${QT_REQUIRED}:4 + qt5? ( + dev-qt/linguist-tools:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + ) + !qt5? ( + >=dev-qt/qtbearer-${QT4_REQUIRED}:4 + >=dev-qt/qtgui-${QT4_REQUIRED}:4 + >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite] + >=dev-qt/qtwebkit-${QT4_REQUIRED}:4 + ) " DEPEND="${RDEPEND} - password? ( dev-libs/qtkeychain[qt4] ) - test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 ) + password? ( + qt5? ( dev-libs/qtkeychain[qt5] ) + !qt5? ( dev-libs/qtkeychain[qt4] ) + ) + test? ( + qt5? ( dev-qt/qttest:5 ) + !qt5? ( >=dev-qt/qttest-${QT4_REQUIRED}:4 ) + ) zlib? ( virtual/pkgconfig sys-libs/zlib @@ -47,6 +63,7 @@ DOCS="README LICENSE" src_configure() { local mycmakeargs=( + $(cmake-utils_use_with qt5 QT5) $(cmake-utils_use_with password QTKEYCHAIN_PLUGIN) $(cmake-utils_use_with test TESTS) $(cmake-utils_use_with zlib ZLIB) |