Version bump to 0.3.96, change the buildsystem to cmake, wrt bug #486588

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

4 files changed, 96 insertions, 20 deletions

diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog
index e6a4463e7482..95dca7da3e96 100644
--- a/mail-client/trojita/ChangeLog
+++ b/mail-client/trojita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/trojita
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.26 2013/06/20 13:13:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.27 2013/09/30 17:04:13 ago Exp $
+
+*trojita-0.3.96 (30 Sep 2013)
+
+  30 Sep 2013; Agostino Sarubbo <ago@gentoo.org> +trojita-0.3.96.ebuild,
+  trojita-9999.ebuild:
+  Version bump to 0.3.96, change the buildsystem to cmake, wrt bug #486588
 
   20 Jun 2013; Agostino Sarubbo <ago@gentoo.org> trojita-9999.ebuild:
   Port the 9999 ebuil to cmake, wrt to bug #473930
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 7c7e9fc2dfc3..253132867fe2 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -2,24 +2,26 @@
 Hash: SHA512
 
 DIST trojita-0.3.93.tar.bz2 966396 SHA256 625bf7fded3f00a45f6f4eafe504fa3e20e237632072f7e47949d0a1339274e4 SHA512 1b677d9a0ae6c82f714352e0d3751f9600c1420223c2e4996a6ce84de95cac9832265de2a8794cfd1fa1cb97f63a8f86c412174afcd1833623900729fcb612f9 WHIRLPOOL dafc27990efd1417e3368f2244213d9210753ecbf70dadf1044eb662e90b9a19ecefb0c88432761ab4fc2c7bd547c221f534e80f22bfa4af729083d156df4b4e
+DIST trojita-0.3.96.tar.bz2 1068542 SHA256 f085dba2a33eed61282bdde05b0151138fbc820a7bfe4655758e1d63f31af7f1 SHA512 cf0b40a11fb33d1593293f1ec49fd47715283fe84d0f53ed0361e2e646c144b4ee74d7962d51bf1cfd684f41b59d56856bb78423984311742031dbd165100f75 WHIRLPOOL ca890b11c2ba0c9cd49ceab12c49ac1ace920c65ffe406779ee9dba75c4fb34ed95fbf80af9a5640f7e58d7457d6a9da4294ea2d44f2d1145cdd3cfe4765273a
 EBUILD trojita-0.3.93.ebuild 1494 SHA256 5a0090f1a3a99c1dfedb84c39de550ecfa1a1da5f162c2e6163ea36bf4409ee0 SHA512 d85d624d6e33ae7dc0f6591f462f76dcdc46ba0a1cc21b41182d507ee730067fd8e597b2547abc5050cd949e4b68cc6208dab7deb0dbdeb2253db9febc735dcd WHIRLPOOL 41d0c1256dc3338b2a2ae22c033f1ba662513ebb2b1f501b5382ac776ec84f00c5fc8d811ed39c1245a23f673c7bae2d84ff58bacee8927d98c1e14b12f675df
