Restore crypt + kde for qt5 build.

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 8a838474dbe218297e756332a72dea04014bd77a..eadd86551f57c3829592eab7c7d67237a22e2f90 100644 (file)
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.186 2015/02/02 02:52:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.187 2015/02/11 21:14:37 johu Exp $
+
+  11 Feb 2015; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild:
+  Restore crypt + kde for qt5 build.
 
   02 Feb 2015; Patrick Lauer <patrick@gentoo.org> files/quasselcore.conf:
   Fix typo in quasselcore.conf #538240

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f632046f7ec55e766f18b552416db07a3715288c..4f3008f9a7eb8e712ff6476c0ef4a9287d2b596b 100644 (file)
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX missing-bsd-includes.patch 1138 SHA256 0e63c51f5816c266b027c88952d4901d25ba250b1934bbb2e966727ac76b6537 SHA512 8e4f32af8ccc57b053bd6133e3a37944605fe4d17879bf151afe1d6d9102c89747a20b63c00ff683573f2df6a41684d49463d3ef69b57f23eb1d1295bfbdd34e WHIRLPOOL ff53c5418e4fd276881c6ed3bb5abb6554e13fd7f7f814cbe98b66477f02651350103cd225f7078ad42280dd7d0672493eb6574806e4c0cf661206a623705d4a
 AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
 AUX quasselcore.conf 721 SHA256 fc6960a3b17f00eec09530b1ba797056abd2cde0900dce4bd3aeb06c535c6fc8 SHA512 15abd15f7008d58771dd37d59de0121b8920070596ca9f1bca73d84052f4ac1629b1ee0eb9da303bfff02ad4130e6ded27c0f316a0a0e5209987d9c62f155b9d WHIRLPOOL f28abb1ddf48cd260820e42081e5c6eb8ffb9cc580e43ab3a68b6248fe1c83102e08e2a34c876d2aca5c405b6b46182cf3934684f7627c50ab89671c88a52a97
@@ -13,6 +16,23 @@ EBUILD quassel-0.10.1.ebuild 5040 SHA256 6fc15042184ca2c42fb804f07159b8fadb66186
 EBUILD quassel-0.11.0.ebuild 5672 SHA256 453b7d1b5f1e24a210d6de90e95f1111699d532223480e994cbd598d4f97e966 SHA512 cec003ca353242479add16c54f9f3d7045bf6118c64497a85aac1295f17b5ca67fe64186fa0ce86886cecfae58211a808f087af3e866e4cb579df9cd69aadb2e WHIRLPOOL 3a5451b41385664af130e2153c5b00b228e7724310bfcc2182ac22093b21d4f495fd12d52fae0d341f52e99793d9131b60ff79652485734bb503479c3db5291f
 EBUILD quassel-0.9.2.ebuild 5264 SHA256 f5ee8089a04ad593b9730596632e2dd53e6d6998b4b071ffb2da8bd00806ddd0 SHA512 7e54f8987561bf564bfe2513b7f524624c5bb0e344e735153d9f63faed932bb233098a224692e8cf39955006a8f4b31a01846de3d6c27acdc23c3d279208074a WHIRLPOOL e82f0fef87e47fdfc889a88699b025d7954186ad61a9bc36e31558703dae94c6741cbc3bb99697e6d7f06ff46a2d54aa6250722bb1338cdb9e730e0c87f5ee05
 EBUILD quassel-0.9.3.ebuild 5170 SHA256 8525c3215fc309260803fb9655ad7da5fe5e7b5844bdf7b744cac8589bb661d8 SHA512 9301ea3cf0daec33d39198733ddd9a7be3877f527920d5b9b67af45d722e12a2de822ba2b073a6fd0ce21908d6626760cbaa8c6c2a8ea7303da7d586ffbaaed1 WHIRLPOOL ab214c083cf16ac1dae733f88e4d967bf2983e2525d7984c96a17423aea968cb284ae674aa4303a0ca1bd47f97e046abaa360741f1a343b6f6ece318c2b5d7f8
