Revision bump adds patch by Armin K <krejzi@email.com> fixes build with Qt 5.5.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDF4F788

5 files changed, 307 insertions, 20 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 817fb03d2720..1714f776bc92 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.210 2015/06/24 18:08:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.211 2015/06/25 18:21:51 johu Exp $
+
+*quassel-0.12.2-r1 (25 Jun 2015)
+
+  25 Jun 2015; Johannes Huber <johu@gentoo.org>
+  +files/quassel-0.12.2-qt55.patch, +quassel-0.12.2-r1.ebuild,
+  quassel-9999.ebuild:
+  Revision bump adds patch by Armin K <krejzi@email.com> fixes build with Qt
+  5.5.
 
   24 Jun 2015; Johannes Huber <johu@gentoo.org> -files/DOS-sec.patch,
   -quassel-0.10.0-r1.ebuild, -quassel-0.11.1.ebuild:
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 6db36414dfe1..ce919b2b0cd4 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX quassel-0.12.2-qt55.patch 1596 SHA256 a92914a26fe3f6601da7cfd26fb6a6fe6a0ba6c0bd91ac9416765974127365f6 SHA512 0fa94aee25d76785b9b80a242e1ef55c7489b312818817fef1c1ab8496eaae7d6783c1ebff3400e60277d9ecaa80d91733527e12e71958982857cad0f2cd3018 WHIRLPOOL fca3938a0b9d2bec21a061e1961ee0bd23f8bf70b2a36a933519cb1f3da58d93bb7210a782eb497af3c57f6d84d4547b049caa19665f57a5fbd5592eaf0a23e6
 AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
 AUX quasselcore.conf 721 SHA256 fc6960a3b17f00eec09530b1ba797056abd2cde0900dce4bd3aeb06c535c6fc8 SHA512 15abd15f7008d58771dd37d59de0121b8920070596ca9f1bca73d84052f4ac1629b1ee0eb9da303bfff02ad4130e6ded27c0f316a0a0e5209987d9c62f155b9d WHIRLPOOL f28abb1ddf48cd260820e42081e5c6eb8ffb9cc580e43ab3a68b6248fe1c83102e08e2a34c876d2aca5c405b6b46182cf3934684f7627c50ab89671c88a52a97
 AUX quasselcore.init 1857 SHA256 af041a6c800ffb443d008b861c639bf32580b3655f7db3bc00db833374af6b2e SHA512 0405af90fe65589e163d6b2470ea4d4d3b8dad49ee3b89caba9bcffd7186bd92f204da4f8404e5ed489a949fc89b898f0b94c94c8382f90f89ccda5e2b8e2382 WHIRLPOOL 7fefa3e977f5edce047c8f928e52b3dfc702a151930a92365be7d9eb0e88adffa924164e080bf8170dfb4a95c357cb9b059394d3854464f93d58f577ecea41de
 AUX quasselcore.service 189 SHA256 33c71f621f69f2eb6a5c613b979238c085a1e1aef3ee162011341c1a26821dae SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776 WHIRLPOOL 97e88e0581d064305390a7e093bc550f1fcad9a782ca7d7bae941aa56d9f6fbd72a98d67c0d85b3cf6f17d282ddc76e4c61ddc83a2ee14079b4643f8b29cb5fd
 DIST quassel-0.12.2.tar.bz2 3681838 SHA256 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897 SHA512 0c907982af0ba11af6ba5d075850149dc4d4df0c759a736dfaccdc01778958bd9b0137515c2d78a72a1b5aef6600cea47505de6ee905d83a51cf4e67d132911d WHIRLPOOL 947c47ab6a5db73fdda7d5e5fc3f618030e9c2cfd78f4f423b32332e6514b5c3b8d24423a6be8ee8bf81e2e4a973aa29578e776dba5e8f7ad947acbcb7aef497
