From 2ce2eb54e9f9252aee40beaa6707e078553b4d38 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 29 Jan 2015 15:22:31 +0000 Subject: [PATCH] Add Qt 5 support by Andreas Sturmlechner wrt bug #533600. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC! --- mail-client/trojita/ChangeLog | 8 ++++-- mail-client/trojita/Manifest | 33 +++++++++++----------- mail-client/trojita/trojita-9999.ebuild | 37 ++++++++++++++++++------- 3 files changed, 50 insertions(+), 28 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 trojita-9999.ebuild: + Add Qt 5 support by Andreas Sturmlechner wrt + bug #533600. 14 Jun 2014; Pawel Hajdan jr trojita-0.4.1.ebuild: x86 stable wrt bug #508776 diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest index 748b66e2f4c2..4d62dd10e2e2 100644 --- a/mail-client/trojita/Manifest +++ b/mail-client/trojita/Manifest @@ -3,23 +3,24 @@ Hash: SHA256 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a WHIRLPOOL 47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0 EBUILD trojita-0.4.1.ebuild 1765 SHA256 e5368212cd1731095ba98402e828d90929d5dee8911bf5cb7cba2488fa03ab66 SHA512 2c0c1193ae9a39667bf555c0fb619d1904f674d45758edc6ffee927fb19c0342969697df2af65f78d26d0b4de281e396b177a93d11b3cb0eb85ae0a8157b68f7 WHIRLPOOL b639e28e575345b126edf307e6299f063e9697a57cb34bd1fa19482813fa29ee19ff69b69ee6371534c217ba3e503e13aa3ee5ae7b611bbc2aa1a1382571ee4d -EBUILD trojita-9999.ebuild 1864 SHA256 94073e2d830674b3a923bd5fb53a8dfc3009fee7035117ed537fc79e2a0a3fbe SHA512 be6ea0244a8f054c1e4f829b503ef447d09f66478d48bbc8aa299e477c9bd041ade7babadda67c2a0b535927bef1cc2c69476deaf6076f12ac47cb4a4f42067b WHIRLPOOL e150ade01c31105d51d453d542d95caa9bd0a024c71beb5249f718a08aa0b686b7867d128c95f188c9317b4a9c126ede2020fe8c879d1ab0f3f3b38ab9cbf0b6 -MISC ChangeLog 6084 SHA256 5b9ade5159d9bb06d455b9eb16c08c872656daa737d25fff7419db0089e5c36b SHA512 d936d28af638af4dffd40e77f9ca9a416ad9203f322fd5ef9133462e29c89ce96142f71fce19bd11207e6cdcebb3e68f34518e18c0a611ca70a3ad4b613b86f5 WHIRLPOOL 7ccd16a69a0743cd5c4853a78f429697d3310f72ff0d84c7e7577ecafcaf01cb32d0524787c25dfa81c8c2d424f07268977a791ae74b9c24bbf469f72e49a8a0 +EBUILD trojita-9999.ebuild 2160 SHA256 a0a09ac54dc7114ac042ac133783a325e0a1c3ee3dc49cb48f675317decb3df9 SHA512 eb9b439a63c9454b0facea2eddb76371a67b266aa9a00d7afc72b42821182c9053e41ad110381ff728ecd672a368e1c90ae171036ebf168ec2f18032a58424bb WHIRLPOOL 1ef1551ee8c156ee7474469e64978a87cae3d176b68622b5a933858e51a54f254958710e5a714e1ee99ccf88bcd75c0cba8a152f630f68cf40e5fa37e11b2535 +MISC ChangeLog 6257 SHA256 172a78b609110ac19f78c6825d35469d62383ae1b59af2e4be984f3de376f086 SHA512 485965d2af362a88bc925774635c161c42d5ddbb0d78b3f14958f0da235a6b1fbfe58217c8e57d33701690fee32a57ea7375cfd2e16035982b442af8d640ca7d WHIRLPOOL 453e6e2cc5189140945c8ccbb60ec292e91bb64b2697f3a2f70ffff5bedc12fcdc0c192f4aeff53e0d55c5a96547702f1bbace02c76bf36c642af41b9dd0f0eb MISC metadata.xml 369 SHA256 0689cc38110dd3d17c3cbc9ff5ac41d78ae6481bd6da18e4c9a76b49bea71829 SHA512 39f146f6fe07b877b5b445e20cebbb2612f78931dbd3f6e6bea16ea95373574c94ae0d68ed744d6a20d1c29121baf34dd7bcc31551e23ac200e5e61f22e43d2c WHIRLPOOL dc733cd718f8e56347a1926ca6bc1f2acb568a9184fd4f1cf3c10e5b33a7eeb6d74a6f8210c2683b876779013ea05a49c6de213bf73718f3c5a8339793c436cb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJTnCVLAAoJEE8aJVXqcZkdXYMQAJeCfkg9v/STpSZrv9rsoca7 -9BX+9M7wHoj2dTxHRlIH6vc7yMybz16/W9SpTWqGWJheHFUY3YIeBFcIt3k+xZxE -QZdd+SIZ8cFkbOW/sN+FhFxV/7LMP8aKGPK94KrnCubxpeKJeDNlbJq8Bi16PqrD -o7gX/layYxZHH+IsJe24ePuDlmUQgkvMiaPjm9bOd4E1ScowlKJW0FM/8BTwdpxF -7dFIeCJa++OM8BTEiiLzLqwDYMVkzHnZX8bhXY94wIM9/ZZ6T2L0D5Qhdz5UPYhL -zlD8W1ZoIo2FH6hZaSwFbLgrkFd0Yt2Q85Ban51+0GIiAUabnxf+pmxKiseT67Az -maS4eUEE3HTT2z3Kf2X2AnclBKxnaGhnRYDRAP1qkQCHEerFMsPgX6V/dOgOBpE5 -Yaq0zH4ZfG1MVQlB/FNvSbAz2I+GaMgak/VygXrHJhpUkAp+8MvlSNFINSUASz7p -fIBNQbLs5yzOIR7OQXVs0CQ5CBZ3ZhqPfHx496JFLbC4C2UfFkAdF2RdwQUg6Si+ -FfXvvB+e9be4qts3wxON7sPLad91sU3JbBCnbd7LtVgslyApDrHf7iv0LDe+DThz -TArc6imuvm3vyvncS2RwofHVrWpqRKtBPr4ZUZfgK42HpF0RMuMcSrSKwz4U0nuA -6UufkAJqiCcyt6Rsh6A1 -=EkX0 +iQJiBAEBCABMBQJUylAuRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +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 -----END PGP SIGNATURE----- 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) -- 2.26.2