gentoo resync : 08.10.2021

16 files changed, 533 insertions, 35 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 481e0b6104d6..38e083968ba5 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 9122fbc4e3a3..e043f9c21517 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,7 +1,9 @@
 AUX hexchat-2.14.3-python38.patch 1005 BLAKE2B 150783fae40e10aa32fdbf42aa5d1f70eefa69c6ea0a5fc7a0fbb243c1ad65bbc8d3fa1bbfcef530e366cf23d1905e70a7692208d06fc6feb0d24228888b17c7 SHA512 877da47f35d5c743429fc8c84768e70135d04573e7aed72e9f6e09062d619a8d4ed717930801a524bd81848f1a393919c1d8ae041899b07d9337e3fd7426a003
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
+DIST hexchat-2.16.0.tar.xz 1348320 BLAKE2B d5c6da74152e7ca08b629ee86cc45acb8232fbdad3d508cf56aba0c09d558b77644b704b5489e5f08a70133813f37c12e45b1529162e41b62acc9f61bca0b108 SHA512 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207
 DIST hexchat-add-libera-chat.patch 696 BLAKE2B cd5f0736abd7895d017e835335a6ff9a0f6301cba7e7b8c2a4e9da7047885aac2f8b7b25b0723966bd103118c99d833d3e99481865bf20d202b0f95c0a9131bb SHA512 e3cc7df3f114a2374c1653c4ab7262dad87191f74ca759c41beecd731472478e8bdc929b0a13475a1248ed045ee1faf93cd80a225b6ed670f449d4495d4ab2ae
 DIST hexchat-default-network.patch 1423 BLAKE2B b11982d50abb4fb7d8aab4758195cbfea1691cd7c6487ca56f995e449ff0445e2427a68064c0d8ee4b4b4e7764e438bfd68bb5402a266624cb6cfb93fbfdb30b SHA512 2691786d360278b4334e9129912ca0abde7b98f0d72f5e530b34e109eaf624d8e7280e137490dab218bacfb5bed952b2d7827640777ad73da5585517de308f42
 EBUILD hexchat-2.14.3-r101.ebuild 3737 BLAKE2B ef13962edf6bde5bc36dc3030fda8241c6c67544b981722220e18c74f05737e3a9fcd208a33158bf04a3b6524313ed8bcf75a3c6e2a4d4ec3968f32984378ba5 SHA512 596f95e2fb703820f1cc31e01cc69f8a61f9a39601e2d310b3af07f9f0e7d7931f1b3919ccc236d0492b28f94d9c3d8ddedd85d37271ce118a484463c1a30c57
-EBUILD hexchat-9999.ebuild 3356 BLAKE2B 590627e46339dd3a23d9e4c06d79192b9921674c0777b8d13a82a53c2942b513a76c15e3a199606eb5e366bb43fc4daa98d067dfb106fa7d8b4b46928c46c371 SHA512 28385e63e4968628000ffdd815d445c968762872c7a5f264f388e677ea0ed9fd3c881e8a72602dceffb2c1e3e0bd5cbc3e2f04fe5541275660468c84952379b9
+EBUILD hexchat-2.16.0.ebuild 3086 BLAKE2B e03d1339f8fddfa55fba29f229ad7f4947ecdc2e04c8ee92afdc703df241741690da1e50cb05bf633f54ca1919641ad2fc4be94a57c8d01c29b56f833e597628 SHA512 0baf9ae4800d77e3d9b6267b7719121e260accf060cb673096f7a931bee10b3a51dffe9ef78a86e20dfb16e61ee672a11b8f558f287503ccc37402dd0d295031
+EBUILD hexchat-9999.ebuild 3086 BLAKE2B e03d1339f8fddfa55fba29f229ad7f4947ecdc2e04c8ee92afdc703df241741690da1e50cb05bf633f54ca1919641ad2fc4be94a57c8d01c29b56f833e597628 SHA512 0baf9ae4800d77e3d9b6267b7719121e260accf060cb673096f7a931bee10b3a51dffe9ef78a86e20dfb16e61ee672a11b8f558f287503ccc37402dd0d295031
 MISC metadata.xml 1043 BLAKE2B dfeaaac78bd640c7298de4683f65b096233a92a2ea47f66fb94ac0dcc02087715299aa816deb51824de943c4832c8b3b37fdb493aea467118caa9fa52f4e53db SHA512 f68fed2523456624edad9c44f00fe16940cc10d44c97e523e5b159a7d31b0b74cf2dcc3c7e3eafff0c97c1cb2ce3aec8213b004ffc16a112b60320fbad0e192c
