gentoo resync : 19.03.2019

15 files changed, 271 insertions, 28 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ba8447d027e9..5e67e18872e1 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 575e2af22759..3aa123f65a74 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -6,5 +6,5 @@ DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a4
 EBUILD hexchat-2.12.4-r2.ebuild 3400 BLAKE2B 09d73fc326969f64acb81b751e7a67195f4c82a2edaece1b9254ba121696c2305d353d6c4155075df26861650fbd94b22547e6cb0e931fef08a7b89f0a05da0d SHA512 6afb1a4a62a94107f25539af6a5f8f5da90fab8371ea9da7c7cb7e7173fe6e37a5667f0aec38d3478b49e429f94e8c3e47b400933e1a0fefae671dfb8539b7dc
 EBUILD hexchat-2.14.1.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
 EBUILD hexchat-2.14.2.ebuild 3499 BLAKE2B d6aa041a676aa54d856115b29fa93a3816092938c3cc7545f53141d6efdb4f508a8725b38433787b95f7f826fe239dfa49dd9c8d3342942c61181169d7e619a8 SHA512 d784848d687a1b469cc701f3fcf889c23c48e1d38915fe31d4fdeb99811451c7c40d1f11ed7d9b1cea6010174f18f14492f4a7f92d81680839f530d312eaab7a
-EBUILD hexchat-9999.ebuild 3499 BLAKE2B d6aa041a676aa54d856115b29fa93a3816092938c3cc7545f53141d6efdb4f508a8725b38433787b95f7f826fe239dfa49dd9c8d3342942c61181169d7e619a8 SHA512 d784848d687a1b469cc701f3fcf889c23c48e1d38915fe31d4fdeb99811451c7c40d1f11ed7d9b1cea6010174f18f14492f4a7f92d81680839f530d312eaab7a
+EBUILD hexchat-9999.ebuild 3305 BLAKE2B c3d9dc45c4c2f0d8d2d0165a6791e3a57f87bf9a62506fa4eeb81753f0348476eaa2784eb2133b349fbaef934d1876e343cc7218bc952cda1780c4be4475300f SHA512 3948f8562ac093a5fc0892e0cbc0f30e57b4d0fa74b6cdf4a2e054a56983006c77399446dc5621ea1a8018a10b9f3ee15beafb3dfb4432feb27eb0b947f64524
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 7ef4db04615b..1b4f2fa60674 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6,7} )
 
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
+inherit meson mono-env python-single-r1 xdg
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="https://hexchat.github.io/"
@@ -24,7 +24,7 @@ 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} )"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/glib:2
 	dbus? ( dev-libs/dbus-glib )
 	gtk? (
@@ -51,9 +51,8 @@ COMMON_DEPEND="
 		)
 	)"
 
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	app-arch/xz-utils
 	app-text/iso-codes