-EBUILD trojita-9999.ebuild 1717 SHA256 69f11ca5ff8c8f03a2fd8be8781fb6560dd2dffaf1168f78419a453e75367ffc SHA512 4c1bc178298128cea44c50d5e4ff7fa3dcff5e628fcb827c230c356539ce9999398b24b4d8600e3a9fe91b2b1409be417872896a74667229b452562245e6b5ae WHIRLPOOL 22a77782d00e58d92e514955f2fdb7092f983c7b73af504fc6b019ee4665cb93846b2881a56ff46f3040aeb02e7aaa90fdf20df109491cf41f187b9652eadac9
-MISC ChangeLog 4278 SHA256 ad6d2d388d71fa98cea7d7bbef084cced7ceadc7a2cb7d9551a12fd85229c0ab SHA512 8b9603116e190281fa8baa80877de338ec9753bdbf59bdae4deccda839279b51b25aa93c8351e42c28d776d9ae5cbff3faa8e40c002cc50e5e3a9baa069e5356 WHIRLPOOL 25a9a38e26d7b7397413a69d908d1c5c9446e2795a849ffe082c42812d879fc2d971defe26b9b4a9cf4f12cae88652b071561bf84bd7b52d31328b27936e80da
+EBUILD trojita-0.3.96.ebuild 1766 SHA256 5c70dc87051a3d180140c47848af4c40323772f6bf23467a7f0febf2373587e1 SHA512 10aa3e9dd4aeebb7906c2f7d60c3df100c517ec57a222fb78c5da778c5ac74666f1660a2bcb2d1c6188bdfd96a5205b43654356a3ef38bbaacd77654351103be WHIRLPOOL 65db9f5099147f8f2ffad059d487ed0d9e5f053a178afab89a8d86fb5375f48958859e74326aabab759ba70a1f48a8d169ef8780fbcb3a0214d09a4d7d838223
+EBUILD trojita-9999.ebuild 1765 SHA256 b2d5d2429787028416897ccfde1af89f83d66021d3360e9c7ac6d6d3dc683067 SHA512 f3d80be5ac866b38ae98ecfcacc364d6e0594d9150b52e6133e3c3315d7e0c60fdd5d4a3375a1719e4b77f3a5ccadd82dbcc0218fcaf59f328c92a201b63b7dc WHIRLPOOL f0b57f7bf1c90fd4ea6e1bcafe1af28b5a922fb7177eba30f4c08b4a9529d403df76365dfdf167917b43412542bfacddc279e38c5e7ddd3fc8de074b75d6dd77
+MISC ChangeLog 4481 SHA256 04cda633e610f6d61074259d463fb5b9350395ca3676a693ba4f81278c470805 SHA512 d5e4d07fc50b411bfb1c72399f5d0f1e67c0d14c873353c3182dccc53e207f860de527c9fd83cab57e06c1ce3cd3feda3972a749f7b76a7c34db5bd1634d2b2c WHIRLPOOL 5471166314c46bae52ef1e19bd170a2a5aaaa374b3dd4afc16fb6faded4c1d7aeefba7eaae7f932959cfec5846f76895ba6a536a45f154e859af6038cc2a194a
 MISC metadata.xml 257 SHA256 a2f4f0fc5d3c9a2d36dbeb6653969f3499f66b864f4c784b3a2922f8223be1b5 SHA512 dbdd0e936a704d17b913046c28b19217b33c667d0d201f06d63188d849f47b376458e9ee2063f6240f7b762e25647e52c0364c0cd56536d678eb5372be6cc7bf WHIRLPOOL 2130b81f77f6a1e4f5220aec8f70b9d82e304f7b3a4805649548408a66a0266fb1b7b1c7f851690d4dd3b5c0a8d91e4065f634df83976607863ba19e363d6b54
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRwv/kAAoJELp701BxlEWfyy8P/04c3YZZ7brkJdmnG5+RFHGb
-ClzWOZd8bjhJ4f3vH32u+1q7DjICcp2aX4xUc6fUNSUVAaln5VIfdHZzlKTKm6qn
-oAwBVyyN1IGEOyg+5AagDZOXCtfIrSwZYKLBcZ51ay/ebLJhC0ogtPeXJPlZjPeL
-0PQi+RTHAbBfVN0vQtKx/5JxiJQ7QSKFrQBabZ3suf2zdkVp9HD8nKvGoEBDr9pr
-0HSCN4H5lZNeQWnfHgnDL/t56wiHgpAj9koGH2kLc/McnHQfyBVC75E6tZk4DZTh
-nKcLD8zCjh0ighdKxG6FLFLstpU4uBHLZOI5tjACyCDjdv2q0+KREu+q1+2mNA1B
-+WeVdGDCjvBGVQt+1A0YITGt2LLRuWb2I1qIM+f3REP7LqF4IlP3BSJMnGffZgvB
-Hatw+WygsMH8xHpopxI5S3l1v8jqaHCloTYSBlm7x+MwO0FCwai09coeDFzLVpuY
-zzD1YJql+rQp5zoWZYxKAjqhUJ2Kr/WONIxHAE3ETRBxUvah4/fkrcLMpzfld5/O
-JfB/wMeWIpYVcguzT4bSHxzg/ozp9dss5i1QKp0UmKe8sHUgH6ohoUFvMsl4ISBP
-sCOanwmAcVbBdwu3UQ+TqS/ZOEM/RV8HDv57ns7doaXjJqwnHPyAAajkzSjnfG7N
-ASpJ64D7rUaK+Y5WO9pd
-=jy7X
+iQIcBAEBCgAGBQJSSa8EAAoJELp701BxlEWfbzUQAMZQOu/K7g2izgaAcJd423zR
+3btKiR2ifH1JeRNykY/D3pH5PMmEpHskVLQLCWym9SZRU3JptfV4rW/44CGMSU0h
+Q7aYC9bJ+Lbk70TJvqQKpguKzJ9JPslzbZ1MnnskbWfgySb6p0jcUPbQMKYXalcY
+wGf1Ay085gVtu5SpzU4Ur5CftjP6bS8KVgkXECg84RNKck+qqkB456qSDPHN302u
+y2eYgTejCqxTFeiGwjw5Fyth3ad+Hxq+D7aLTQSRvPNXF5f2/BLE6GBBsBIX6j8x
+vaQnFQNEA0w6cVV2z9gh6qdGEdoFGKBmiX8gfGvNfpfYHqSR29H+nVxWKmAx6yu4
+V3Y3tn4Ua5Yjpppvt4FV2i54VouYqdwQObB25HLImww4eKCfopUnipxvmfvtJmE/
+M4CQ0iyo/Z9CwkRD2Rm4XaTB4rk3JlwN67XfMzBVepX4BdvH3rRPTZEw9BG988cr
+FOaRI/Ltaz/3MRbX4HvaGSajnrw3WZlbbSAe2ym68DUFSxiPj/Pvwn2bJBTF+8Ke
+hIY0pahgzudojxfcAS7+PMaPs1J+3n9a62jfj1Ik6gzhalATIf3o6d3CZyxWYVZD
+0QDUaTwb7ufkkK1RKgGfF/KTinBaQtFsmtaYpkmfWT9d80kWIS2CS3PJy8TP84Mq
+ru4A+RVT572cyfAHx4Z/
+=wUmM
 -----END PGP SIGNATURE-----