-EBUILD quassel-9999.ebuild 5615 SHA256 0c3edf71d5a02fc27a203d568178638437accaaed9f495bcb7bfc168121099ce SHA512 bcd79b7d21bc3269f713c1646870e9a1d6750bb172ab31408ee32fc32a2b99640d62866c24e8ffa2c003420c61053bd2671fe1eb3bcdf66d1bf62eb3d2bea55d WHIRLPOOL cec088ea1a7b009d0ab33dcdcfe4b69fb410d7e2e794c613b958b4f450690904112c813502c5ae8bd7d6bd31f635a5ce3bbc39ab0b270aeaf17fb617d58cf857
-MISC ChangeLog 29210 SHA256 2db13cfd81158d6b02d59c5badde8d7da3964c0cac7179f950cf7d3faa78faf2 SHA512 e88e04d645ba9cc1acca0617a6a844899b3d643eacf5e799b922e59c5b8381c8a5e7364280f2a36cd4b3ff0c20ed974d19e53525ff77a6f4f9b35ca50868fe91 WHIRLPOOL c1c4de33eb0738bd92d2c5c2fffff647fe3c890ad5dd76b36e433e57f5b2e342e59127a81cd3a935169b93fc5cd3a61a85a7ae92e2ad06119dadd1df50edac54
+EBUILD quassel-9999.ebuild 5896 SHA256 17a6ea2c4681f13999d6ec0ec51e310c82585ad844997c9c4b3ae37431a53d88 SHA512 716300fd86b36a3a163b6fe5d54c7e53f488067345217597883a126f0476c536aeb9493dfccd138fa5e5d787bbd2ceb00bbc1ca8df4736b598252ec33d5da773 WHIRLPOOL 7f2cd2ce281f6484bb6c755af97221bf5e2cc57a65f45b84fc16e7bfb724824c93f212074d548a02106fc40de006ac0ef20978caeccc356f97a3b98a50637b70
+MISC ChangeLog 29314 SHA256 c54f80154e2ba6bf41bdb1eabb801ef155a7ad94662f67025bdea5eca1f5a634 SHA512 3dfa4e46f8b6f335df47e9bd2350eb26d75ecad9c9310f0285f480985d4854df4c5ebd4d78d4ab131ba5ce52e15385237a7cde68519aaf7fd92608f597d1bca7 WHIRLPOOL 486a3c31f79d0ffca118dd153730b900b7395ff51c0751247fddabf17d1eb43852c0b04085f1a95995d513633613d85c67edf67992d1db73457bf4430b6b3f87
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJU28Y6AAoJEGVpnaTzz9K9XJcP/2x6m+XZEMKsTSRyT4eALBkR
+78/Stvn6vreZQ+J8aD0qhls0nHvJrhSGSw4aoO5rzydgHITso4/ilxoAGnIqMlvn
+v2y1UcTcWfxhcY4BDCTLH8pZcOHyVeqizWW/1Iyozo9L6D+69+o2aaRnuH50GryY
+pgzPuierRZLGQFuH4uqotnzAOoqTMjTGk5HHKs+nqUadsL9XzzVQDDRx7GhLbwT5
+Xo9fmB2BpiGwnmskJTMZ2YZxxZRU/0CyTNfHBuX0BF4q1fU6NGChKGQuDLA7wWSK
+oT1ucrHYzA4/Nq8kY2iiiUZn0OJYDfyJZ2v9WHg5Ke5tc6JeoQBHRZ0Z1KIv2Ogc
+tgvoNSbf92SJSdCfIgHzWGgp0oWukj2BZ3MN+WxqG0svgyEDqGnK6rJhBdMIe3ZM
+BChb+ZiM11L+1AJtieXUncsP8ArG51RXAJazz6Q1qaWP4auxTukjVP9rcXYVIR0M
+xv4K8bRh8KWZ2hf3u05wGnbXOp/GnqQpVdgWTtCTp4ifeeGn4Fn2ijv8iJi4fL9F
+E2vMzMHX9qIH07lu+vAAqqFQxAw0oKS4RBha6dntunToJYSiRjwIIBbuu2OspVuV
+Wm+1cpBmG58WBvFXQTz7EUvS1rHAvZeXR3Om8hdZ7hHuwwbojI0fOkLanS9/72/z
+E3/dKjaoRQordZ8FXohK
+=aDVO
+-----END PGP SIGNATURE-----

diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 12e1866f05057cdf105bd13db3c6486f2908c522..ea45a4652eb5ee2a0e7469fa7225cf89b2759277 100644 (file)
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-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/net-irc/quassel/quassel-9999.ebuild,v 1.76 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.77 2015/02/11 21:14:37 johu Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl s
 SERVER_RDEPEND="
        qt5? (
                dev-qt/qtscript:5
+               crypt? ( app-crypt/qca:2[openssl,qt5] )
                postgres? ( dev-qt/qtsql:5[postgres] )
                !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
        )
@@ -44,6 +45,13 @@ GUI_RDEPEND="
                        dev-libs/libdbusmenu-qt[qt5]
                        dev-qt/qtdbus:5
                )
+               kde? (
+                       kde-frameworks/kconfigwidgets:5
+                       kde-frameworks/kcoreaddons:5
+                       kde-frameworks/ktextwidgets:5
+                       kde-frameworks/kxmlgui:5
+                       kde-frameworks/sonnet:5
+               )
                phonon? ( media-libs/phonon[qt5] )
                webkit? ( dev-qt/qtwebkit:5 )
        )
@@ -81,7 +89,10 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       qt5? ( dev-qt/linguist-tools:5 )
+       qt5? (
+               dev-libs/extra-cmake-modules
+               dev-qt/linguist-tools:5
+       )
 "
 
 DOCS=( AUTHORS ChangeLog README )
@@ -96,7 +107,7 @@ REQUIRED_USE="
        kde? ( || ( X monolithic ) )
        phonon? ( || ( X monolithic ) )
        postgres? ( || ( server monolithic ) )
-       qt5? ( !ayatana !crypt !kde phonon )
+       qt5? ( !ayatana phonon )
        syslog? ( || ( server monolithic ) )
        webkit? ( || ( X monolithic ) )
 "
@@ -115,6 +126,7 @@ src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package ayatana IndicateQt)
                $(cmake-utils_use_find_package crypt QCA2)
+               $(cmake-utils_use_find_package crypt QCA2-QT5)
                $(cmake-utils_use_find_package dbus dbusmenu-qt)
                $(cmake-utils_use_find_package dbus dbusmenu-qt5)
                $(cmake-utils_use_with kde)