gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-irc
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
45 files changed, 718 insertions, 907 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5f820f91872b..94beebb2b0c0 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index db0a68b62e99..c5ee2795cbcc 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -2,5 +2,5 @@ AUX anope-conf.d-v2 352 BLAKE2B 38bacb495ff0be9e8f8cc635bdd9eb1927b6d120bcb65ddf
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
 AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
-EBUILD anope-2.0.6.ebuild 5003 BLAKE2B 0eb8f26a3a0c7087aa783f227f42103acd083385e878fa81a057e6e68594489bb200558519ca7b5db50312b5268b199c6295d9fa0a9506d995748e94ee790e7c SHA512 c1652aac5bccd220f6c34bbe5837ed32efbf20df778628cb135e028f8a1c6310c09651dbb4017a7b35e3959a94af0d839952088f9dd6834eb897e3432ec9e66d
+EBUILD anope-2.0.6.ebuild 4979 BLAKE2B ca009b481a8525f64e63298bb25133de624e83096da624552b4ebec8f959054d0c7c717667af4dd11ceceebca3793fe672f24e9221325d697e8cd8ac04f6dbf3 SHA512 4e1f0d9637533e3ec04f28024cb87efa0cca1f11b65ffaf297ab21325389f227c5bd727610262ec81068dba3796dcb44c2e28d0b71d8b671d65b1e091e13415a
 MISC metadata.xml 1205 BLAKE2B 2e7f5630a4f37d67f2b0657cba7822989625944c17a3ddef390107ef6c2b1979666a380c3b1316cfe9b16f295c248dc0ec79ce7a3bf5a0c48f970dfeb64a992c SHA512 45d98156923f6b4c1736ed2310deaff937d63ab4a4da10275cfc57fb966eba6e9581f47a89d9825e58606a651395cadafe6ae9b36f153ad9c189ca12a30888ce
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index 1cf036e12d83..2953f690d0dc 100644
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils user
+inherit cmake user
 
 DESCRIPTION="Anope IRC Services"
 HOMEPAGE="https://anope.org"