diff --git a/mail-client/trojita/trojita-0.3.96.ebuild b/mail-client/trojita/trojita-0.3.96.ebuild
new file mode 100644
index 000000000000..8e36052d655e
--- /dev/null
+++ b/mail-client/trojita/trojita-0.3.96.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.3.96.ebuild,v 1.1 2013/09/30 17:04:13 ago Exp $
+
+EAPI=5
+
+QT_REQUIRED="4.6.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit qt4-r2 virtualx cmake-utils ${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 ~ppc ~x86"
+	MY_LANGS="bs cs da de el es et fr ga gl hu ia lt mr 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 test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	>=dev-qt/qtgui-${QT_REQUIRED}:4
+	>=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite]
+	>=dev-qt/qtwebkit-${QT_REQUIRED}:4
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 )
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
+"
+
+DOCS="README LICENSE"
+
+src_configure() {
+	local mycmakeargs=""
+	use test || mycmakeargs="$mycmakeargs -DWITHOUT_TESTS=1"
+	use zlib || mycmakeargs="$mycmakeargs -DWITHOUT_ZLIB=1"
+	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 fdb2bc92f8ed..1da384e473d1 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.18 2013/06/20 13:13:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.19 2013/09/30 17:04:13 ago 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 lt mr nl pl pt pt_BR sk sv tr uk zh_CN zh_TW"
+	MY_LANGS="bs cs da de el es et fr ga gl hu ia lt mr nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -58,7 +58,7 @@ src_configure() {
 
 	# 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/GitVersion.cmake"
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
 
 	cmake-utils_src_configure
 }