gentoo resync : 20.10.2021

13 files changed, 240 insertions, 415 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 38e083968ba5..d615d559d657 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 1147317c62b0..80221f8061d4 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -5,5 +5,5 @@ DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fc
 DIST inspircd-3.11.0-fix-path-builds.patch.bz2 4564 BLAKE2B 5414c6bff651f179bb7f214198d13c08ce1e92b6946729d617a56a2dd451a239520bc946823603b2e3ab0a78577f077c1d566bfa6771d6c9866ef5249269653c SHA512 92feddfa23acac2f1813539f9fae0e1c6c7332565c5d63df02e6f800b4457ed1ac1eff4f3aee8fb155dbae5b6d1d16536b435734549f740ae294382330837d5c
 DIST inspircd-3.11.0.tar.gz 859767 BLAKE2B a0924d302577dcb471e22c0df21b7259c5b68b1ee2080233c31e84bc5cf8c32fbe134a359bf4d7f7541f512e078a9e75717df2dc7178670b3e3d7c7dfb2930b7 SHA512 59a277de041f1b0d44204c36190b6bd728f981997ba377f5bf9b7745fce122271e3df35223ff11d8d31d70f1f378977ea6603963ff2bb1a4fbaac958903b0da3
 EBUILD inspircd-3.10.0.ebuild 3708 BLAKE2B 44d2808570c41a0bd8c9f713ba89b41ab8a6563b80d459ffb551d1efbd7d532bf00915e0d5eda978fced1a383b16272fc778f6ab3daf46818a66e3afbc3479c4 SHA512 3ee1c48b313f8a217dc26d43c7f9757924d0156c1179c10392793d00a81be4132f943dde5c1af4ff02b9c173e82901c03377c0813bf029ef4a0e69c4a2d0edac
-EBUILD inspircd-3.11.0.ebuild 3717 BLAKE2B ccf2ee49f27d10463cc9be40fd98fa5b2056ea4c4a973e26730883c864b956edb052433737e6b602f187552ac25bbceba829dbb61f5847d841f917c927e443d8 SHA512 f693b83fbd2352f612b6dbb61aa3763191965b99adb7f29a23fc2fcb98f5b5735fd603dd4799d6389b743875e02a9bce3964106d1019e4a2a259fce4a2b4e626
+EBUILD inspircd-3.11.0.ebuild 3715 BLAKE2B 61f99c98cf1cd27bb97d637a3d1acde8947259ee6a961f8ae4a422580c4f4b1b7f3b6cc5a7bc6d1398f10304c6a41f924d8150938286e193eade456f22fea54d SHA512 0530c0f26cbe82327da62ea29c05511da5f4f7f5de1fc1a06eb429ba75beb9aaf1581127d22f88eb8e1c755e2c85095259bcfdc33cb606177bbf1217a00132c7
 MISC metadata.xml 1878 BLAKE2B 2c85eb9c5a0db82398ede6b597627d226b139b7758135777068bc9b84f4b2c8303243f9591fe12e0dfb3957b7d6abe638421dce936d58c7182fa3bccfa7ddf9c SHA512 25a287fd0ac8a18a751d6920395868eaf0c73e8bf13f28ffcc187f9a5ee04520677ffeb0506b5541436ac4a9ed0f493331a09ed24d7249376493cc626eecf857
diff --git a/net-irc/inspircd/inspircd-3.11.0.ebuild b/net-irc/inspircd/inspircd-3.11.0.ebuild
index d013d22d99d8..b8aa1c3f23b4 100644
--- a/net-irc/inspircd/inspircd-3.11.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 6300f3f4b1ea..e7a1c223869e 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -3,7 +3,9 @@ AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d17
 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 0.14-rc2.tar.gz 6163941 BLAKE2B 6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea SHA512 57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.13.1-r2.ebuild 4700 BLAKE2B a508275b48c7314155d9a133caadfac6745206bac3d92a9d667dfbdf6bc03215b58cecbe2c7fb78b6ea3d8d511e98ca20914ce5e7234be460c22056357816037 SHA512 42eda8c70edfc642e0e011d9111eae7b98a3715ff85129f14a0b15348aa107494fce4d79f7d65ee869b89ab884de804353288436f376f86186d59f0d8787205b