@@ -100,15 +99,13 @@ src_install() {
 
 pkg_preinst() {
 	if use gtk ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
+		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\"."
@@ -130,8 +127,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
+		xdg_pkg_postrm
 	fi
 }
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
index 49e68bf4c10d..34619733704d 100644
--- a/net-irc/irssi-otr/Manifest
+++ b/net-irc/irssi-otr/Manifest
@@ -2,6 +2,6 @@ AUX irssi-otr-1.0.0-cflags.patch 555 BLAKE2B 115743df805c518432b1bbf444d0afb09da
 AUX irssi-otr-1.0.2-cflags.patch 555 BLAKE2B 8bb912f3f8ae666b58a09561eda62ae7bd4f52c73c5ffc929125b2ae33f34d41ddd715dc591d5dc52ac690a20dac687bf1de816974cd2b3afee86deb3c433868 SHA512 16243ca1e3e8287f97f04538bdfb10f6a3969c65de62afb788ebd8d28cd31f71684283d2c994deb000a9eaed842d81c701884e89a8f80e868868e84264c5e605
 DIST irssi-otr-1.0.0.tar.gz 39481 BLAKE2B 2d62071413db01291bdc223e4feab148f404c93832ccb6c18443c5ce2a2634445fa9ea106fac1e6b57e2da184b19f5a62aad27f448bea6f52c00e2957fc168e3 SHA512 988e50b9df430511ae21a9128ffd27ad27efc102aaa10ec59992c6e642f38dd776396a0768021e3a0588d2a8c30e6316a7b0720d31a05ac21bb47055b0d8c488
 DIST irssi-otr-1.0.2.tar.gz 40947 BLAKE2B b5a10f826fe7d4069bfe743b33c4e6fb29b5e38d46926f3f92115906fe914cd710446578d43e8833296646131102ac003ef9aece14c0f9f060fb898b7c699abd SHA512 983bc861e5d38774305425b412368689f17a1e11298bcef49b9f0ea7a2275b1443ba2ce0a9ef9866e537097f1c6c00e9264085f5cd711f0d78faf252fba18d2f
-EBUILD irssi-otr-1.0.0-r1.ebuild 926 BLAKE2B 886a5ad1ca788fb93b49dab593bea492f4d72315bfae32bf1e8768dde9da67aa79105fef7ea5c1ab9f559da227c871bcc74f42c47a8e2b33aee7ca86d7b07c4e SHA512 a7d7225d63254a2f542097d1295df24ea443c67c774a9325cd9b95b972a51e516e2de548f8e5ae697095701772134918710e07b6aa99ad98bd44d8bc6b499743
-EBUILD irssi-otr-1.0.2.ebuild 735 BLAKE2B 1fa33c1aca6d01cafd3c8a2d2f9147ff37fed0ccec4a5cf6d2c358e791b2006165873dff38b98987dd68bf408aed5be7afb1ec8da9fe588ef520437fda5c37d8 SHA512 18c8d21d8871791d790b35c778567e59db40e67d67d82187b317115a2cd30bc0035e3d543c06c62b45ac2a955eb6c1dda8839f095ab650df04fcc1b0dcc74cd3
+EBUILD irssi-otr-1.0.0-r1.ebuild 945 BLAKE2B d0bc03c6dd61a2e71ee9c2c15ba87be23c0cb9212fab6dfb7b995e216e10de8d052eeb5a14e59415e0b5e605647559f73813d9589e6e2c678133ca46f4f77ae2 SHA512 e19fe2cd046e592cce572f48ec3af9017aceeb98a3eb521b616f8474f73d65e330e28fa79169489ddf113881effb1720f41102c128ee766cd633f8a3539fc582
+EBUILD irssi-otr-1.0.2.ebuild 754 BLAKE2B a422ec3cee6c9750512bea0f44f1b326075485372df5da0c8a6d23cbaae5def95c3cb00284d6f37434d68274cc54b91323219c83bb2751ba6662276c09c744df SHA512 b07143b1d4148f80270b98e717b9523f068fd6d6d1e5db409614bcc07865f159b6bd04ee1aac02888511d65214bbe00fef9e34d793bf0a4e489761f648a8b3a1
 MISC metadata.xml 337 BLAKE2B e9217ce42df12331b4afc4f047ecebf4be18fc6dd46eab2106a378fbe5e05c7b371f2dfd57c2af18209af1779d6c5c6ffa838e501144774d402c445911abe601 SHA512 b2ec2bbbe169d06dc33a607ccab79b7cea71a9bc4e5a33eadf9b3521dca0322a80fb1d7c4a544ab8f449bb22510e42c2fee45df84730ed083f95bafa327ea9bb
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
index acbe377b4c6a..adc29addfcb6 100644
--- a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
+++ b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ IUSE=""
 # please note >=libotr-4.1.0 is required due to critical bugfix
 # d748757e581b74e7298df155ad49174cb914102b, see README.md
 RDEPEND="
+	!=net-irc/irssi-1.2*
 	>=dev-libs/glib-2.22.0:2
 	>=dev-libs/libgcrypt-1.2.0:0
 	>=net-libs/libotr-4.1.0
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
index f9338b3ea99e..5a4cc0eb98d6 100644
--- a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
+++ b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa sparc x86"
 
 RDEPEND="
+	!=net-irc/irssi-1.2*
 	dev-libs/glib:2
 	>=dev-libs/libgcrypt-1.7.3
 	>=net-libs/libotr-4.1.0
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index 7ef0e4eda404..97647506be18 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,4 +1,4 @@
 DIST irssistats-0.75.tar.gz 54434 BLAKE2B 1bd35158bea9f24b8013834a876cbc3a3f285cea1802e6699f6e10af33dde1a648ec717b031819a999c0beb2cac394130da7a31b5bc877d32abb0a706142d972 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6
-EBUILD irssistats-0.75-r1.ebuild 574 BLAKE2B d9c49c3c008993299a2fb173748ce02f6f508281c8cb4aabf3aba14f22065d68fd7e28240fc6431a85427380fbc3b1505296af6b342ceca77739bb99a8138e3e SHA512 586f66d264675b9ad0d6e7da66054f03ae210930de956e02cce64a65a48212fd7fd010c86e035b116ee907470e7f9620a86d95a1871d6b3d833edec0a2a25dfa
+EBUILD irssistats-0.75-r1.ebuild 568 BLAKE2B 9e9909461c6f6dbb5a43f87c0148b27949b2af85722ace643a5f44bb5301d1458877bb7018480dd8ff89ef2071d1802e7d82d9f8ad7c5baa4856ff3ed4366dac SHA512 b5a233b5235a21dee85a5e5a604a952a29061a02744ed49124138865bbb595816e0ea0de4f0855ead5c8274ae2002986933415d11ad079e360cbb8d939778908
 EBUILD irssistats-0.75.ebuild 622 BLAKE2B afd7a0819661ee7d80df38b8d57be616cb85c38391c604c03275aaa4415752833413862a97002b29d4fd5e6b01a82e588bf3454c9bf57a9c1e5e251c09193227 SHA512 62884d3bc57a926c148e7dfc27686098126796320cb2bcb36354784cce5b4a759fc8b78f56bf883676c735517da624dcdc798afdf6fc3ecede7e50e32cd20a8a
 MISC metadata.xml 247 BLAKE2B ad7649194ba47fd592d8a94cedd1132e472d7173de56a4e5d1b7af591a4063e27b4a196bef97c2aff4e5026ba2b22562c9d156bc93b1820b926151c205a696e6 SHA512 6b67bcfd1c47571c43f484d58c9132df98bb173dc939307124e0bacf8178a281d404b903954a5d23761a54b07123b0c0a83f999fa3cd578dcac141a5a6df661c
diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r1.ebuild
index 15a1faa17b14..15a075e0ebeb 100644
--- a/net-irc/irssistats/irssistats-0.75-r1.ebuild
+++ b/net-irc/irssistats/irssistats-0.75-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc ~x86 ~x86-fbsd"
 
 DEPEND="net-irc/irssi"
 
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index b8424ee46be4..b0eef8022160 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -2,7 +2,9 @@ AUX 3.26.2-drag-warning-fix.patch 1396 BLAKE2B 4dbd3be90222858375d24b31467852f64
 DIST polari-3.24.2.tar.xz 804160 BLAKE2B c0e651d478cf814d1e055ef196ea725a17c50ee4836df7939b73dc59bbea0f74d8dbf6ceebd07b3748b6814fa52ae8a300515ac8f6952f59546e7c27ed35d6da SHA512 23a475d657556e7f4e93dde8e545bf7bede227635d540bd006b85b068923d87e713bd05f14d8ccde458bf6efd4920665bca02ea41c4de870680581ebfa595f0e
 DIST polari-3.26.2.tar.xz 1148892 BLAKE2B 3979b261ae34d3d38084717a94f926a259ec0d20f9db0f482e10866bba0b4d1efec2f44bdddd78cd1b409f03df0221d308b8173b21fc33b61fd93bc76eec6b57 SHA512 3939c7da22379acd8b59d860db90fba37cca3dba0422db93747ba4622e574d43992334e13603462725d05ba2f0c1a243655ef7505881649111033abc029a9aaa
 DIST polari-3.28.1.tar.xz 1171688 BLAKE2B c52935b5f562654f833255d3e0e1022d3f0eff3de510752dfb59ba3831eb231ecdf5833c3813bf28afd864649fd34b02be4ab1e86134348cd2e5b5898f0788ae SHA512 a3fa71604a6f67b851ac3bb9e097a5e48e5ade12d31e845d63ccfe6186eb23694c0cbc9d9826803bf664d408473cc679986d6fee962ef675178df7cda4c998ce
-EBUILD polari-3.24.2.ebuild 866 BLAKE2B b17a5c9cdbbcc9b81de2585570104dc0472916805a8a86c1e414bd9dccabe3db0500f2e0188abc2fe24d5a709a647c0f408f4a19952d0e25893520f82a95a636 SHA512 a27466f037ee91f9cd3ab512bb586a5df13fd50da3b6fa30354316dbf4918ee8190b80113e015049b878b3a11b3efbd8acce852946b1e65d0831cb4be2b6b953
-EBUILD polari-3.26.2.ebuild 1135 BLAKE2B 6f0370bf61a9c40f8d0be287a063ea6f1b2891d34a636ff8a4128b2901bc42cfbc1bce9090c9ec16d017e05c668633cf42c8635ffe047589b2b43da055931d7c SHA512 0a08f5b5f0d0a042ca097580a74701b6f9c9491d56a54f6a42e26784bbf10ac58e54615f3d5df9202c2c4f45085d5a44bcbd13f79738a4f6da6a1977622bec6f
-EBUILD polari-3.28.1.ebuild 1118 BLAKE2B a6845ccd9b82e8f21ca79401e7cebd454cf97b2f1a3b86487a10ab4ef51ed56257ed59dc39db4e67fafcc63b64a7d0f76d660b84eee2f0d99bb07cd91a504907 SHA512 8a84ca69584b44622c48c459576e6f7454dd42d984d6617d83b9d3b6f6b1ab365ce5a909ecfcf071ae27a0f84c626a75cfdaadbcf4c0218496ba5a6319477298
+DIST polari-3.30.2.tar.xz 1153792 BLAKE2B 992f39e989179617164fb9d955a5211aa466293882d773c5783792503741cf62ae7fa848697046f2888bdc04c083e0b3fef0be18055e2d2c2607cc029eb2c816 SHA512 4aae1bd70498ddbddab494c9484c039bc5fabc13860ddd6a2001858808baea004c9f463b37c9392eaac62cf951867ea6e24e77053976bd4524dd711ac52a5b4d
+EBUILD polari-3.24.2.ebuild 883 BLAKE2B 1828647d578f3cd96ed456f1b19e51df2208cb1a1dec59578f6360d822e0637982ffe665621399bae3ec7b0c89d604788f17283b39e3ac63dfc5aaed90aec80c SHA512 8a6817c62c0f89f97c347af5fba5d12b6c3d81774fc5a390117c9def93bbc40dbf7bde7693f983cc0e2b2ad26589b5cff06a04c49ab0b9d8c14694435735c8c4
+EBUILD polari-3.26.2.ebuild 1155 BLAKE2B af36ada3189f2c33ccab0287508ba312d4665159813ddb6a24e9d3763b5a5c552eb48d53e7451227ce685dc531e7f53ac45b2382e190283c88938a9f015187cc SHA512 8a3f5749fabaeb0df20c298b4668bf105b20a376da05d21c518c67d50f1117a57e7e98e6724f8d5aa7a24c2ca2d0f9d33f101cb026d529803a4fcad6bcdd4afc
+EBUILD polari-3.28.1.ebuild 1138 BLAKE2B 80727823d480868de4d004034feba30de60c0e6762d546105c11a7d8828931cad29e05d9751121550522d327fbc12af96e79d149a153bda802fe8876e21df4a0 SHA512 34316f252d675d6347b3fa7ce245acedac25560f02dc752cd0ed674f5706e09bb7304713de7ed1b0aa702769c161eb18b92e3ea254ac4cef13d5f6bebe3ea144
+EBUILD polari-3.30.2.ebuild 1121 BLAKE2B fd6e76fad1a7dd7b13988c6056d8df4fc5324494e2416470850e41d84f96cd1106a89b6d086ddbf0bcd442b2f25dcb963ecc22e952824310ad2de039e33d2eef SHA512 6cdea277dee0e606cf77094d88e14abbc9389fbc324cb74d3f0414403be40888c0660a2423fb552dd679faa3054fe99b822d93f701c6f1ffbe999afb633038f3
 MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb
diff --git a/net-irc/polari/polari-3.24.2.ebuild b/net-irc/polari/polari-3.24.2.ebuild
index 7b11a06be695..b97448ba44bc 100644
--- a/net-irc/polari/polari-3.24.2.ebuild
+++ b/net-irc/polari/polari-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.43.4:2
 	>=dev-libs/gobject-introspection-1.50:=
 	>=dev-libs/gjs-1.45.3
+	<dev-libs/gjs-1.53
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=app-text/gspell-1.4.0[introspection]
 	x11-libs/pango[introspection]
diff --git a/net-irc/polari/polari-3.26.2.ebuild b/net-irc/polari/polari-3.26.2.ebuild
index 1ee35718d2ab..3d053cc6159a 100644
--- a/net-irc/polari/polari-3.26.2.ebuild
+++ b/net-irc/polari/polari-3.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 	net-libs/telepathy-glib[introspection]
 	>=dev-libs/gobject-introspection-1.50:=
 	>=dev-libs/gjs-1.50
+	<dev-libs/gjs-1.53
 
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=app-text/gspell-1.4.0[introspection]
diff --git a/net-irc/polari/polari-3.28.1.ebuild b/net-irc/polari/polari-3.28.1.ebuild
index 5c76f55dda85..f818799f5352 100644
--- a/net-irc/polari/polari-3.28.1.ebuild
+++ b/net-irc/polari/polari-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ COMMON_DEPEND="
 	net-libs/telepathy-glib[introspection]
 	>=dev-libs/gobject-introspection-1.50:=
 	>=dev-libs/gjs-1.50
+	<dev-libs/gjs-1.53
 
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=app-text/gspell-1.4.0[introspection]
diff --git a/net-irc/polari/polari-3.30.2.ebuild b/net-irc/polari/polari-3.30.2.ebuild
new file mode 100644
index 000000000000..9af6db37fec0
--- /dev/null
+++ b/net-irc/polari/polari-3.30.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3[introspection]
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.53.90
+
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:60 )
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 8f866804085b..79de3e8e7a37 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,6 +2,8 @@ AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f45
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c997dbc372492dfa57354eb51aee122f0e42fdba9e0aca997cd118ed9c75fb6f197ca13e371931fe45709d6b64651336d SHA512 b9541ea83c24963187931938eadbba746175ec1d9449631e799df038bb062625e4b508c2d0d4e9e69a6401158cc23a855cbfbda3d28a4b971fbb249f074d26d3
 DIST unrealircd-4.2.0.tar.gz 5340752 BLAKE2B 12d1ada1d439c6acd692a04dd4ed7ed03ea91c897f9522c0fec853239ba9a21098bddb78c6f5159ed59f1b88cf88f0ecaa774d70aba226b3ac749c935bc18ff5 SHA512 2ee7955c3c6c9af2b74cb68cfa94f8500dddf640f0222888b230f0f46dd0a52fba2c68d795eff00c59a3025affb2becb1dd67ebac037c7f75e77a3a728239750
