Version bump wrt bug #541286.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog
index 968822618c35bfca52c137162e4070cb91765b25..aaae4c6e58e2da30d8c90c7967bb5a91ecbedd12 100644 (file)
--- 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/Manifest b/mail-client/trojita/Manifest
index 4d62dd10e2e20862a5a3fded2f0282b34d6eba2c..99e863f5fd9441b55e473bafde0692a3a2505505 100644 (file)
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a WHIRLPOOL 47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
+DIST trojita-0.5.tar.bz2 1421368 SHA256 21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904 WHIRLPOOL 59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
 EBUILD trojita-0.4.1.ebuild 1765 SHA256 e5368212cd1731095ba98402e828d90929d5dee8911bf5cb7cba2488fa03ab66 SHA512 2c0c1193ae9a39667bf555c0fb619d1904f674d45758edc6ffee927fb19c0342969697df2af65f78d26d0b4de281e396b177a93d11b3cb0eb85ae0a8157b68f7 WHIRLPOOL b639e28e575345b126edf307e6299f063e9697a57cb34bd1fa19482813fa29ee19ff69b69ee6371534c217ba3e503e13aa3ee5ae7b611bbc2aa1a1382571ee4d
-EBUILD trojita-9999.ebuild 2160 SHA256 a0a09ac54dc7114ac042ac133783a325e0a1c3ee3dc49cb48f675317decb3df9 SHA512 eb9b439a63c9454b0facea2eddb76371a67b266aa9a00d7afc72b42821182c9053e41ad110381ff728ecd672a368e1c90ae171036ebf168ec2f18032a58424bb WHIRLPOOL 1ef1551ee8c156ee7474469e64978a87cae3d176b68622b5a933858e51a54f254958710e5a714e1ee99ccf88bcd75c0cba8a152f630f68cf40e5fa37e11b2535
-MISC ChangeLog 6257 SHA256 172a78b609110ac19f78c6825d35469d62383ae1b59af2e4be984f3de376f086 SHA512 485965d2af362a88bc925774635c161c42d5ddbb0d78b3f14958f0da235a6b1fbfe58217c8e57d33701690fee32a57ea7375cfd2e16035982b442af8d640ca7d WHIRLPOOL 453e6e2cc5189140945c8ccbb60ec292e91bb64b2697f3a2f70ffff5bedc12fcdc0c192f4aeff53e0d55c5a96547702f1bbace02c76bf36c642af41b9dd0f0eb
+EBUILD trojita-0.5.ebuild 2175 SHA256 48de3a22f6459784cff3373f00aef9dcc704a2b6286edf49b387f6ea18853783 SHA512 c84225758a9f2ee88a78607f4622a838467c515f0f816d16456fb56c404d97fb80af03daa1df78338af0ff26bd2d8e7081c648d246ef882152f78382df987e8f WHIRLPOOL b0810162db25aee759bee3eaff0d8e11fdddb29861cc3fe6b5ff9a27f25fbf13ffbedbd254949759d3d55e7bc76d44d2e1a14b9cd9747fe2514070799afa5996
+EBUILD trojita-9999.ebuild 2182 SHA256 8bc53c705acc3b0c107376b96fc3c52c1462a4561056737c3cb033d8a6aebea4 SHA512 c3d0e572655c4cc70205ad295e6440537f9756d7beb7cb9d18366633b55d271beefcbcfe2530df05d68f2e80e56d01d8b44074db42e264b423a36cdf312f30c8 WHIRLPOOL 6c2fd7f8f13c1f772efa6b75d9fa31130cee4ffc6e5d62262fbd8b879c986682bfb1b67d34d1140ca826532005175dba230cf4513d623ae2d755870a39058f2e
+MISC ChangeLog 6418 SHA256 56c38e4b8cde5a3e19204e91d4af692cda3b8a627a89d20c90578118c760396d SHA512 2e0892f84ac6bf9630253407a1085f884c379d4500aaca3f8eebe26e21025dd37ee60e94ebb5fbf8511ee84252485bdfadbfb6779fccd56cc5dc5bfe0f5be1ad WHIRLPOOL 86ba786003eb9331da737fd936daedeb16f1c18054a06b8688b4e69c710a3b241236c5625fb58df400f5ceb903e9ef3495fe974289f82a0bc4f2403d47fa7549
 MISC metadata.xml 369 SHA256 0689cc38110dd3d17c3cbc9ff5ac41d78ae6481bd6da18e4c9a76b49bea71829 SHA512 39f146f6fe07b877b5b445e20cebbb2612f78931dbd3f6e6bea16ea95373574c94ae0d68ed744d6a20d1c29121baf34dd7bcc31551e23ac200e5e61f22e43d2c WHIRLPOOL dc733cd718f8e56347a1926ca6bc1f2acb568a9184fd4f1cf3c10e5b33a7eeb6d74a6f8210c2683b876779013ea05a49c6de213bf73718f3c5a8339793c436cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUylAuRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJU9ucFRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7MlnD/94a7bx3766po665YxW0hT7PAGx3m7HuUuDkxoZo2JXnjWtnQ84HZ6HvLpe