-EBUILD quassel-9999.ebuild 4583 BLAKE2B 59c518587b305ad28b40594af715e2aa54396feb6f596a9273b884b4280bed8152649bc7da6f662a7762d5d01b16d798160e1414d5e5649662d2b18c0bd9863d SHA512 c0de1abaa3fd51e64378c15d425371f9214ebfd0933f4cb64d8dbf4684fbcead6ce19049593ed1b7bbc6d60d6b661d8f0afd6e9e9600ad272c7432aa6bbe2d08
+EBUILD quassel-0.13.1-r2.ebuild 4778 BLAKE2B 906e990217903529c054351347469bfc278372928539ad3d206192981222d45821cc0e7e1921fadcf3fa0451f679b3bb285c5a0d9b89d0fdc7be3a5ced605986 SHA512 86e0f40fb13d71e2bbefcc82aa39148ee4f6d3e497ca0f1ea58521caae6d9310b0e918e7979f6e3864d7e08f3009944d0b811dad44c0c803349dbae31501bf4f
+EBUILD quassel-0.14_rc2.ebuild 4938 BLAKE2B 28c85696c8aea0a8df45eca4643921606952b691d84f0c65a19a688ace3a8db3fa4edfab2b29e2a873f9b847345401f60fb9e25d8bc6aba12256843a73bb8073 SHA512 a17eceb2b33336817b38841720b11666a51c629d3c64a6493d236830bf59885470ef2e1bd3880b627414275074ee4927354166ee20a95c33d6b89d1d4817e317
+EBUILD quassel-9999.ebuild 4938 BLAKE2B 28c85696c8aea0a8df45eca4643921606952b691d84f0c65a19a688ace3a8db3fa4edfab2b29e2a873f9b847345401f60fb9e25d8bc6aba12256843a73bb8073 SHA512 a17eceb2b33336817b38841720b11666a51c629d3c64a6493d236830bf59885470ef2e1bd3880b627414275074ee4927354166ee20a95c33d6b89d1d4817e317
 MISC metadata.xml 1727 BLAKE2B 6c24bd6b8689db443c7e1838cd427c54fae128001704570f2a9756d6cc27770ba54f4fd237fe64c4134d21e5ee409dacb4f3e3ebb0a7a38eed9fbb465d64b8c2 SHA512 743c8e1c4b5ad3100ed71142033ad0eb7102bd275dbb3e616845059cebdc90f76a370dd99043e46a34807b1d80db175212748585895af3f5a8fba05e9515d678
diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 5a78333a8ff8..c51a64ccdeff 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify +ssl syslog urlpreview X"
+snorenotify spell +ssl syslog urlpreview X"
 
 SERVER_DEPEND="
 	acct-group/quassel
@@ -53,9 +53,9 @@ GUI_DEPEND="
 		kde-frameworks/ktextwidgets:5
 		kde-frameworks/kwidgetsaddons:5
 		kde-frameworks/kxmlgui:5
-		kde-frameworks/sonnet:5
 	)
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	spell? ( kde-frameworks/sonnet:5 )
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
@@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) dbus )
+	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
+	spell? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
 "
 
