gentoo resync : 15.01.2020

6 files changed, 198 insertions, 167 deletions

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 7ece7ffd9e3d..3ffcc2cbe42c 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,11 +1,10 @@
-AUX quassel-0.12.5-qt511.patch 2877 BLAKE2B def8d1b49a6f5aa3518dfa1998f62ff308f9a53f443d6e4626a9be0fec22bda864da1021aad9998af121af950b89c24d5bf521806309936a81fa0f92c18d5074 SHA512 0733916e25250644ba9ca78c83e358ee6dba07a9fcf8c4238440db50d45f10f892ac222252a9271e37e3ae0f0625b904580e01d06104152110d551e51c82af1f
+AUX quassel-0.13.1-qt5.14.patch 4250 BLAKE2B 11e07632b771d205a4f1ce87ebe82f80d0353b455dc275e71adcda43519f50c134a23a2c01fe085b315ac5d2c4ae89e1eec168c5eb91fb24af1155587d28775e SHA512 4be9792b0398a229102d5cef2b3931e1e9d9851ea99e647f0896c0cf9683db95ea559d7f5fb075388baea0af68cb4a30090ff95732469ecb64c439d7b8cabea0
 AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
-DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.12.5-r2.ebuild 4945 BLAKE2B 5a54a1aa6826752cf7d9af83ccd572eb5cd3252ed44a7ddeb3a30facdfba46282fe04a652ad20e38f91b251f1eafc2afcce05d8e56e28b7afa283ffe877cca05 SHA512 a49a8b12edc8cf8296189efc30278d59e1494a5097d1759854cc33a456e0158a17b3bb9d90860ac33818b2e2f2183c777f37a3b5768a4aea2bdbba0675a82390
+EBUILD quassel-0.13.1-r2.ebuild 4689 BLAKE2B 17066bde7af2a7c76a249e88c873922da89923c9db4634aa06fb3ba64068e8d7942eb1e675f32cb8d69531fc00f3f5ea9c5d0f49be6c67e49392b8da6b2b6fa3 SHA512 8f2f3b01bb209041e9bf715a50d29bedbe5753f4b8b634587d4b2a6f13f3cab92c8854a966bed30442c4446e438c97ef22f959cdf1dc2b86f056710088a724fb
 EBUILD quassel-0.13.1.ebuild 5038 BLAKE2B e6797f22b1df5e444502578cb391b0aa87885713544bfceed566a1ce81ce6a865e2e58bde479135ef2a01d6b1a614ada2fc615dff4f4d07edb43c0a2a523965d SHA512 01474d82c2327259ec6c731bb57878a55f835e7be204e73f6922e908224959be5943cb41f67c65cd80fd38bfcef464b81597c852b95a9b26a83cf5c183a6e9c0