+DIST unrealircd-4.2.2.tar.gz 6060272 BLAKE2B f45cae6aa85b478e7f667e379b557314fa509c17f150941f84ee80fb328b01de099235b69d3e2710afef01578f5898ba12f21245d6ce5370e7aa7ffdfa49d1f0 SHA512 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad
 EBUILD unrealircd-4.0.18-r1.ebuild 5410 BLAKE2B f4623989c7f2c188b384b3ad01b80f02ef0e50f018411e466821526429f7736ff9907a8c1b32e3fe71e555f19237169c55b06821090bf7680709e933b17acbed SHA512 593840a6d2620a8bd2e80292fdb3d3bbc212312dec559fd6d04607f9c8b6106a79147a63f942271d1d33f11559394a8bd2fb3f424ae18bede975b09739967143
 EBUILD unrealircd-4.2.0.ebuild 5384 BLAKE2B cb13d4a19d26ccd74d0ff6451d3235e5e5df131e6135641c27bc7e25fe00750c1d812e3ad5cc07d44e4f491931d95eb7798a807f7ed24f68ea5b39dbd2796ece SHA512 4cbe063226f705742db9da0c4c4b8320e647586aa0941d7568b5f39447d1d50f878b915aef6abbd3b3639e95fc6dc0270f6bc5ec123dd193d8de3c300ab65ce8