@@ -98,7 +98,7 @@ src_prepare() {
 	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
 	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -111,11 +111,11 @@ src_configure() {
 		-DCONF_DIR="/etc/anope"
 		-DLOGS_DIR="../var/log/anope/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}/anope-init.d" "${PN}"
 	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
 	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 65578e346626..3f942de6a90e 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -3,8 +3,10 @@ AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e6
 DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
 DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
-EBUILD hexchat-2.12.4-r2.ebuild 3395 BLAKE2B 4864f65faca1ec423e2113a155ab923df44029865c52f676ff455b40aaff14795bd5a0fbd7217bf109be0cf4e51c39899f9df4abd981a266410ddba67406f9b2 SHA512 05b3d62742df949152b8569c4dc576b825c05516a74e259328ca0b982b37e610bf7549730e468d237cd198d82053719ba5700a41e626f02e3296cfe1f94f4432
-EBUILD hexchat-2.14.1.ebuild 3432 BLAKE2B 8983950236a678551f28d8ead96e0ba95eb3592d0812dba3ebcc771ba8b5e3fdd1c7d8f85a2f74a38a709ef8c6749111b357a97a1e9bef495e4dac4d0ceaafd6 SHA512 37014bd9d3166012550d55c3b408c07376003c89637df9c3c0ff8a818016bd13a5c6f2bbdbd4685b74e10a13602d73f699d7add1f8c3481da9015e802e99faf8
-EBUILD hexchat-2.14.2.ebuild 3499 BLAKE2B 6669ef0d2d8155eef88e46d178b4a79b2734fdac37e3af2326146cf2614f18ba4fb7c83f6a0a21680926b065f7654737b5c5942c621ae46582d65d2bb9b1a1ba SHA512 359e9988c3dfcf800548be12f0cd9f6766be0afbbec5bfaed17ace912da92f7e1b89b86f7b84b0ec2dfeafd4071c5722b21682684173b10e33c2e8055d9f442f
-EBUILD hexchat-9999.ebuild 3305 BLAKE2B 4579bbb5eeaccd7c098d42be95d1f2ab3d3a44ba5f3a78fabc4d9a97e14bc6444123055c01ffd6149b6e0c144a855487cf7a2f1c6143b44cf786b046a86040ae SHA512 65103faadd1fb9605e661c7ed4a170c37ff4c36618d55a82cca32785a7c37e1fd04d6903be5ea1a53ea758fe228c1dc4b0c853752e6df3d6a97fe46d5415897e
-MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
+DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
+EBUILD hexchat-2.12.4-r2.ebuild 3391 BLAKE2B 3a21d168b38fbdc21527f80f3c2c68eb4c2a26e76366addd8489c91b09e6342940e17bfd22702df64c3940d24db1f5ef0240baacfe455d771f6c45b3823cb32c SHA512 b45414fa5b7b1c32e0cdb88923fde03d0cd9c270e7c63fea692efcdf01b6ec2fe0a97c96df87ac7cf864889492be10a3584a6af52755ef43b0591cf33e87b644
+EBUILD hexchat-2.14.1.ebuild 3428 BLAKE2B cbdb884528e0d618059d676f438dd2bfa8e30582640b8f7de41c76e2db535560f9cd97b315b2c62f75951d55593329e021934872ac3dfba0dbb0cfbf63367198 SHA512 1d0e7eaa0e2dfe8466673dd9fd3243d82146f547fb2379344e688dc42a4280617e350a017fc082c9126880b11ea013dbed2dc8e002141340b573c6a8802472bd
+EBUILD hexchat-2.14.2.ebuild 3497 BLAKE2B e3ad65500058c3115459628c6ad27d504c7b85d02719ad8febf58b4be5571d5d454ea7afd8fe3ccb85d9459a3fe3f4ce0ef3bd576dd7e4f8dc1622e06eac81d4 SHA512 d91c20a9595b120a22d1b1fc6be880428c98614f3569010cfd5c2976f5cb6794c0526742d80777a65680b0ce6d25bc76f4f64306475be46cf9a9720cc0c087d3
+EBUILD hexchat-2.14.3.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
+EBUILD hexchat-9999.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
+MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index ccfbc8588e83..b6bef524098c 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/hexchat/hexchat-2.14.1.ebuild b/net-irc/hexchat/hexchat-2.14.1.ebuild
index 39418acb1e0c..fff912b65a12 100644
--- a/net-irc/hexchat/hexchat-2.14.1.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
diff --git a/net-irc/hexchat/hexchat-2.14.2.ebuild b/net-irc/hexchat/hexchat-2.14.2.ebuild
index 80a6f2e61243..468d7e687778 100644
--- a/net-irc/hexchat/hexchat-2.14.2.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
diff --git a/net-irc/hexchat/hexchat-2.14.3.ebuild b/net-irc/hexchat/hexchat-2.14.3.ebuild
new file mode 100644
index 000000000000..afa1fcb48980
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+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 )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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 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=(
+		-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 lua 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_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${D}" -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 9457dba03b86..afa1fcb48980 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson mono-env python-single-r1 xdg
 
diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml
index 664c39dbe60e..a9f4370c0437 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -2,14 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>anthonyryan1@gmail.com</email>
-		<name>Anthony Ryan</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 484e0967b77e..114b1b7757e9 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,20 +1,5 @@
-AUX 2.7-Register-author_name-as-author-instead-of-email-user.patch 1637 BLAKE2B 0135ae4630bdde26f1454f4a0e70dcdcb281cbeed1ccfdcaea1d1dd30846102d02422d882498ecfb47f719ef4ff622cd94d38b77e24eb0503826bd29b4b47181 SHA512 e72636b7be72d1f896afded5dd566c9876854dc41b1bce3fb9d84e47ac8267a52bc15e315a268f95bb747231178698d59d9cc9136e19619781261049404cfb10
-AUX 2.7-irkerhook-Remove-file-listing.patch 6023 BLAKE2B eaa0d8b2cb7ce8395053b6648c2a03ecfc20c5969c63e79c96509c89f64b698d79d4a8e596728058dfb59348944f11ad1dedb51f96574f2b0fb61a0c8aa155ec SHA512 a8ecca687b356280581f04f28879044a6c36c3819743312f1e14fb11ce2f83a859eb1fb5fe804640adf969578f6575ce774b4df665ed48721eb0face63ea212f
 AUX irkerd.confd 474 BLAKE2B 150e953ff1db373cb2b9010d4136866156fac7b6816ea12041bbb7d49862e93288d329605da5e935ec92f809d8b9774b5086cb910d1e9741efff707d8fde0edb SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010
 AUX irkerd.initd 1125 BLAKE2B 4675bb07c523414810432b22954629e80758745b3ebcd8d9b6e203a699d776066871819a505cc4c249425b01fe04b4e818365d78bb2161f92cac89f3e62fe592 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368
-DIST irker-2.11.tar.gz 41504 BLAKE2B a3baabf3021a25acb8d91b7fc24321f2fe962725add38c274e0ed0ff25c120b6b008656d549a32c40b01046e697195ba9ad0cfa8b07767291d0aa722d8db0ecc SHA512 b95824f8a68103f7094b13044263e422e98efef163425d88217a7c3f89ef83bf8c4116055b34f92d86ce1641f9c74215a4488c084eba95c56f8cf95fc8067e9b
-DIST irker-2.12.tar.gz 41693 BLAKE2B 923a3bbfaad490bf5b2c6c6073336b329f5c90324c5be10c54cee02ee05d5097689b5613e2366f0230780fa8230d508c0f8f504c5a59b600a8d4b39901c61837 SHA512 73606deb3f2b96d72501e876dd05f146e62298fa1f7a051c0f831f0db9fc9554f991b1d645c17ccb9032c7da287c142eedf69b262cf3445ae6b0937a24a5bdb4
-DIST irker-2.13.tar.gz 42733 BLAKE2B e6a630c9ba2f64a971f53c8d4f2664153bd0c8afd141fd2c9a1278a85e2360bf9324783420af05039d00b1fd8a54889b189dca0e35fda3ba746b84bbad75e711 SHA512 5aa86354b5f3dabd7e2b46c62df4298b3bc675757b71ee03e2068d9ad14dc35127fb4076ef819ddd0ae84d82937c540516ed77ab5f1177af6dc7381df56af3ac
-DIST irker-2.15.tar.gz 43765 BLAKE2B 0b69f8d61bc4368e686e48fda8823a02ef1c4c0ce1eb2d689c885f181ae5f37659af92e24b25d496395c3081d06d9c2528e61999374d549d0e04d856e635c2cf SHA512 94f4bb33a320f4284d03e75c7090ea4714d30d879e1abbf757c3e6eff8898ca5664f718c6ab2f35cae8377c348d41bc9100832b8a70f1b9f1a03c6f7487c2bfe
-DIST irker-2.16.tar.gz 43824 BLAKE2B 85043f3a2f9d4d10570b856a0e561c439dc584892bac1625ecee304e234e34e33b0fca97bc39b252ef224c3ac12c420fff699eda349d0264fe342e993e99e3b9 SHA512 6a58938e1d458ad9183d750b4f6d1a4827fffd85caf7c0215c2fa1a9ef5692570c5181ade28f59701bef7398fdc0cfa760fe70d9432b7e54dc7fa663a558fed4
 DIST irker-2.18.tar.gz 44284 BLAKE2B 355d9004c77c7635e5ee068d6521b2d1b8c3e0ae4b0d2fa39e71c16a4ecc2272c5a487dafd296a3d02aa5072c734f454875939b99f66c4321ab2970da78216ef SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606
-DIST irker-2.9.tar.gz 41050 BLAKE2B 1cf24c57acd511eed14028187ae0195c54a9d5b2a5daa245875afa44af52fd63aae5495b271ea8f1106c34a1c6bfff44d3dd0d7d60556835c20ba9b41112a4ec SHA512 bdb632414c87ebc3f0d480605a29823d9259defe63a6c6de8f5d1876c13f5a4ab90ef7956a83f62aedf08f17494be7a67bc414e2e30101608f565afd115c5c0f
-EBUILD irker-2.11.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
-EBUILD irker-2.12.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
-EBUILD irker-2.13.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
-EBUILD irker-2.15.ebuild 1417 BLAKE2B 9af7105677b7997cf8f93431484553a65606ee20003827487bf1fa49b0b95a2c9925b09d71c4a3ab37b2a99ca7f9aad0176d95854264d2a77fce95ea18a3efe9 SHA512 9618bcb3630c42443bfdd5dc1143bce97b7145d66fd75cae92a5e6379886e509e934a5ccbfd9ba04cd3494cef25d353629f378f4104ffe66b308980ba7cef265
-EBUILD irker-2.16.ebuild 1419 BLAKE2B b476edd5616f76a182370db97a4e03c3385b2bc149481f81e06a11cfe9e0d524ec128f38815352b216923f542e664612caa0f304df1680f172e31d729a3f0cb6 SHA512 0e212ab27049326fe475c2d8f078b80508fd08057ef21906150434eb5294f9210e78e09ba1ca0dea7814c9944975d3339f7f4a2704841d45c907ba38d41365b3
 EBUILD irker-2.18-r1.ebuild 1307 BLAKE2B 041e6a611d5b0afaad38f38a7a6f49b0d15b0b7cc2712c726c93460550aa6c9f7e5ce3265249e592bdd3943bf881f2284f0740031e21372126739f0a9e34b72c SHA512 5408c1fcbc4bdee662c61fdab9f0eb4cc8264770e4389d919c7b7d77f5887abb9dd4e421bf9e693639dcd8fa67528847ab3a4f99609e70962bd3121504907ba4
-EBUILD irker-2.18.ebuild 1270 BLAKE2B cdc078bff59ef58e842c0769f140c50e4d8a57df1d941874442ace62642d81d59fadc1850cd6d31b78c06a71aaa2f0260cfea4d5490d5c03f39ceb7fc0e64f06 SHA512 a8e6b93f05f2b89063817563329c21f0a7d71b8b7508e1cc07ffd6e7cf082dacfca87b4fa1e0d754222ec5615731775f13d9b5d0f5e7c6c4701ba84b48518516
-EBUILD irker-2.9.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
deleted file mode 100644
index a19da1f4a48d..000000000000
--- a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 108e898c600cf7a80a3d01a83a270c7579460b42 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <beber@meleeweb.net>
-Date: Mon, 23 Sep 2013 23:10:23 +0200
-Subject: [PATCH 1/3] Register author_name as author instead of email userpart
-
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
----
- irkerhook.py | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 5f15032..36a875e 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -275,15 +275,8 @@ class GitExtractor(GenericExtractor):
-         # Design choice: for git we ship only the first message line, which is
-         # conventionally supposed to be a summary of the commit.  Under
-         # other VCSes a different choice may be appropriate.
--        commit.author_name, commit.mail, commit.logmsg = \
--            do("git log -1 '--pretty=format:%an%n%ae%n%s' " + shellquote(commit.commit)).split("\n")
--        # This discards the part of the author's address after @.
--        # Might be be nice to ship the full email address, if not
--        # for spammers' address harvesters - getting this wrong
--        # would make the freenode #commits channel into harvester heaven.
--        commit.author = commit.mail.split("@")[0]
--        commit.author_date, commit.commit_date = \
--            do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
-+        commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit))
-+        commit.author = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
-         return commit
- 
- class SvnExtractor(GenericExtractor):
diff --git a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
deleted file mode 100644
index cbbb38c22ea6..000000000000
--- a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 82376d74107035950ef4181fdc889ae9409378b6 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <beber@meleeweb.net>
-Date: Mon, 7 Oct 2013 13:33:30 +0200
-Subject: [PATCH 2/3] irkerhook: Remove file listing
-
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
----
- irkerhook.py | 34 +++-------------------------------
- 1 file changed, 3 insertions(+), 31 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index 36a875e..f2f82cf 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -57,7 +57,6 @@ class Commit:
-         self.rev = None
-         self.mail = None
-         self.author = None
--        self.files = None
-         self.logmsg = None
-         self.url = None
-         self.author_date = None
-@@ -224,7 +223,7 @@ class GitExtractor(GenericExtractor):
-         self.channels = do("git config --get irker.channels")
-         self.email = do("git config --get irker.email")
-         self.tcp = do("git config --bool --get irker.tcp")
--        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
-         self.color = do("git config --get irker.color")
-         self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
-@@ -269,9 +268,6 @@ class GitExtractor(GenericExtractor):
-             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
-         if not commit.rev:
-             commit.rev = commit.commit[:12]
--        # Extract the meta-information for the commit
--        commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
--        commit.files = " ".join(commit.files.strip().split("\n")[1:])
-         # Design choice: for git we ship only the first message line, which is
-         # conventionally supposed to be a summary of the commit.  Under
-         # other VCSes a different choice may be appropriate.
-@@ -292,7 +288,7 @@ class SvnExtractor(GenericExtractor):
-             if tok.startswith("--repository="):
-                 self.repository = tok[13:]
-         self.project = os.path.basename(self.repository)
--        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.urlprefix = "viewcvs"
-         self.load_preferences(os.path.join(self.repository, "irker.conf"))
-         self.do_overrides()
-@@ -306,7 +302,6 @@ class SvnExtractor(GenericExtractor):
-         commit.rev = "r%s" % self.id
-         commit.author = self.svnlook("author")
-         commit.commit_date = self.svnlook("date").partition('(')[0]
--        commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ")
-         commit.logmsg = self.svnlook("log").strip()
-         return commit
-     def svnlook(self, info):
-@@ -350,7 +345,7 @@ class HgExtractor(GenericExtractor):
-         self.channels = ui.config('irker', 'channels')
-         self.email = ui.config('irker', 'email')
-         self.tcp = str(ui.configbool('irker', 'tcp'))  # converted to bool again in do_overrides
--        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-+        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
-         self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
-         self.color = ui.config('irker', 'color')
-         self.urlprefix = (ui.config('irker', 'urlprefix') or
-@@ -380,9 +375,6 @@ class HgExtractor(GenericExtractor):
-         commit.author_date = \
-             datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S')
-         commit.logmsg = ctx.description()
--        # Extract changed files from status against first parent
--        st = self.repository.status(ctx.p1().node(), ctx.node())
--        commit.files = ' '.join(st[0] + st[1] + st[2])
-         return commit
- 
- def hg_hook(ui, repo, **kwds):
-@@ -423,27 +415,7 @@ def ship(extractor, commit, debug):
-             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
-             raise SystemExit, 1
- 
--    # Rewrite the file list if too long. The objective here is only
--    # to be easier on the eyes.
--    if extractor.cialike \
--           and extractor.cialike.lower() != "none" \
--           and len(metadata.files) > int(extractor.cialike):
--        files = metadata.files.split()
--        dirs = set([d.rpartition('/')[0] for d in files])
--        if len(dirs) == 1:
--            metadata.files = "(%s files)" % (len(files),)
--        else:
--            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
--    # Message reduction.  The assumption here is that IRC can't handle
--    # lines more than 510 characters long. If we exceed that length, we
--    # try knocking out the file list, on the theory that for notification
--    # purposes the commit text is more important.  If it's still too long
--    # there's nothing much can be done other than ship it expecting the IRC
--    # server to truncate.
-     privmsg = unicode(metadata)
--    if len(privmsg) > 510:
--        metadata.files = ""
--        privmsg = unicode(metadata)
- 
-     # Anti-spamming guard.  It's deliberate that we get maxchannels not from
-     # the user-filtered metadata but from the extractor data - means repo
diff --git a/net-irc/irker/irker-2.11.ebuild b/net-irc/irker/irker-2.11.ebuild
deleted file mode 100644
index 9b6fdbbae2e1..000000000000
--- a/net-irc/irker/irker-2.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.12.ebuild b/net-irc/irker/irker-2.12.ebuild
deleted file mode 100644
index 9b6fdbbae2e1..000000000000
--- a/net-irc/irker/irker-2.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.13.ebuild b/net-irc/irker/irker-2.13.ebuild
deleted file mode 100644
index 9b6fdbbae2e1..000000000000
--- a/net-irc/irker/irker-2.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.15.ebuild b/net-irc/irker/irker-2.15.ebuild
deleted file mode 100644
index 6965033dce31..000000000000
--- a/net-irc/irker/irker-2.15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 systemd eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Rely on systemd eclass for systemd service install
-	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
-		|| die "sed failed"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	systemd_dounit irkerd.service
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.16.ebuild b/net-irc/irker/irker-2.16.ebuild
deleted file mode 100644
index 9ebbbfed8aed..000000000000
--- a/net-irc/irker/irker-2.16.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 systemd eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Rely on systemd eclass for systemd service install
-	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
-		|| die "sed failed"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	systemd_dounit irkerd.service
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.18.ebuild b/net-irc/irker/irker-2.18.ebuild
deleted file mode 100644
index a74d4266ec38..000000000000
--- a/net-irc/irker/irker-2.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="socks5"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
-
-DOCS=( NEWS README hacking.txt security.txt )
-HTML_DOCS=( irkerd.html irkerhook.html )
-
-src_prepare() {
-	default
-
-	# Rely on systemd eclass for systemd service install
-	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
-		|| die "sed failed"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-
-	python_doscript "${ED%/}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	systemd_dounit irkerd.service
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.9.ebuild b/net-irc/irker/irker-2.9.ebuild
deleted file mode 100644
index 9b6fdbbae2e1..000000000000
--- a/net-irc/irker/irker-2.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 eutils
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto"
-
-src_prepare() {
-	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
-
-	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	python_doscript "${ED}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	dodoc NEWS README hacking.txt security.txt
-	dohtml irkerd.html irkerhook.html
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index fdc60a4fe037..b1ce851b0d43 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -2,5 +2,5 @@ AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079f
 AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-EBUILD konversation-1.7.5-r1.ebuild 1844 BLAKE2B bbdd2c34ef325e62318fc386bd3c7ce7a5e771000ecddf245b1430b5c5ce02e8979374da40c0cf1e1003b00f52b60dc38ed3839c4ac3df8363ef905fd5a7f048 SHA512 c2500d12a6d5d1da102fce2d033d1d45b83bb7b080b34d1fcc0699fb01a29d30171a2828784ac4f0e359d163c596103bf9f4824635f6243d485a776b1a38d9ae
+EBUILD konversation-1.7.5-r1.ebuild 1838 BLAKE2B d9f35c6b307d0c346c6083979d27fb3d3613b154711ef7174a128cf0e39e3eb34d35a7a9293f863549aa59d7dc4501310bbab829b20bdfec0c7ee081cb260625 SHA512 33a64a614aa46b6c821e4dc8c60ffe841a50226ac56a7c7bf7d28cfc0efefd6f4e9426b228af3275dc1f8802ce64b3d11753ef7945e913779186b7ea6d87ba8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
index 7b1f0f864bb1..133d38ba0b76 100644
--- a/net-irc/konversation/konversation-1.7.5-r1.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -60,7 +60,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package crypt Qca-qt5)
 	)
 
 	kde5_src_configure
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index 76fbd52ba587..d26ea30c5bed 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,4 +1,4 @@
 DIST limnoria-20191123.tar.gz 975077 BLAKE2B b5bc425013a30043c79a5dc53fc346e3b65cafbae154789f43634fc8beb4c7dcfaea34b0c1e22eae28e044eaa2801b0c29ef106fd6e2cc0095e6acbf4c4bf931 SHA512 5822f83a5d7fae0e45e526d9a72c1bbfd2acb7f625cff38e4d6e59222aca4c68204ae03069e991e274b108391cd4feff85783805657554771a7d24789589d14b
-EBUILD limnoria-20191123.ebuild 2526 BLAKE2B 53f2de19f2822a0dd51de9d8caf943ed4b337b42d73344c165fdbcfd9f04a8df7b0528e3d23834a529faa157d75c0db724fa65064c34a9e998a3fcb8ed48adf8 SHA512 d7f024b8a95e7415e8f6ac2b9d8f123fcd70cfc192a2a49aba9e6a248274ab94f05a059b5df880abf755e2a52a5104569cc0eeb1c031cd862140fea867228893
-EBUILD limnoria-99999999.ebuild 2526 BLAKE2B 53f2de19f2822a0dd51de9d8caf943ed4b337b42d73344c165fdbcfd9f04a8df7b0528e3d23834a529faa157d75c0db724fa65064c34a9e998a3fcb8ed48adf8 SHA512 d7f024b8a95e7415e8f6ac2b9d8f123fcd70cfc192a2a49aba9e6a248274ab94f05a059b5df880abf755e2a52a5104569cc0eeb1c031cd862140fea867228893
+EBUILD limnoria-20191123.ebuild 2522 BLAKE2B 9b6ab6a0bddfe2cb389a8439ab94bb890a82212c1ce2eb0e1fe21c4c80b79e5f60c1ad1cbb2ba58835727eab2cc3184cf06bea6da18e900033d6a8a7921859a0 SHA512 dcde06cb72711f6e452606f5be6b19412ac6ec6c473f2e8c684fe17e32fd47cc75686254980103f629e83530ef8c8812e08d30c0717534c65d1b5a273c2aa6be
+EBUILD limnoria-99999999.ebuild 2522 BLAKE2B 9b6ab6a0bddfe2cb389a8439ab94bb890a82212c1ce2eb0e1fe21c4c80b79e5f60c1ad1cbb2ba58835727eab2cc3184cf06bea6da18e900033d6a8a7921859a0 SHA512 dcde06cb72711f6e452606f5be6b19412ac6ec6c473f2e8c684fe17e32fd47cc75686254980103f629e83530ef8c8812e08d30c0717534c65d1b5a273c2aa6be
 MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e
diff --git a/net-irc/limnoria/limnoria-20191123.ebuild b/net-irc/limnoria/limnoria-20191123.ebuild
index 204411eeee8f..87f53168aaae 100644
--- a/net-irc/limnoria/limnoria-20191123.ebuild
+++ b/net-irc/limnoria/limnoria-20191123.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild
index 204411eeee8f..87f53168aaae 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
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."
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index cc7c17d20d50..1cdadfa3d720 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,6 +1,6 @@
 DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2
 DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
 EBUILD quasselgrep-0_p20170411.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
-EBUILD quasselgrep-0_p20190211.ebuild 905 BLAKE2B 8f359eeb4bec8ac8c675e1ff2431f0806a6b87f2623f9f4dd6f54325c4265a1cbecbc0506dcebeb5a3056f5e8aaa16e7d417ca34d1a55d07fa649674c30c58db SHA512 6881a85b6653c48941e0b55ff21e8db73b79d6c7b83003115a0e3cf0002259084b8dc3230aa8c263fafc25b110a91105c9a79f886db6c6b1739bede9f46841ea
+EBUILD quasselgrep-0_p20190211.ebuild 903 BLAKE2B d7f3aa2a39c1068b47455d3e7b51c87e22cbd9d117c46e38129a21a10a491c21e7e0c2b046abc71b2688171fb2b85907f3804903cf0d35b26cdc19763e0e441f SHA512 419e9d8499a58fb61c252cfb7fcf0ec860f4d2fbb6f5518c3cb091a72dfc1d7317ce277df3f8a19911e246ab41ae05697d19fcad3c4beafaafccce13f41c240f
 EBUILD quasselgrep-9999.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
 MISC metadata.xml 540 BLAKE2B 21eee2edee345166e7191d71bfa727b2154d34bf0d7f839b1e6eca4ce5b65380ce96e25a35bf614a64a0e29edf30a4c860ec1b4ca364ffdc1563515e0169278a SHA512 67258ac5217d9338c963a9970eb556497643eac6b743c033d964164127bad7411918b870d63885863ce09bbbd2fe5a0623a58eba1dc68d9432401e5dd971ceef
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
index b4bd7c876391..74bef9e7a4f7 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE=( sqlite )
 
 inherit distutils-r1 eutils
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index b5b7f5b3f8d9..e56cb955dac2 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,5 +1,9 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
+DIST unrealircd-5.0.0.tar.gz 4891870 BLAKE2B f65156e83e2fbdbbf1f843199fded988cf3aa5304de877e1a1804ae2409308aa17ced6ed875f569313026f94fd0fb82d8f23f64b58661912a32de9f17ebadb81 SHA512 48fd93b0edcd3d9489fd9d1c7ea8b60ad3404383ec126df2840be587b087e2f9a6b267e08f616cdd63b3e33f498c552f4cfa5d6b9db820cb73da0fc6ba86e333
+DIST unrealircd-5.0.1.tar.gz 4892906 BLAKE2B bf3515dc962ead462b32dd3a2dd44b292306ea4c64f1405c54e89d835565506394b5dab9d244a9df316afc150808baddcb53c500ef026db50c570024295cc4e1 SHA512 5ca8a05f985d07ad9e676c39a8ba5e1409797a155a9df505f685ab4d6616af30ad3946b933df75bdea66ab3984578af77144f67bea7fd65b16ba6da250c09eed
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
+EBUILD unrealircd-5.0.0.ebuild 4884 BLAKE2B 9177549b30047dd8b13973cf3adfec87fff58e2bf70b489ee31697f14a97aac19acc7e0d0306e36baaae88600481991511e866a4648e541328b7928e177763a5 SHA512 b9c81784aa1c48f90b70b300366b4d5b8d0d54ec1f3583bb4e10bb0b97e88b21d04af61f0d63be889bca26a4d64a213104d5bd34fc568ecaf4db394a0b523c85
+EBUILD unrealircd-5.0.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.0.ebuild b/net-irc/unrealircd/unrealircd-5.0.0.ebuild
new file mode 100644
index 000000000000..6a996cec84fe
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert
+
+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 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	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
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+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
+}
+
+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/unrealircd/unrealircd-5.0.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.1.ebuild
new file mode 100644
index 000000000000..10fd8b753269
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert
+
+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 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	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
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+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
+}
+
+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 a55d9819c9ca..a53df612d8ba 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,8 +1,6 @@
-DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e
 DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
 DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075
-EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df
-EBUILD weechat-2.6.ebuild 3806 BLAKE2B 1628dcae2d76ed893bee5a6aef70c698f186a0ae5986dec54e67bb6f091b4d021e84d3ba8be45cdad2380ae00c47bbf9c5970dc32e180121df5eb8ffb050e0d2 SHA512 86cec1a4fb2fb5c2b7ae79994af2ae47eb97401966785a8dfb5615cbbdef842b5c1ba484dcceaea7195d2ae426b0f3d88b47c85c1e6d6d56b49205148ebdffb6
-EBUILD weechat-2.7.ebuild 4035 BLAKE2B 289bc31dfd0db3f12cc6916af99d12cd015ab8770de3c979fb422283d6c80a1a1adf518cf7375f435ae2a7011c0963f907eb8cbaaf1971ffcf40b749ab6a8945 SHA512 2b8c211f55b141c2979211b11f1f1282b6dfb7ec18b19eabeba3cd8a99c785792ec025644a5b4be81a6f661a582df839bce52561f28f698c55754f9849ab46ff
-EBUILD weechat-9999.ebuild 4035 BLAKE2B 289bc31dfd0db3f12cc6916af99d12cd015ab8770de3c979fb422283d6c80a1a1adf518cf7375f435ae2a7011c0963f907eb8cbaaf1971ffcf40b749ab6a8945 SHA512 2b8c211f55b141c2979211b11f1f1282b6dfb7ec18b19eabeba3cd8a99c785792ec025644a5b4be81a6f661a582df839bce52561f28f698c55754f9849ab46ff
+EBUILD weechat-2.6-r1.ebuild 3809 BLAKE2B c784712973a63249ac9f70c0f0297c4cd1de4dd2be0a96ff52e950978b7257b8808118326f741ffa7f2ed316ffb380e5f845b5ca143c3c31d17f88d970ed5d8e SHA512 50de01e96d0fceb905d687cc8009cf92b1dd3448698b939cef8a9bdb7fe7e4fb66379abfc1bc0710b4f8c107a3e358db40233995f2fab3d1cb3d662a31a0cc7c
+EBUILD weechat-2.7-r1.ebuild 4038 BLAKE2B f4c7da14b1e5e512aca5f389aafe3bbceba565de3a4443990a32cf242f58a2ba8cbb23c95e5d2b1143344d13e6cb50e801d48ee111ed59729c527c7d2ce9d067 SHA512 6d942fb4083587555d7df58f76dadb30bffed387712506fd5824111e88f7672d8c3d3608711aa42f86045a003aba02387dd16cbb62a7ae1cca42e26748706763
+EBUILD weechat-9999.ebuild 4038 BLAKE2B f4c7da14b1e5e512aca5f389aafe3bbceba565de3a4443990a32cf242f58a2ba8cbb23c95e5d2b1143344d13e6cb50e801d48ee111ed59729c527c7d2ce9d067 SHA512 6d942fb4083587555d7df58f76dadb30bffed387712506fd5824111e88f7672d8c3d3608711aa42f86045a003aba02387dd16cbb62a7ae1cca42e26748706763
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-2.5-r1.ebuild b/net-irc/weechat/weechat-2.5-r1.ebuild
deleted file mode 100644
index de58c93e68cd..000000000000
--- a/net-irc/weechat/weechat-2.5-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit cmake-utils 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 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-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 +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_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=/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_GNUTLS=$(usex ssl)
-		-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)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-irc/weechat/weechat-2.6.ebuild b/net-irc/weechat/weechat-2.6-r1.ebuild
index 1752bb52e420..ebc19139affa 100644
--- a/net-irc/weechat/weechat-2.6.ebuild
+++ b/net-irc/weechat/weechat-2.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -39,7 +39,7 @@ RDEPEND="
 	lua? ( dev-lang/lua:0[deprecated] )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