diff --git a/net-irc/hexchat/hexchat-2.16.0.ebuild b/net-irc/hexchat/hexchat-2.16.0.ebuild
new file mode 100644
index 000000000000..5964fd0c827e
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.16.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit lua-single meson mono-env python-single-r1 xdg
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	libcanberra? ( media-libs/libcanberra )
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi
+	)
+	ssl? ( dev-libs/openssl:0= )
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus-service-use-appid=false
+		-Dinstall-appdata=false
+		-Dplugin=true
+		$(meson_feature dbus)
+		$(meson_feature libcanberra)
+		$(meson_feature ssl tls)
+		$(meson_use gtk gtk-frontend)
+		$(meson_use !gtk text-frontend)
+		$(meson_use theme-manager)
+
+		$(meson_use plugin-checksum with-checksum)
+		$(meson_use plugin-fishlim with-fishlim)
+		-Dwith-lua="$(usex lua "${ELUA}" false)"
+		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		$(meson_use plugin-sysinfo with-sysinfo)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		xdg_pkg_postinst
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 5de62a8f2e7f..5964fd0c827e 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 SLOT="0"
-IUSE="dbus debug +gtk libcanberra libnotify libproxy lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -36,12 +36,13 @@ RDEPEND="
 		x11-libs/pango
 	)
 	libcanberra? ( media-libs/libcanberra )
-	libproxy? ( net-libs/libproxy )
-	libnotify? ( x11-libs/libnotify )
 	lua? ( ${LUA_DEPS} )
 	perl? ( dev-lang/perl:= )
 	plugin-sysinfo? ( sys-apps/pciutils )
-	python? ( ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi
+	)
 	ssl? ( dev-libs/openssl:0= )
 	theme-manager? (
 		|| (
@@ -70,23 +71,22 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
-		-Dwith-gtk="$(usex gtk true false)"
-		-Dwith-text="$(usex gtk false true)"
-		-Dwith-ssl="$(usex ssl true false)"
-		-Dwith-plugin=true
-		-Dwith-dbus="$(usex dbus true false)"
-		-Dwith-libproxy="$(usex libproxy true false)"
-		-Dwith-libnotify="$(usex libnotify true false)"
-		-Dwith-libcanberra="$(usex libcanberra true false)"
-		-Dwith-theme-manager="$(usex theme-manager true false)"
 		-Ddbus-service-use-appid=false
-		-Dwith-checksum="$(usex plugin-checksum true false)"
-		-Dwith-fishlim="$(usex plugin-fishlim true false)"
-		-Dwith-lua="$(usex lua ${ELUA} false)"
+		-Dinstall-appdata=false
+		-Dplugin=true
+		$(meson_feature dbus)
+		$(meson_feature libcanberra)
+		$(meson_feature ssl tls)
+		$(meson_use gtk gtk-frontend)
+		$(meson_use !gtk text-frontend)
+		$(meson_use theme-manager)
+
+		$(meson_use plugin-checksum with-checksum)
+		$(meson_use plugin-fishlim with-fishlim)
+		-Dwith-lua="$(usex lua "${ELUA}" false)"
 		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
 		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
-		-Dwith-appdata=false
+		$(meson_use plugin-sysinfo with-sysinfo)
 	)
 	meson_src_configure
 }
