Version bump wrt bug #541286.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 98 insertions, 3 deletions

diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog
index 968822618c35..aaae4c6e58e2 100644
--- a/mail-client/trojita/ChangeLog
+++ b/mail-client/trojita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/trojita
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.38 2015/03/04 11:05:42 kensington Exp $
+
+*trojita-0.5 (04 Mar 2015)
+
+  04 Mar 2015; Michael Palimaka <kensington@gentoo.org> +trojita-0.5.ebuild,
+  trojita-9999.ebuild:
+  Version bump wrt bug #541286.
 
   29 Jan 2015; Michael Palimaka <kensington@gentoo.org> trojita-9999.ebuild:
   Add Qt 5 support by Andreas Sturmlechner <andreas.sturmlechner@gmail.com> wrt
diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild
new file mode 100644
index 000000000000..224cd59357e3
--- /dev/null
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -0,0 +1,89 @@
+# 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-0.5.ebuild,v 1.1 2015/03/04 11:05:42 kensington Exp $
+
+EAPI=5
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	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"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +password qt5 test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	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? (
+		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
+	)
+"
+
+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)
+	)
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 268ddb32aae4..a8e464f8d11b 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.25 2015/01/29 15:22:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.26 2015/03/04 11:05:42 kensington Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~x86"
-	MY_LANGS="bs cs da de el es et fr ga gl hu ia it lt mr nb nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+	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"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"