+	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
 	ssl? ( net-libs/gnutls )
diff --git a/net-irc/weechat/weechat-2.7.ebuild b/net-irc/weechat/weechat-2.7-r1.ebuild
index 545aee9eafe2..30697d7c964a 100644
--- a/net-irc/weechat/weechat-2.7.ebuild
+++ b/net-irc/weechat/weechat-2.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -39,7 +39,7 @@ RDEPEND="
 	lua? ( dev-lang/lua:0[deprecated] )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
+	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
 	ssl? ( net-libs/gnutls )
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 545aee9eafe2..30697d7c964a 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -39,7 +39,7 @@ RDEPEND="
 	lua? ( dev-lang/lua:0[deprecated] )
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:* )
+	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
 	ssl? ( net-libs/gnutls )
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 7a7c3c076c3f..5974068f7539 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -5,7 +5,7 @@ AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a1
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
 DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
-EBUILD znc-1.7.4.ebuild 5136 BLAKE2B 9da65f5082990c05489a504872fbb653ae191cedd2c723efaef264c5d2329498b2def1143546d1adb813d348071fdb0d37a60d530f4111228d5baeecf1013248 SHA512 8ff7dd79686cc94e10e51852d5dae57a2459679c705beb890cfc810c7a262648ac25a620f48d0809ccd91855b235e17361d05900d32f9266c61339cb1e0fd78e
-EBUILD znc-1.7.5.ebuild 5139 BLAKE2B b42931651ab6253ea0b77e5d659dbac1db7915176e353392494739003d1641fb99bbcfb17f20f9d1937f225acfb8df7debf72c8338baf3064efeffb13502aa2a SHA512 2de8a6650a6b133258fe78851215860bb8daa5ea6c337fc401d9becd0208e244a7f032627aaaa61d4247700c8d088b6ab35c1c030b52c658a2eb7b9d221a7cde
-EBUILD znc-9999.ebuild 5139 BLAKE2B b42931651ab6253ea0b77e5d659dbac1db7915176e353392494739003d1641fb99bbcfb17f20f9d1937f225acfb8df7debf72c8338baf3064efeffb13502aa2a SHA512 2de8a6650a6b133258fe78851215860bb8daa5ea6c337fc401d9becd0208e244a7f032627aaaa61d4247700c8d088b6ab35c1c030b52c658a2eb7b9d221a7cde
+EBUILD znc-1.7.4.ebuild 5134 BLAKE2B 31bd284fc0ece9ee5f6790171a94193e36b19dc200a8adc79b5605e47a3936d4ea1fa4f77431762b65d876d6d6bd78320715e9d3cadd9c9a8c5899699d938265 SHA512 73cc767efc33a7cfca17967035d98d5e30de22cbb97566ee9d754d2db5137f425db8bdae458d22651d17b9efd056f48cb8016049b1055ba817774240f873dc8a
+EBUILD znc-1.7.5.ebuild 5137 BLAKE2B 516fb575d9ae7425af9a4cd01d93c337bf8c7a486417b7bdb58c47fe0ced239969b5caaee8f15745340097524788613cd88069e35a9e91cfca24fb10a7dd2c2e SHA512 780522547629c77123716116f6247652de57fb5f7d1171721551d455fad99a90ed3f1456b4ae4e344373f97686eb1da50f791c2e2e7e3c9df38685d3a2c3e11b
+EBUILD znc-9999.ebuild 5137 BLAKE2B 516fb575d9ae7425af9a4cd01d93c337bf8c7a486417b7bdb58c47fe0ced239969b5caaee8f15745340097524788613cd88069e35a9e91cfca24fb10a7dd2c2e SHA512 780522547629c77123716116f6247652de57fb5f7d1171721551d455fad99a90ed3f1456b4ae4e344373f97686eb1da50f791c2e2e7e3c9df38685d3a2c3e11b
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index 92763dca915e..899adac5a0d4 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 6176d1304602..e703db8161dd 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 6176d1304602..e703db8161dd 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-irc
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)