@@ -94,7 +94,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 	dodoc readme.md
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index e324b1dd6e76..485bc4d0c8d4 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,6 @@
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-21.04.3.tar.xz 4251844 BLAKE2B 0db25135752635392248288699ab6a28042fa5a5dbe73c5186d782fe5a68eb3b6396b87830f5ec91da00c434e0462ffae042332e9c82f1e342fd77a0762afe7f SHA512 af2e7d232412f316090be72cc2b412b19c8735be4e04c9286561ed3cf83b5858b83572f33ee70281610c7fe5e339683d33e9d1f9ddb57eb5198db91e82613869
-DIST konversation-21.08.1.tar.xz 4251152 BLAKE2B 61da4e8d066ca73963e97ae58e50875fb92104c6c12d726de563f7de134979bcea1a3f9e0f76786a7109128255ed63c18e0c60fa2df3e0c681dfd78911d0bcfe SHA512 f244587eb6d6f4443dd50f08d3603d6c738fa7e86a36dcb446110652e3a1e00287d2e7ab9dc642660d5452a6d246ea6fc228c0db3f5b79adeee28de352e21125
+DIST konversation-21.08.2.tar.xz 4251600 BLAKE2B 65c25a9ae2bfb062c4de4b64622c0dfc53df4ad6d95c261fc414abc187b3cefa0cab96697c89d63f89d46e75ad2df22cd9ff2ed5f12cee7eb6d6f8963dd79d0a SHA512 d208273a0eaedc458eea4ce8561aaa8bc8f29aa47bbfae64b8f295603b05dd949b2e946ace2b16f355badbc4a0bfc3d1828ce1b6b2ae0ac079209398393be81f
 EBUILD konversation-21.04.3.ebuild 1889 BLAKE2B 7586a70f020cc4c7a8cde2fd57ae31560166c5c6c89901a7609210eb562a7a20bee3f89cef75a06df9af9342802b9ce6b259b80b3d4fe81524fd9252233ae35e SHA512 eb7e13c31b80adae2e6c8091cff8216ec30b64789989d6eb0e087b78011c67d6bc6bea23e512d37927e2071a0623f27a9aaa7640aece63d46b7aca503c7ff82f
-EBUILD konversation-21.08.1.ebuild 1892 BLAKE2B aa2dedfd12a029f0a00e37ea22aed255cdbfef65e29077931839716c2acc4364bd4a488ac6fe82ca0a736a35d664e0b4580ab417bfad6f4572c9aa9248885225 SHA512 7e3c6459a1ddf527227d5dd4975551ea49b5b9d7af5a563be780fb427362903cb537f90b2822d480a292080d8448260ffd460f27b9e8238f0fde15c17e51869a
+EBUILD konversation-21.08.2.ebuild 1892 BLAKE2B aa2dedfd12a029f0a00e37ea22aed255cdbfef65e29077931839716c2acc4364bd4a488ac6fe82ca0a736a35d664e0b4580ab417bfad6f4572c9aa9248885225 SHA512 7e3c6459a1ddf527227d5dd4975551ea49b5b9d7af5a563be780fb427362903cb537f90b2822d480a292080d8448260ffd460f27b9e8238f0fde15c17e51869a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-21.08.1.ebuild b/net-irc/konversation/konversation-21.08.2.ebuild
index d000f114b818..d000f114b818 100644
--- a/net-irc/konversation/konversation-21.08.1.ebuild
+++ b/net-irc/konversation/konversation-21.08.2.ebuild
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 6834ca7a6d96..ffc4547485b6 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,6 @@
 DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
 DIST kvirc-5.2_pre20210630233331.tar.gz 6173417 BLAKE2B dcdb5fed3250de08d8e2896ba799e142ee04fff409006d7b7d06bdcf1cf2f6df9f7abeeb055e550d99f9cca6182d68b4f5b9ff224f78d91b1efb7f42118458e5 SHA512 625712cc69a2ab3a33b72b2e9935bec8f307ef1f8d5a9a0672d7eb8e7daa5ab3e6202a2b8932493c30374f0451821db161e47cb3af840c0324e27ca2e58272ef