+EBUILD quassel-0.12.2-r1.ebuild 6099 SHA256 85d516befa5372c5836edaede1ae8befc22623aaea591da55718352f279956a5 SHA512 fe6e9bc301daaf24f522c796a5c5a5129194fdde6091673d68fdfc440653a127f855b56159036427990054650179f5f2be10dc73db06fb1b97b9a9c1bfd23d6a WHIRLPOOL 9f61a7df0f66c4f89f83b323ff987a9d863359f3c3be94d84ce84ceb7c9a78846d01879e1c52fe2fb32d17e115314e33b5c2cd8d7e00b79eea5fe9c2f354677d
 EBUILD quassel-0.12.2.ebuild 5882 SHA256 309fce02f95c5daed4ed69a52ffe16cf31eec82783baf1bfc2a67f85229df46f SHA512 411acb87f5cff496fb309e795a0a641e82cd88d116fb8e8852d5548f07c5722bed10d3ec681508ff32abd6ecf668e75939f9b9f441a1149dff02259a09bfef05 WHIRLPOOL 25911b6f882524cea629bdcf75acdb1b9afc409dd830710fc241f6afd6ff0e033b97c2c5731cfde059a886e8b3e4f4d0ed3c8d3fca1f92b4d9f282ec72c86f9c
-EBUILD quassel-9999.ebuild 5922 SHA256 df5503b79b2a7b9ada627b928dbd1e3a270b13a48688f84669d6136a922c90ce SHA512 6c997657c97b14aeac1b2c4494de01e81da26fbc5e8575aa449bdd3cc60d8d6dcfe4e9d6b6b005b33cd38d05c37b1e7c81c7d87e299b17ec00cacd27d96194fc WHIRLPOOL 29ee890300eb6150c979ed39fea73c811a6d51cd333df0e914f983d1d8e3f4ff2abd5bdc95285417e3a987ddc4c2dc7f5fd5940eed0efe6076d8e94b54c71627
-MISC ChangeLog 32736 SHA256 ca98a2615f7a9de12e69ee8600aa8bdc7f81f5af0767d79256ad96b70f70ba64 SHA512 412813464053a2be6c28150ed9856d56ff2d9185627bb917cf2bb0c1af15993d34cd3d1263ae076691540704180fce0ab45ed750c4e94032b36d5a22c5563b11 WHIRLPOOL 88f3bf7dcb1e99b4ffb9e60298b3405013e35571ad9fcda1919b4583aa835094ba96a475684baaf3182523c42882287d4af3b7c039aa797749a2c97a76c7da70
+EBUILD quassel-9999.ebuild 6054 SHA256 af7ee26e811871bc547897a971cdea7b8e846deafa14ffc1af489664e7d38729 SHA512 5a011403102bea898c461ee7fa85fe4883ec0aef20dc6a354b3234cc6c5cd39fa48769c5067a8fe76564af89513697bd26441c8308fcb09534068b5b2ab97a83 WHIRLPOOL 3f4d7edaa854482b07bc6a9daa4d8225152c38eaf65561989cb5b04bcbe78507397313a1f8466872fd6a8753c03fc039e3165f8f4e4b70e410396604b977c057
+MISC ChangeLog 32989 SHA256 4224255dd568daee5065e3b4390f765b77328f889afe5912af992667864e0ad9 SHA512 1e835f38b5e32a81721d4f60a93ff86fd84ebf3ed62cd123bbb11cc73ab762b1fecfdb3f5785b0d75a18d3b711b63713f2813b5d0ff2a9b1088ee595f656e7ce WHIRLPOOL 4d1030c3edf8cad6246946e11be5df23c9e8f896abeda8134050b92a3c70ab8c9d54dba5fd47c118442c5bb975507a40c77e4c2b2cc056af7e89a7c761c07659
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVivJLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVjEb1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vtvoP/jMs7nxVxx6fPuQK0Mw1mcTE
-5ZNJBk8KWl40ue234AFp6aXWYytzcQl3cZnFIPy/aiWM4aeJfyeDY7Kzh6GoNi2n
-8FrVCFk0tC9hpqiqwGym2KTELe3ifm3b6auWqZwqYeEwQ5XpAbrVw48soi8Hjx6d
-7psm1gPh06vnJMRAncPxj6oxCM97Byhw1zMe2YaCJFeanSmIvfXqYIHcRSxjZD5E
-NnXX3g0Y5Jr84DeiQSDb+iOTdoQwmLo1F91bK17BUhk6/QX1TdovFYUNju7eDTT2
-RNW0kyUkr7r6Jq60WE+Cff3F6sWzsGZnojlFJFqNwwKjZuhmihpLolqc7ksj8rtu
-ozW9C5sBlmVEiQnFVRA4Kw94Bm36XfpfaHamSughmdurwCLSXv8nLTq8Y6k8dXnQ
-QgYM+pHtJzqfr/e/IefkC4cJR/j5QlU2cKT0AwK09yDZRhlaoVxY9HzxoRopc5op
-esg6F/3pvftXF0eK0nQjeI7qiCRwt3zOfLYR0fscTDVnCuSMEEa0glSl+msuLEw6
-R4AdVRcgkk+7Z04fy8yTinwea+qWGSgKcYBj51nHDwQwZblp+P521elXJhqHcym9
-+NAhkg8mZrjfS1LV5c1vhVyG1kRvg4z6yt6BnLTMqt69uen4kYr4uK5b7ETzld5/
-LDn4kPpn8ksBUz1+3Ux8
-=AoAl
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vyTYP/2DMtIxnDD7cs1FE7d93aEJ1
+TnEaY8JEtdc7qSO/fC6gP10BtGqh+VluY5a2h9/qSI4JWlHNqDhXDgOhnwitKvxD
+O/V/oP2ln5UJ0kSWtuYwbD2dEv6rycjpz2KYK1GunXrEJM+v0XTws0qYTTqP4jG9
+BpflXY9OzPhpZmVpPLWBrUHOfrL7Pe1LlaqIHkCe1DcMa4RMe7NIyLoD440Xo9C9
+vLNG6Apaze5+m/8zVza1tNK7yXn4+ZRfbQnbDn9JYBlTW3Z1c0GK7B22yiUxNYyN
+EWMplzSsjHLl5RDFfmCqrqHDlobTAYWUTKzFHVDQgjHkmOTuaN2JEGsd8GrPcQGe
+s6Dzjcpa79js0xIAoSHpc3TLjxXg3441YYqHy0Oj0oLUsvHOHPxBzTV+EWtFDABx
+WmDoXuMFrvBVxxw/33AcaWm0mMzbfm34/VmfTnvEfYLiv0/+rv0qUXqYfFJStZzm
+Gjicq7omg+WYEtdTzHzKvFjxT2Fn1rmhvBqsZFLvF19g2nk0jDjBiGegIuefLW47
+FOY0a8VVcVN0qjKsEVGEcSO31WpUOOETzU3+6oOuCAkNuDs6zyIxOplyzj/G38iZ
+ftYv4SsYQksMfmTqWN7ez4dpiMJ6wxlW3W4RpgMFadvmzX+gkQS2lJaHuU0LAEiZ
+6LVtWoZ6LDndOBk9yym5
+=2GCd
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/quassel-0.12.2-qt55.patch b/net-irc/quassel/files/quassel-0.12.2-qt55.patch
new file mode 100644
index 000000000000..3bf8989e5d86
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.12.2-qt55.patch
@@ -0,0 +1,53 @@
+From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Sat, 2 May 2015 23:04:53 +0200
+Subject: [PATCH] Fix build with Qt-5.5
+
+http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
+---
+ src/client/treemodel.cpp | 5 ++---
+ src/common/peer.h        | 1 +
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
+index f599803..fd47bc0 100644
+--- a/src/client/treemodel.cpp
++++ b/src/client/treemodel.cpp
+@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
+     ChildStatus cs = _childStatus;
+ #ifndef QT_NO_DEBUG
+     QModelIndex parent = indexByItem(parentItem);
+-#endif
+     Q_ASSERT(cs.parent == parent);
+     Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
+-
++#endif
+     _aboutToRemoveOrInsert = false;
+     for (int i = cs.start; i <= cs.end; i++) {
+         connectItem(parentItem->child(i));
+@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
+ #ifndef QT_NO_DEBUG
+     ChildStatus cs = _childStatus;
+     QModelIndex parent = indexByItem(parentItem);
+-#endif
+     Q_ASSERT(cs.parent == parent);
+     Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
++#endif
+     _aboutToRemoveOrInsert = false;
+ 
+     endRemoveRows();
+diff --git a/src/common/peer.h b/src/common/peer.h
+index 02eb3c0..79204b4 100644
+--- a/src/common/peer.h
++++ b/src/common/peer.h
+@@ -22,6 +22,7 @@
+ #define PEER_H
+ 
+ #include <QAbstractSocket>
++#include <QDataStream>
+ #include <QPointer>
+ 
+ #include "authhandler.h"
+-- 
+2.4.0
+
diff --git a/net-irc/quassel/quassel-0.12.2-r1.ebuild b/net-irc/quassel/quassel-0.12.2-r1.ebuild
new file mode 100644
index 000000000000..6ca376a3e6c3
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.2-r1.ebuild
@@ -0,0 +1,219 @@
+# 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-0.12.2-r1.ebuild,v 1.1 2015/06/25 18:21:51 johu Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils pax-utils systemd user versionator
+
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+SLOT="0"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
+
+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] )
+	)
+	!qt5? (
+		dev-qt/qtscript:4
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
+		postgres? ( dev-qt/qtsql:4[postgres] )
+		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt5]
+			dev-qt/qtdbus:5
+		)
+		kde? (
+			kde-frameworks/kconfigwidgets:5
+			kde-frameworks/kcoreaddons:5
+			kde-frameworks/knotifications:5
+			kde-frameworks/knotifyconfig:5
+			kde-frameworks/ktextwidgets:5
+			kde-frameworks/kwidgetsaddons:5
+			kde-frameworks/kxmlgui:5
+			kde-frameworks/sonnet:5
+		)
+		phonon? ( media-libs/phonon[qt5] )
+		webkit? ( dev-qt/qtwebkit:5 )
+	)
+	!qt5? (
+		dev-qt/qtgui:4
+		ayatana? ( dev-libs/libindicate-qt )
+		dbus? (
+			dev-libs/libdbusmenu-qt[qt4(+)]
+			dev-qt/qtdbus:4
+			kde? (
+				kde-base/kdelibs:4
+				kde-apps/oxygen-icons
+				ayatana? ( kde-misc/plasma-widget-message-indicator )
+			)
+		)
+		phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
+		webkit? ( dev-qt/qtwebkit:4 )
+	)
+"
+
+RDEPEND="
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl?]
+	)
+	!qt5? ( dev-qt/qtcore:4[ssl?] )
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	qt5? (
+		dev-qt/linguist-tools:5
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	ayatana? ( || ( X monolithic ) )
+	crypt? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) phonon )
+	phonon? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	qt5? ( !ayatana )
+	syslog? ( || ( server monolithic ) )
+	webkit? ( || ( X monolithic ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+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)
+		$(cmake-utils_use_with !kde OXYGEN)
+		$(cmake-utils_use_want monolithic MONO)
+		$(cmake-utils_use_find_package phonon)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_use qt5)
+		$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_with webkit)
+		$(cmake-utils_use_want X QTCLIENT)
+		"-DEMBED_DATA=OFF"
+	)
+
+	# Something broke upstream detection since Qt 5.5
+	if use ssl ; then
+		mycmakeargs+=("-DHAVE_SSL=TRUE")
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
+	fi
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
+	# temporary info mesage
+	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
+		echo
+		ewarn "Please note that all configuration moved from"
+		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
+		ewarn "to: ${QUASSEL_DIR}."
+		echo
+		ewarn "For migration, stop the core, move quasselcore files (pretty much"
+		ewarn "everything apart from quasselclient.conf and settings.qss) into"
+		ewarn "new location and then start server again."
+	fi
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 2d51d1e07369..2401787f6067 100644
--- 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.84 2015/06/24 18:02:59 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.85 2015/06/25 18:21:51 johu Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="http://quassel-irc.org/"
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 KEYWORDS=""
@@ -97,7 +97,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
-S="${WORKDIR}/${P/_/-}"
+PATCHES=( "${FILESDIR}/${PN}-0.12.2-qt55.patch" )
 
 REQUIRED_USE="
 	|| ( X server monolithic )
@@ -141,6 +141,11 @@ src_configure() {
 		"-DEMBED_DATA=OFF"
 	)
 
+	# Something broke upstream detection since Qt 5.5
+	if use ssl ; then
+		mycmakeargs+=("-DHAVE_SSL=TRUE")
+	fi
+
 	cmake-utils_src_configure
 }