+EBUILD unrealircd-4.2.2.ebuild 5462 BLAKE2B bab34d8f21ea56aeed7cdcf0344eff7a28f002f5c2006f2528d494522f7319fc0ec1d8d23e7180a73642e8bd101f7dec58766973f88a14b07a385781d63d91d2 SHA512 b733e1341389c4028260665316e3a5f221e74caf8922d54fae2f7b51a9f3d4b780173cb2e159f27d4e5c54da4be1e57421a57f400989d8c00631e9faf4e775e5
 MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/unrealircd-4.2.2.ebuild b/net-irc/unrealircd/unrealircd-4.2.2.ebuild
new file mode 100644
index 000000000000..85e8ccfaf7a9
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.2.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+inherit eapi7-ver ssl-cert user
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
+	showlistmodes shunnotices topicisnuhost +usermod"
+
+RDEPEND="
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/openssl:0=
+	dev-libs/libpcre2
+	dev-libs/tre
+	>=net-dns/c-ares-1.7:=
+	net-libs/libnsl:=
+	sys-libs/zlib
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
+
+pkg_pretend() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 4 && continue
+		ewarn "The configuration file format has changed since ${v}."
+		ewarn "Please be prepared to manually update them and visit:"
+		ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
+		break
+	done
+}
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+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
+
+	# 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
+	sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
+
+	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-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-permissions=0640 \
+		--with-fd-setsize=1024 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+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}/ssl
+
+	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}/ssl
+	# 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}
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
+		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/ssl/server.cert
+				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
+				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/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."
+}