-EBUILD kvirc-5.2_pre20200605155236-r1.ebuild 4697 BLAKE2B 784afc228a3ae0cd17a693b8c0f310fc282e68288b421e6fe7adfa53bfdb53696f616f2217bed8e601dc9c0d84c072be18783472cba7cd94da202f7b32e42aa4 SHA512 c3fdb6fb8bab951a787dcb40010eb3cbb868941abb16c64460db0cf7131586ddc551436aa432a9fb37b1320425077044ef9c323f58eaa0633d3d53bf36e8a071
-EBUILD kvirc-5.2_pre20210630233331.ebuild 4385 BLAKE2B f2da5634a15e6762af628324d8f8a0d86589d845d175fbf10e02bef8182081a79dfde26c5161b8637eb336b1c88c04170febef5e35ef3ff60014c9bd83e5c95f SHA512 545e94d07f2b450508c90ec7ee1a84cc3503d3afece0bca8273e28da2d2713ef282c38785a30082e2f91bb622fea861dfd396c78ef823cc78ff5515b97049b34
-EBUILD kvirc-9999.ebuild 4322 BLAKE2B 6d56fd720c48322b592fdc8d016900f2ebfac4c13b4ece9790aef2022e7b628c1ab2ca4e868fb2abb7b80f0d7496bd7a0da8e157180d78577d29cf6dcd09bba3 SHA512 e173009ac0d28e8d78fabeb2cd871af5e76c1443c80083b5959208fd22ba8a4dada7360c8ec836d45caa9b1347c97f99e51058da9b748970d7bd414428b7c0c1
+EBUILD kvirc-5.2_pre20200605155236-r2.ebuild 4642 BLAKE2B b00138565ed817577506495d684a2967cfd5d18fb214d680feffcb17438bbd4a7946ef299a54f30882eb50ded4a771fef3fe1650649c1e927e8389693b208445 SHA512 a979a2028d1a17486c0dff100011ec1d98b0a37f8f2b372145fad0dda850ff97554bfe1715a684af45fda21ec2e31eafd165848c44956ad08ae0c83f536532f4
+EBUILD kvirc-5.2_pre20210630233331-r1.ebuild 4330 BLAKE2B b3a3d5961b63de98c3f0d0cdac598a33c4f6b2614e4cfa2c163ef59b35d878b13332ef1d8d8b55d22a96827103582e7be4692f0d249efd77ffc83d72efc3e7ea SHA512 818c687c7fd5b6243cb296e7a8ce4707dc1394b8448c280a23875e31eeb34ae8f523c68b70841382cd322cdd6a1ffb27288400950fb0f73179aa7964747057de
+EBUILD kvirc-9999.ebuild 4267 BLAKE2B 188fb4abdab17615e94896d1bb76cab72006f99d0be8fd97808ddbe7d5456f4c9464bfa461d0623a489d9ba37917e4f108314fd5b2d49d6046fc4c70fe2ccf31 SHA512 23db2fcbf120fc5accc4ea257306a18bee13b2500a4ebfe29affe723616eb26b690e6a56f91f91063232ef0afd56582357fb5f9806f9b6d62d8939bce5bc82ea
 MISC metadata.xml 639 BLAKE2B 14486493e5a2241a08171e8d9bf2a4d1e33eab4c012720b4fc9927c0b3838c655dd6c66b17af96f59340bfef0845ff8ff763203db26cbbdfb37a1036ce6929fc SHA512 7fc9e62f0a7f2e3449a3faf5f3ee4f9d521e122c77fefa364584030b64e168651b8c323b633f6e13459b3a4c2302edc09f0fa1cb7c0a87d4d2e632ac62042a09
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r2.ebuild
index c92018013e98..dd4434e337ee 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r2.ebuild
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
@@ -72,7 +72,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libtheora
 		media-libs/libvorbis
 	)
-	webkit? ( dev-qt/qtwebkit:5 )"
+"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
@@ -135,7 +135,7 @@ src_configure() {
 		-DWANT_PHONON=$(usex phonon ON OFF)
 		-DWANT_PYTHON=$(usex python ON OFF)
 		-DWANT_QTDBUS=$(usex dbus ON OFF)
-		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_QTWEBKIT=OFF
 		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
diff --git a/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild b/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
index 06907a5543b4..d30be45428be 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
@@ -72,7 +72,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libtheora
 		media-libs/libvorbis
 	)
-	webkit? ( dev-qt/qtwebkit:5 )"
+"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
@@ -131,7 +131,7 @@ src_configure() {
 		-DWANT_PHONON=$(usex phonon ON OFF)
 		-DWANT_PYTHON=$(usex python ON OFF)
 		-DWANT_QTDBUS=$(usex dbus ON OFF)
-		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_QTWEBKIT=OFF
 		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 2393d5ae4c23..c123daed9574 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
@@ -72,7 +72,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libtheora
 		media-libs/libvorbis
 	)