-mf6pzSZgovxdjugwlEF7oKClkinYnDjrWdm+agr1AsNQeUmhjvC5MM7Y1AAFI9DN
-Kjlhtd39kogK4jUHtumw3G/pHPslkLUxps3c5TyA+1y6pp3t1keOnU0fJgrxXaEW
-gVEXGorgkjt/MS0uY7eHDgn+HsI4nzrTMS4iRrAyZFiEbWrkJcxVMX7llaF4lm12
-RFQfd7lTEplRSAJzzcgP/ysQFyo/807djtJAlvUZ4JFz/oW8HBDPLZKmlixyDrhy
-RmbeI61GA/IjLwcJq8u87zXcFL8d73GZ6O9aLQ4DdicyiVlH1pQkPUSWV+wLUQoO
-GSdDDvN4FN6n16v12zOEuRMGPaKnk8bOtM/PKZq0LTa3aGw9jWo8cP8vUyP81AQv
-9ymTNnf6ZlULol2qKLpeAuZ3q37OAOO1QZ6W7QUYyWxSkZAaFlg6w+mpaBZHsfLy
-t1zxTe7Ep5p3BvCP1LfwMzFB7MJnObU/cAMxiUXjbKv2fROqzU6UJOHd6rHgu9Rt
-Q7XTPi/cpEzgbXMGKE0TKR1Po2hKiVqnXZdd08rGykBcVuXpXDNnny3yTyTgdNUy
-vrMou2xM4JKHWWZSZqgQRlUnuESnXlA/wFNU2k2iLUPP6OrFOA==
-=krxy
+7BfJD/9Uf2mDFUIykaEuPG4SF5UIvPDEbn0Q5frKlaZrV6O36RaG63dZQyu9sc+0
+Btxri+hNJs1jaipjl4BKfoWXugIYOiep7Cq5tVHMMWInfeMuzboOqGHjQH6QTP+5
+N1oNXnlLHpJ7bXwXIKuGx2hrENOTWDcVudLa+K0iEORAn+6cw2aW4ygLVl7cp5IG
+PNhohjHb6fW4Y9s5TXgKKE++JiAWLbupKFyw9cU01vG4L+ydwybheSUb3D8b5+8p
+4ajdCPw/wL6FNO8eeaFfxEkFyB1sG7Tix1WpmzRoflFZ8aykDSlNg9aM8+5+/CvQ
+SErtzwu9623dqL4ob4d1qyOm3LRKxBhEc9UCvdFXvKJtCaqTIzl/TGdmFmB7vR/1
+QMWqQIQbVdyhq0sNvVE3t11jQ6925i5I/mmdK0hxuke6Lku+tc+w7eNIVe/gM2t1
+3/Ovfqk+2s4y/HPV6WPae0Q88O/iCzF/v6A2isxcslheJlJMzZCMqEoy2nYyX5cW
+FdPV59jkDREAfIfwww9LZI1/rmVZ8nsXpBJfmvdcEwfTQnxV8Yo6L17XKky7Xb9T
+QtCoJ/aiO1bLiqOdYox5cknpuYn8+oY+9jokQBJSei6ZsL404LRpfo42pByv3m06
+pAPJ92EO3q8c1yCgvCnkCQltC0y3o2GQ/KWUXZVcUASV6CZYZA==
+=LY8+
 -----END PGP SIGNATURE-----

diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild
new file mode 100644 (file)
index 0000000..224cd59
--- /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 268ddb32aae4ad8f15a8774a50f7d4e5f99c112c..a8e464f8d11b18fd704a78216286c52e85882741 100644 (file)
--- 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 )"