-EBUILD quassel-9999.ebuild 5026 BLAKE2B 2aa9a68cce5157e4839168c7f5927cbfa445d3a49dbfc7b8056d5d5ae8396da7ee66748a7659fadf068ca31289077ecfd30d657cb1b2646b9ba826658585f3e4 SHA512 279d89c6bf230bfd55c7d8e9f67c3f9b9e7b497a43c32e2b5a169274b02225f68af2f2ac1bf45e0358fc05479992705a9852306b11e152f4c52d7f43aafb4572
-MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
+EBUILD quassel-9999.ebuild 4593 BLAKE2B cec8cb464d7f8f6796c136ba1cf80b28411e27e458385c847eae3258f58cafb44e9f27c8a26e0db9f04d2bf11b175e0370ea578d4bc21d9d3708565eda3acdbd SHA512 a047bffb683a604c1095306970e3f753aeea6301340b0cdbf54482823526e3b10492510ba7e6010b957a839d3d2d62c364265ae6cbb5ca89caf82d2ac9f48484
+MISC metadata.xml 1840 BLAKE2B ce192c0c4987d04d874967c26d9febfe2061391921e013ff8d16af93cad58a6d75475f32903f1ff7dc242547f11bd2ff9981c5b0fc24bc0dc3adc434d7d358f1 SHA512 9fe3bb49838a4b5c400f31934d00ddd15704f30137d35d7ea3d85d45679015e5fefa11d726f5a86dadbc2dc68c0ffd37867fb98ee69e7cd0f2d06624d52944e9
diff --git a/net-irc/quassel/files/quassel-0.12.5-qt511.patch b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
deleted file mode 100644
index c46eee8e29b8..000000000000
--- a/net-irc/quassel/files/quassel-0.12.5-qt511.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81
-Author: Manuel Nickschas <sputnick@quassel-irc.org>
-Date:   Thu May 3 23:19:34 2018 +0200
-
-    cmake: Fix build with Qt 5.11
-    
-    Qt 5.11 removes the qt5_use_modules function, so add a copy. If
-    present, the Qt-provided function will be used instead.
-    
-    Closes GH-355.
-
-diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
-index 652c0042..d77ba1cf 100644
---- a/cmake/QuasselMacros.cmake
-+++ b/cmake/QuasselMacros.cmake
-@@ -5,6 +5,9 @@
- # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
- # (C) 2005-2009 Kitware, Inc.
- #
-+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
-+# (C) 2005-2011 Kitware, Inc.
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
-     endforeach()
- endfunction()
- 
-+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version.
-+# If present, the Qt-provided version will be used automatically instead.
-+function(qt5_use_modules _target _link_type)
-+    if (NOT TARGET ${_target})
-+        message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
-+    endif()
-+    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
-+        set(_qt5_modules ${ARGN})
-+        set(_qt5_link_type ${_link_type})
-+    else()
-+        set(_qt5_modules ${_link_type} ${ARGN})
-+    endif()
-+
-+    if ("${_qt5_modules}" STREQUAL "")
-+        message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
-+    endif()
-+    foreach(_module ${_qt5_modules})
-+        if (NOT Qt5${_module}_FOUND)
-+            find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
-+            if (NOT Qt5${_module}_FOUND)
-+                message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
-+            endif()
-+        endif()
-+        target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
-+        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
-+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
-+        if (Qt5_POSITION_INDEPENDENT_CODE
-+                AND (CMAKE_VERSION VERSION_LESS 2.8.12
-+                    AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-+                    OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
-+            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
-+        endif()
-+    endforeach()
-+endfunction()
-+
- # Some wrappers for simplifying dual-Qt support
- 
- function(qt_use_modules)
diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
new file mode 100644
index 000000000000..f0305ea53ce7
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
@@ -0,0 +1,118 @@
+commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
+Author: Manuel Nickschas <sputnick@quassel-irc.org>
+Date:   Tue Jan 7 18:34:54 2020 +0100
+
+    common: Disable enum type stream operators for Qt >= 5.14
+    
+    Starting from version 5.14, Qt provides stream operators for enum
+    types, which collide with the ones we ship in types.h. Disable
+    Quassel's stream operators when compiling against Qt 5.14 or later.
+    
+    Add a unit test that ensures that enum serialization honors the width
+    of the underlying type.
+
+diff --git a/src/common/types.h b/src/common/types.h
+index 467d9fb2..c4b9f364 100644
+--- a/src/common/types.h
++++ b/src/common/types.h
+@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
+ typedef QList<MsgId> MsgIdList;
+ typedef QList<BufferId> BufferIdList;
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ /**
+  * Catch-all stream serialization operator for enum types.
+  *
+@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
+     value = static_cast<T>(v);
+     return in;
+ }
++#endif
+ 
+ // Exceptions
+ 
+diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
+new file mode 100644
+index 00000000..04031c29
+--- /dev/null
++++ b/src/common/typestest.cpp
+@@ -0,0 +1,79 @@
++/***************************************************************************
++ *   Copyright (C) 2005-2020 by the Quassel Project                        *
++ *   devel@quassel-irc.org                                                 *
++ *                                                                         *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or     *
++ *   (at your option) version 3.                                           *
++ *                                                                         *
++ *   This program is distributed in the hope that it will be useful,       *
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
++ *   GNU General Public License for more details.                          *
++ *                                                                         *
++ *   You should have received a copy of the GNU General Public License     *
++ *   along with this program; if not, write to the                         *
++ *   Free Software Foundation, Inc.,                                       *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
++ ***************************************************************************/
++
++#include <cstdint>
++
++#include <QByteArray>
++#include <QDataStream>
++#include <QObject>
++
++#include "testglobal.h"
++#include "types.h"
++
++using namespace ::testing;
++
++class EnumHolder
++{
++    Q_GADGET
++
++public:
++    enum class Enum16 : uint16_t {};
++    enum class Enum32 : uint32_t {};
++
++    enum class EnumQt16 : uint16_t {};
++    Q_ENUM(EnumQt16)
++    enum class EnumQt32 : uint32_t {};
++    Q_ENUM(EnumQt32)
++};
++
++// Verify that enums are (de)serialized as their underlying type
++TEST(TypesTest, enumSerialization)
++{
++    QByteArray data;
++    QDataStream out(&data, QIODevice::WriteOnly);
++
++    // Serialize
++    out << EnumHolder::Enum16(0xabcd);
++    ASSERT_THAT(data.size(), Eq(2));
++    out << EnumHolder::Enum32(0x123456);
++    ASSERT_THAT(data.size(), Eq(6));
++    out << EnumHolder::EnumQt16(0x4321);
++    ASSERT_THAT(data.size(), Eq(8));
++    out << EnumHolder::Enum32(0xfedcba);
++    ASSERT_THAT(data.size(), Eq(12));
++    ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok));
++
++    // Deserialize
++    QDataStream in(data);
++    EnumHolder::Enum16 enum16;
++    EnumHolder::Enum32 enum32;
++    EnumHolder::EnumQt16 enumQt16;
++    EnumHolder::EnumQt32 enumQt32;
++    in >> enum16  >> enum32 >> enumQt16 >> enumQt32;
++    ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok));
++    EXPECT_TRUE(in.atEnd());
++
++    EXPECT_THAT((int)enum16, Eq(0xabcd));
++    EXPECT_THAT((int)enum32, Eq(0x123456));
++    EXPECT_THAT((int)enumQt16, Eq(0x4321));
++    EXPECT_THAT((int)enumQt32, Eq(0xfedcba));
++}
++
++#include "typestest.moc"
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index a343c531e402..57498aeffbe6 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -30,10 +30,6 @@
 		<flag name="oxygen">
 			Support the Oxygen icon set that was the default for KDE4.
 		</flag>