-	webkit? ( dev-qt/qtwebkit:5 )"
+"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
@@ -131,7 +131,7 @@ src_configure() {
 		-DWANT_PHONON=$(usex phonon ON OFF)
 		-DWANT_PYTHON=$(usex python ON OFF)
 		-DWANT_QTDBUS=$(usex dbus ON OFF)
-		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_QTWEBKIT=OFF
 		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index b0cf55255413..c7e034745d77 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,5 +2,7 @@ AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f45
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
 DIST unrealircd-5.2.1.1.tar.gz 7174342 BLAKE2B 0d149807bcacd0604195948f3c5a7f538426741b38238bd00df76e7c2fa4b8603f86f325c2ba6f8f87bc72621e38fc5642b86aa081cf1f4f74cabc5cbdc89eb7 SHA512 d49a5fd9b02d6e43ec13f9195d226c10c4f2a7a7f0ac41c51b02a13fc287fea14c8fd73203fea773e57eb2e969cc4248abfdc24bd643a4f727222de7e4f726fa
+DIST unrealircd-5.2.2.tar.gz 7192024 BLAKE2B aa700c943cbab1dcc751e32c6cc0608cd27936b0910bbc62987dd2fe87ee5261e7a5eb2aa67dd77ed5ecb39d1d4f149c8810159e2c6f752ee65ce34e46548f60 SHA512 9d36eb1567431bc4a5420bc830bfc8dc89daa08ed1746efd6102e5ef161f67baf52e75e373454df7df6a443c4f575fb300d3c289d4dd99239a6de7d2b2a555a0
 EBUILD unrealircd-5.2.1.1.ebuild 5270 BLAKE2B 3739b771bf1ae28c50388e1342c49ff2ae7b9ed24192cbec79d3f73a64ddef47e3b75af6ced88159191d52efd56a88043b5916efcfc2d88b6a1d4a9b10934e4d SHA512 68ef5012365902fc9ed8d19a6142dc240f64e1518bf0a8c3e15ccd243fc23d975128569e44739314d08a73d5eaf1b9bd6e6e190bbe29ce56bd3795ff60fdd61c
+EBUILD unrealircd-5.2.2.ebuild 5273 BLAKE2B 3b46eb801598502853c3f319628c8c369fb1cd95a4d4bd1bb74c18e37dd7813aaaabe25705b38cda12a4f9e50144572e6abf925eb512edbda3075e9c115fe8e2 SHA512 3fab9ea37e3b845f5a233ade061f271489ffa7546b03f33bc0297bdb381a0a105b97f021bb863cc63056485157b0705e728da49ef6a688a0eabe9bfac7a3a280
 MISC metadata.xml 860 BLAKE2B 198191ef6f7cc07fede5439075736be578f72cc5e76e47eaa8c6ffc7e60af0ed57b1e00d43539487b99d094ab2d79f5d1797d870f80fd5eec4bddfff4ad54849 SHA512 8dd95561f5d8e9eda8ef236b1580f76a9cb182e0c1c97926fe146e3f2240101dc71a44696229de51307b898bc9cc95a2e52fd4149110557006af7aefd25f4850
diff --git a/net-irc/unrealircd/unrealircd-5.2.2.ebuild b/net-irc/unrealircd/unrealircd-5.2.2.ebuild
new file mode 100644
index 000000000000..cbe49ec07028
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.2.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit autotools ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	# File is missing from the 5.0.9.1 tarball
+	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f6cbf3b60554..8b1a1a5d0079 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,10 @@
 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
-MISC metadata.xml 935 BLAKE2B 0367a004b3413a137b22a26c7a03b074402b93aee882aa3c4a75d5525c4043721a2852263397be9b16200b040021ee9579fc7e6d0e56c17bb766e9bbc1b87a62 SHA512 38796673ad8d61425fa0bf6d40f84e608b8fafb591a7d2caa2a2102a161e9be8bc8c04ed6b37603d9b90f88322d51162bbe64aa739a19373217b151dca568e23
+MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
diff --git a/net-irc/weechat/files/weechat-3.3-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.3-cmake_lua_version.patch
new file mode 100644
index 000000000000..150fb28b680f
--- /dev/null
+++ b/net-irc/weechat/files/weechat-3.3-cmake_lua_version.patch
@@ -0,0 +1,9 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -35,5 +35,5 @@
+
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+-  pkg_search_module(LUA lua5.4 lua-5.4 lua54 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/metadata.xml b/net-irc/weechat/metadata.xml
index 1386bc85427c..185437d9ca99 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="relay">Enable relay plugin (experimental)</flag>
 		<flag name="scripts">Build infrastructure for scripting</flag>
 		<flag name="trigger">Enable trigger plugin</flag>
+		<flag name="typing">Enable typing plugin</flag>
 		<flag name="xfer">Enable xfer plugin support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/weechat/weechat-3.3.ebuild b/net-irc/weechat/weechat-3.3.ebuild
new file mode 100644
index 000000000000..48fd4089957f
--- /dev/null
+++ b/net-irc/weechat/weechat-3.3.ebuild
@@ -0,0 +1,172 @@
+# 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 +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"
+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.3-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_TYPING=$(usex typing)
+		-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
+}