@@ -109,6 +110,7 @@ src_configure() {
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
 		$(cmake_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild
new file mode 100644
index 000000000000..fce90ab6e53b
--- /dev/null
+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils pax-utils systemd
+
+if [[ ${PV} != *9999* ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} ==  *_rc* ]] ; then
+		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz"
+	else
+		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~sparc-solaris"
+	fi
+	S="${WORKDIR}/${MY_P}"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="https://quassel-irc.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+# Can't seem to find itself (libraries)
+RESTRICT="!test? ( test ) test"
+
+SERVER_DEPEND="acct-group/quassel
+	acct-user/quassel
+	dev-qt/qtscript:5
+	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_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
+		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
+	)
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	spell? ( kde-frameworks/sonnet:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND=">=dev-libs/boost-1.54:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_DEPEND} )
+		X? ( ${GUI_DEPEND} )
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	kde? ( dbus spell )
+	ldap? ( || ( server monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	spell? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
+		-DWITH_WEBKIT=OFF
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+		$(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_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWANT_QTCLIENT=$(usex X)
+	)
+
+	if use server || use monolithic ; then
+		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server ; then
+		# Needs PaX marking, bug #346255
+		pax-mark m "${ED}"/usr/bin/quasselcore
+
+		# Init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/quassel.logrotate quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	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
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
+
+pkg_config() {
+	if use server ; then
+		# Generate the pem file only when it does not already exist
+		QUASSEL_DIR="${EROOT}"/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 ${PN}:${PN} "${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 68d94a9e3ea2..fce90ab6e53b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,12 @@ 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 ~x86 ~amd64-linux ~sparc-solaris"
+	if [[ ${PV} ==  *_rc* ]] ; then
+		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz"
+	else
+		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~sparc-solaris"
+	fi
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
@@ -17,23 +21,22 @@ fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="https://quassel-irc.org/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify syslog urlpreview X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+# Can't seem to find itself (libraries)
+RESTRICT="!test? ( test ) test"
 
-SERVER_DEPEND="
-	acct-group/quassel
+SERVER_DEPEND="acct-group/quassel
 	acct-user/quassel
+	dev-qt/qtscript:5
 	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_DEPEND="
-	dev-qt/qtgui:5
+	syslog? ( virtual/logger )"
+GUI_DEPEND="dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
 	!bundled-icons? (
@@ -52,13 +55,11 @@ GUI_DEPEND="
 		kde-frameworks/ktextwidgets:5
 		kde-frameworks/kwidgetsaddons:5
 		kde-frameworks/kxmlgui:5
-		kde-frameworks/sonnet:5
 	)
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
+	spell? ( kde-frameworks/sonnet:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND=">=dev-libs/boost-1.54:=
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl]
 	sys-libs/zlib
@@ -69,30 +70,25 @@ RDEPEND="
 	!monolithic? (
 		server? ( ${SERVER_DEPEND} )
 		X? ( ${GUI_DEPEND} )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-"
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="
-	|| ( X server monolithic )
+REQUIRED_USE="|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) dbus )
+	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
-	syslog? ( || ( server monolithic ) )
-"
+	spell? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )"
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
 		-DUSE_CCACHE=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DEMBED_DATA=OFF
@@ -106,11 +102,12 @@ src_configure() {
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
 		$(cmake_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
-	if use server || use monolithic; then
+	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi
 
@@ -120,28 +117,28 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	if use server; then
-		# needs PAX marking wrt bug#346255
-		pax-mark m "${ED}/usr/bin/quasselcore"
+	if use server ; then
+		# Needs PaX marking, bug #346255
+		pax-mark m "${ED}"/usr/bin/quasselcore
 
-		# init scripts & systemd unit
+		# Init scripts & systemd unit
 		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
 		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
 		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
+		newins "${FILESDIR}"/quassel.logrotate quassel
 	fi
 }
 
 pkg_postinst() {
-	if use monolithic; then
+	if use monolithic ; then
 		elog "Information on how to enable SSL support for client/core connections"
 		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
 	fi
 
-	if use server; then
+	if use server ; then
 		einfo "If you want to generate SSL certificate remember to run:"
 		einfo "	emerge --config =${CATEGORY}/${PF}"
 	fi
@@ -159,15 +156,17 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	if use server; 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\""
+	if use server ; then
+		# Generate the pem file only when it does not already exist
+		QUASSEL_DIR="${EROOT}"/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
+
+			# Permissions for the key
 			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
 		else
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 8b1a1a5d0079..5092614007c6 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,10 +1,5 @@
-AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
-DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78
-DIST weechat-3.2.tar.xz 2261376 BLAKE2B 6f9fcc72b4b36275e056f824a46d8640a45b1d78b9b6f0eaa5327fc2a965f891698982fade86c6d4e96d1f5c472ac4a82d036d478f37989f738f2ccd6e2f7002 SHA512 b4ad5cd6e678795d9093ddfa5aac0d396a7dbf994d04a6b9b083460b1639c851f1b9539cf7b97bd300154871d5df2c29f82fae387c42da840a1c3eb35c4a3660
 DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
-EBUILD weechat-3.1.ebuild 4249 BLAKE2B 15a46be0155555c65876a4058242d341fe48c4e24c730386a0730176862a217b83eed569e7d6ff48d18806e53b4888ed264aa9b6f7a0cc5eb7348bf17db18d8e SHA512 c0d2ede5f5a684368bb6f78c38a2b0a0c93e50aeedc238623e5a30b5d7121fa1c9bc6f6a0da40699286e4cabae09cb181f12f829bb7392c357ad1f7c6b9c4a87
-EBUILD weechat-3.2.ebuild 4252 BLAKE2B cf426dcc508110f7902cbbf9447dd6ec6bdb99d1d522cfe8a48296d81f7aa06b578da5e7e94060f8d9218bf10600253f79348d8c607ab73aadae4a41e2e9d8e6 SHA512 87bff86ac7a3fced70cb1935c7ee152eb2f91cb5e2954ac3a0a3ed0cd9606068571b7e3f53ad720dc7e519ae634f3cea6723e91c32c648c6ee90247f7e37aeb7
-EBUILD weechat-3.3.ebuild 4293 BLAKE2B 6371e879fa0430afbeb912104902ca0367dc97360d59650f84449b9481d06e514cd0d6e867ad265cbff176392c1701de3a898b614c5fa35cf131c4c1a3c2b60f SHA512 c0759eb67f2f81502397f8d7c4608671b93cb175725006a8fd2a9f59cea31df2516a64259a41e15fda46ccb15f834c4fdc3dc591e650cc0a4854d2203f12e38c
-EBUILD weechat-9999.ebuild 4252 BLAKE2B cf426dcc508110f7902cbbf9447dd6ec6bdb99d1d522cfe8a48296d81f7aa06b578da5e7e94060f8d9218bf10600253f79348d8c607ab73aadae4a41e2e9d8e6 SHA512 87bff86ac7a3fced70cb1935c7ee152eb2f91cb5e2954ac3a0a3ed0cd9606068571b7e3f53ad720dc7e519ae634f3cea6723e91c32c648c6ee90247f7e37aeb7
+EBUILD weechat-3.3.ebuild 4272 BLAKE2B e4540d53a1e0f73ffb18e013a308e41fbf70af0ede0569287eb3b25b8fcf228b2bd1ccd61c70bc4325f9044919ea4df990d5008418d4c0518b5bc669fadfd4a8 SHA512 8d6e65d1dd7fef873769ade1296dee98927c9ae7b4003e029f2082d509e0f998a88c5fc50a4044e9ac80d2bf340cc779f6c874c50fe1292929115e5f63acd82c
+EBUILD weechat-9999.ebuild 4275 BLAKE2B a3ee8fb32029caa078f3e6944912bce563458c115b6bf27dc67df67d9543356bc66adf432d3bdcf0c861866344c15c4926ae1df889d2e49379c705b88626cd02 SHA512 f8ff1a1de890f3284dc2c20f31a0e091e77addbe49c6d572d9188a0e429c4964e1f41cabaab05993420572f32a58428669752b037b895863aefc832dc7dd8792
 MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
deleted file mode 100644
index 6ed16efbd064..000000000000
--- a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake/FindLua.cmake
-+++ b/cmake/FindLua.cmake
-@@ -35,5 +35,5 @@
- 
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
-+  pkg_search_module(LUA lua)
- endif()
diff --git a/net-irc/weechat/weechat-3.1.ebuild b/net-irc/weechat/weechat-3.1.ebuild
deleted file mode 100644
index a5a2514719df..000000000000
--- a/net-irc/weechat/weechat-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.2.ebuild b/net-irc/weechat/weechat-3.2.ebuild
deleted file mode 100644
index f9ced9e04ddd..000000000000
--- a/net-irc/weechat/weechat-3.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.3.ebuild b/net-irc/weechat/weechat-3.3.ebuild
index 48fd4089957f..8db7e46b2ae8 100644
--- a/net-irc/weechat/weechat-3.3.ebuild
+++ b/net-irc/weechat/weechat-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -48,7 +48,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) )
 	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f9ced9e04ddd..b93780811d94 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr it ja pl ru"
@@ -48,7 +48,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) )
 	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -66,7 +66,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
 )
 
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
@@ -144,6 +144,7 @@ src_configure() {
 		-DENABLE_TCL=$(usex tcl)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
 		-DENABLE_XFER=$(usex xfer)
 	)
 	cmake_src_configure