-		<flag name="phonon">
-			Build client with phonon backend support. This enables sound
-			playback in client.
-		</flag>
 		<flag name="server">
 			Build the server binary. If this USE flag is disabled, the
 			'core' server binary for quassel is not built, and cannot be
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 5db277fc20a5..4732c5d2f114 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://quassel-irc.org/pub/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	S="${WORKDIR}/${MY_P}"
 else
-	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
 	inherit git-r3
 fi
 
@@ -17,22 +19,30 @@ DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
 snorenotify +ssl syslog urlpreview X"
 
-SERVER_RDEPEND="
+SERVER_DEPEND="
+	acct-group/quassel
+	acct-user/quassel
 	dev-qt/qtscript:5
-	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	crypt? ( app-crypt/qca:2[ssl] )
+	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
-GUI_RDEPEND="
+GUI_DEPEND="
 	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
+	!bundled-icons? (
+		kde-frameworks/breeze-icons:5
+		oxygen? ( kde-frameworks/oxygen-icons:5 )
+	)
 	dbus? (
-		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
 		dev-qt/qtdbus:5
 	)
 	kde? (
@@ -45,25 +55,25 @@ GUI_RDEPEND="
 		kde-frameworks/kxmlgui:5
 		kde-frameworks/sonnet:5
 	)
-	phonon? ( media-libs/phonon[qt5(+)] )
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-RDEPEND="
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl?]
 	sys-libs/zlib
 	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
 	)
 	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
+		server? ( ${SERVER_DEPEND} )
+		X? ( ${GUI_DEPEND} )
 	)
 "
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	kde-frameworks/extra-cmake-modules
 "
@@ -73,64 +83,50 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) dbus phonon )
-	phonon? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus )
+	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
-
-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
-}
+PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_QT4=OFF
 		-DUSE_QT5=ON
-		-DEMBED_DATA=OFF
+		-DUSE_CCACHE=OFF
 		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package dbus Qt5DBus)
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
-		-DWITH_OXYGEN=$(usex !kde)
+		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package snorenotify LibsnoreQt5)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
-	# Something broke upstream detection since Qt 5.5
-	if use ssl ; then
-		mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+	if use server || use monolithic; then
+		mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_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-r1 quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
@@ -158,23 +154,24 @@ pkg_postinst() {
 		einfo "Consider installing it if you want to run quassel within identd daemon."
 	fi
 
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_config() {
 	if use server && use ssl; then
 		# generate the pem file only when it does not already exist
+		QUASSEL_DIR=/var/lib/${PN}
 		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"
+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
 		else
 			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index fa495dec64ed..a8492974412d 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils pax-utils systemd user
+inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
-	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
 	inherit git-r3
 fi
 
@@ -22,15 +22,17 @@ SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
 snorenotify +ssl syslog urlpreview X"
 
-SERVER_RDEPEND="
-	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+SERVER_DEPEND="
+	acct-group/quassel
+	acct-user/quassel
+	crypt? ( app-crypt/qca:2[ssl] )
 	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
 "
 
-GUI_RDEPEND="
+GUI_DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
@@ -39,7 +41,7 @@ GUI_RDEPEND="
 		oxygen? ( kde-frameworks/oxygen-icons:5 )
 	)
 	dbus? (
-		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
 		dev-qt/qtdbus:5
 	)
 	kde? (
@@ -56,20 +58,21 @@ GUI_RDEPEND="
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-RDEPEND="
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl?]
 	sys-libs/zlib
 	monolithic? (
-		${SERVER_RDEPEND}
-		${GUI_RDEPEND}
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
 	)
 	!monolithic? (
-		server? ( ${SERVER_RDEPEND} )
-		X? ( ${GUI_RDEPEND} )
+		server? ( ${SERVER_DEPEND} )
+		X? ( ${GUI_DEPEND} )
 	)
 "
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	kde-frameworks/extra-cmake-modules
 "
@@ -86,55 +89,39 @@ REQUIRED_USE="
 	syslog? ( || ( server 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=(
-		-DUSE_QT4=OFF
-		-DUSE_QT5=ON
 		-DUSE_CCACHE=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package dbus Qt5DBus)
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package snorenotify LibsnoreQt5)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
 	if use server || use monolithic; then
-		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_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-r1 quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
@@ -162,23 +149,24 @@ pkg_postinst() {
 		einfo "Consider installing it if you want to run quassel within identd daemon."
 	fi
 
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_config() {
 	if use server && use ssl; then
 		# generate the pem file only when it does not already exist
+		QUASSEL_DIR=/var/lib/${PN}
 		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"
+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
 		else
 			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."