gentoo resync : 08.07.2021

18 files changed, 179 insertions, 34 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ca9bd3b057ce..6e88f86806d0 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index d003e424b230..387862e28aaf 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -7,7 +7,7 @@ AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80
 DIST iroffer-dinoex-3.32.tar.gz 1321125 BLAKE2B 3a124d16911d97d0ec937b86c9e0ad513ebdcea5e09e4cb1a53753c03d5e13347d0bf1116bf9abe0137fb7a05bbc7a8e31c2c0da5c15cc4e0b55e067d62b1461 SHA512 03d662cf7eb3093b1f050eda8777011d6e7a833dc2fcf65d29ef0294a0d6ce4e2cea273e2d4e6ee6ba2364c088890ac6338a3aa8e6477d5e2a1a990a6e4e9603
-EBUILD iroffer-dinoex-3.30-r2.ebuild 2687 BLAKE2B a6dd75334a6fbc0ce89f47803199a5bb692bf267b935dc1c4cfe09b6dcebec252781bd031ed044ba1b62aca6d4847dc0ca348493184b65836dffa85634d720eb SHA512 55b513cc3da30e7810f9f5e163db2b4716af156960863c1994bcb4dd9f4c9dee4d5998b48077c0e06fd8d52f9a7b1b039d595f69b7fab3c183e029e5854c80ed
-EBUILD iroffer-dinoex-3.31-r1.ebuild 2680 BLAKE2B ab79887b9ded2f25c3c63bee6f1b5a9b12016e0e3578e183163ce90898f46d72a7d51a871af69c6bd285efdc946206e08b358d637a1d340ef0d89cb504941f2b SHA512 5ef890a997c40fa84c3de4312a5450f0a8536cbe5cdc9f226994644f9d1285495cc9996ae003f5f30fe81f1da191e7443b79f1b48dcd5bcebe435d5ffab80d2a
-EBUILD iroffer-dinoex-3.32-r2.ebuild 2634 BLAKE2B 3cafcc083c31e40a04f8564cac68d97492347874d94f06ab3136b866c10cf1aee3d4951eda8f686a52dc4d2632c7c298066c3649cb93952b6be5fbab36bdc8f1 SHA512 a3d6dda7d2eb225b0781fc78f8557c32ebd7cb5e5ce475ebdba304bce1540de7d7ea880731e28e29670ffe318b72a11eb4c700067d40d86f15d8382efc0e1081
+EBUILD iroffer-dinoex-3.30-r2.ebuild 2687 BLAKE2B 25b349d31f8a3655cf21d637a345943c6ce7ee4b2695b15c1b7b7da984e6d7a6dcd924253b7a11659e37f6b92afd07a03ee4715d10c3668e35f30594492a635c SHA512 3257dccaaf88e8b1b2e944ee377b9f8a06820390987ff8239ea2284daddb72e7424b8ce03b6631469fc4e062fc0c8481acfac1514d6a7bd42c7ef0a252d962a1
+EBUILD iroffer-dinoex-3.31-r1.ebuild 2680 BLAKE2B 44b2423584680bdbd0fb3facc9f01378157585052acbce8b165dd0a4c403b94966af0f2426e10c4125e0a787d2c5cd39a326ac89ff3fa7f8a47ee6b773282371 SHA512 45f2af4d26491526f3b651fb93904992b7d1f16ef36befb9252174d920e579b02b2ae2fa76af80d3cef0ae28d0691e7ad2f647c82dde2ee7fe07d29ea3ab650f
+EBUILD iroffer-dinoex-3.32-r2.ebuild 2634 BLAKE2B 55c332bd03d6701c2587467e65b5866a27da23139ca41e32d9ed68b4162e655f39035a7c09b3c4761fb356dadb4c6512e088f4d90dc10b0cf45070fb41043ca8 SHA512 f332b27eb258c950081fe86a7fc37b845fa12fe512129cd76d870f9d6ec450cb9d7b90aed20c1365a03a89f6ca22c6237d3b71e0fa5a61fa884b5583809d70b5
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
index 621370b736b8..e384c6cea296 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="de en fr it"
 PLOCALE_BACKUP="en"
 
-inherit l10n toolchain-funcs user
+inherit plocale toolchain-funcs user
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
@@ -48,7 +48,7 @@ src_prepare() {
 
 	eapply_user
 
-	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+	plocale_find_changes "" 'help-admin-' '.txt'
 }
 
 do_configure() {
@@ -79,7 +79,7 @@ src_configure() {
 
 src_compile() {
 	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(l10n_get_locales)
+	emake CC="$(tc-getCC)" $(plocale_get_locales)
 }
 
 myloc() {
@@ -100,7 +100,7 @@ myloc() {
 }
 
 src_install() {
-	l10n_for_each_locale_do myloc
+	plocale_for_each_locale myloc
 
 	dodoc README* THANKS TODO
 	doman iroffer.1 xdcc.7
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
index d61e239eceff..8d04b7572213 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="de en fr it"
 PLOCALE_BACKUP="en"
 
-inherit l10n toolchain-funcs user
+inherit plocale toolchain-funcs user
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
@@ -48,7 +48,7 @@ src_prepare() {
 
 	eapply_user
 
-	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+	plocale_find_changes "" 'help-admin-' '.txt'
 }
 
 do_configure() {
@@ -79,7 +79,7 @@ src_configure() {
 
 src_compile() {
 	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(l10n_get_locales)
+	emake CC="$(tc-getCC)" $(plocale_get_locales)
 }
 
 myloc() {
@@ -100,7 +100,7 @@ myloc() {
 }
 
 src_install() {
-	l10n_for_each_locale_do myloc
+	plocale_for_each_locale myloc
 
 	dodoc README* THANKS TODO
 	doman iroffer.1 xdcc.7
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
index 2a9bb01ec157..748af554e358 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PLOCALES="de en fr it"
 PLOCALE_BACKUP="en"
 
-inherit l10n toolchain-funcs
+inherit plocale toolchain-funcs
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
@@ -44,7 +44,7 @@ src_prepare() {
 
 	eapply_user
 
-	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+	plocale_find_changes "" 'help-admin-' '.txt'
 }
 
 do_configure() {
@@ -75,7 +75,7 @@ src_configure() {
 
 src_compile() {
 	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)" $(l10n_get_locales)
+	emake CC="$(tc-getCC)" $(plocale_get_locales)
 }
 
 myloc() {
@@ -96,7 +96,7 @@ myloc() {
 }
 
 src_install() {
-	l10n_for_each_locale_do myloc
+	plocale_for_each_locale myloc
 
 	dodoc README* THANKS TODO
 	doman iroffer.1 xdcc.7
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 097e6f1ff3a3..28e1db6b6f2f 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,8 @@
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
 DIST konversation-21.04.2.tar.xz 4252240 BLAKE2B 1e5459f3c0bf0168b4936550ec88064328ff68c00c093c26cee54a89936044653d0f4833fbd6173460958dc925d97d78d1ca74b450ba9237250687dfc751e651 SHA512 4b05d290c9c8350b60a77d9fc9dcc53671496218e162319bc37ec20cd26cbc8db8f9e3b1ad7e9c86cf9a656da5a6fdb814c80e9bb3413e12e436267b8da04f7e
+DIST konversation-21.04.3.tar.xz 4251844 BLAKE2B 0db25135752635392248288699ab6a28042fa5a5dbe73c5186d782fe5a68eb3b6396b87830f5ec91da00c434e0462ffae042332e9c82f1e342fd77a0762afe7f SHA512 af2e7d232412f316090be72cc2b412b19c8735be4e04c9286561ed3cf83b5858b83572f33ee70281610c7fe5e339683d33e9d1f9ddb57eb5198db91e82613869
 EBUILD konversation-20.12.3-r1.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
 EBUILD konversation-21.04.2-r1.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
+EBUILD konversation-21.04.3.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-21.04.3.ebuild b/net-irc/konversation/konversation-21.04.3.ebuild
new file mode 100644
index 000000000000..73a3fb36feee
--- /dev/null
+++ b/net-irc/konversation/konversation-21.04.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+crypt"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:5
+	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}
diff --git a/net-irc/limnoria-plugins-chantracker/Manifest b/net-irc/limnoria-plugins-chantracker/Manifest
index 50021b135583..bd0279c0af1b 100644
--- a/net-irc/limnoria-plugins-chantracker/Manifest
+++ b/net-irc/limnoria-plugins-chantracker/Manifest
@@ -1,5 +1,5 @@
-DIST limnoria-plugins-chantracker-1.5_p20210530.tar.gz 47071 BLAKE2B b38cbe399d6cda9ee9d5e873a50d2f529d91b697c32ed4d74fb8812b8090a42103283878f8874f0a974cfdf1d117e2401935edef678d1d71af338760555a7a92 SHA512 7b5e459d17b28fd00b9306a7acd8c2a36eb668031c24eb05b9c51354e5cf270fb1b388949047c0531d9e8cd62291d8f7ec9bd339d3b3b6c1680dc184c44d3b21
 DIST limnoria-plugins-chantracker-1.5_p20210619.tar.gz 47777 BLAKE2B 14e44e025d4044c38504ec9cea31b08d9a442769b5dc3cf6d71b89526ec98a43a31068a5557b3fc257c6254b0f6aab989d148066b79667b17c75f01e741c10ea SHA512 8ef99fbd41929172ae362a656030fda7f4d522eddfd29a3f9e8f9e9a138903faa672c4b872ce76da39d716f3443c159e7c40111cee015230e781bc387c299718
-EBUILD limnoria-plugins-chantracker-1.5_p20210530.ebuild 1020 BLAKE2B 7a02667ec17f684398142d2df570f17a99dda5564655b370257dd9568abca29ba02b8c184d456505c627f6d2860cc8a798ebe5a3ad2bc2b9abd1ade4017cb191 SHA512 b8ae2b4c6ca1e5a6169512289347d4ac5a4ec5eae8da573a7c9050f5b4e82aa6a4b8fab4c206b952b9395be318e6e5b0d3b06d4606333a2cf3c23f970aadf84d
+DIST limnoria-plugins-chantracker-1.6.tar.gz 48050 BLAKE2B aedf93eccbda87eb488b7a0c6e28597198ce37a68a006771b15d6044eea8d7efd9fcf5b178ff4309715534286b74c7ee81e47241ec6406c26d1b17f5bb442d5a SHA512 c7ddd629818edc85d4ebc589d85fa66ef757ac27d0710e4a5512a469892c5c3caad6b98a3ebbce0abc797e0b64bdbd4ad2445e2127c91e266abddec58c3ae859
 EBUILD limnoria-plugins-chantracker-1.5_p20210619.ebuild 1020 BLAKE2B e1c2c4c2cb7fbf29939cb80db319b53ac365add58b87b8a6553c1eca4a02837814fb305d442e66467c14b5192640ecbe835d6244e761ee6b26fcf4c3fac317ec SHA512 dfa0b2e9e309d6b8aa5143b83caaa9f24e4dad85d3e75e2c80739eae0fa0e4f0420170a4c02d8251e538f764f7f791aedd7d83ef270e872e6d84e18a6a51fc56
+EBUILD limnoria-plugins-chantracker-1.6.ebuild 975 BLAKE2B ea78cfaae954144ce1168850064810f40f31bf7394c6013819f89a293dda89e1057a81c5617d1d0a7fdbc5ab8668589e3a00e685823d587d0e8bfb2b8f66f822 SHA512 ebf5f06621f858e76e3c023f1e114d880c16d14ebd410f0a2ecb2bae79336978cb2d480a732710eb48bb51fedfd58b4451200a0ba57f9c948846fdd757449cfb
 MISC metadata.xml 419 BLAKE2B ca36300026f95b2e652403a70dba11234c7695c1a881de7d569843cf218fa0e6e7b55f00f76b1ac6c61dc9a2651a2bcbe762219c831e5bd9e6bfbe1472e47877 SHA512 470f1ca9228028f7303dac8795c9e61622347eb1d1f95b6139bd249d7cc367fca91093854f9c8d808b1400b437eac4cf1290212c3022451ec56b3bcf5c95a552
diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.5_p20210530.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6.ebuild
index 03beadaac2ce..27da210ea972 100644
--- a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.5_p20210530.ebuild
+++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6.ebuild
@@ -5,11 +5,9 @@ EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="7a60d9912171b3f6fb927b03c18710773d7f4227"
-
 DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin"
 HOMEPAGE="https://github.com/ncoevoet/ChanTracker"
-SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
diff --git a/net-irc/limnoria-plugins-jlu5/Manifest b/net-irc/limnoria-plugins-jlu5/Manifest
index ec7a61316cf7..93c8ae281236 100644
--- a/net-irc/limnoria-plugins-jlu5/Manifest
+++ b/net-irc/limnoria-plugins-jlu5/Manifest
@@ -1,5 +1,5 @@
-DIST limnoria-plugins-jlu5-20200105_p20210530.tar.gz 99973 BLAKE2B a67e53a75a99ed406782cc74cc93c19ad4e7298a4e9b47781559609c7ed77fed157febb646147254f0fb8e73627f1fdfa23e80cd1893d394c779ee54f93357d9 SHA512 03f537b7100a747c408a754d368e679ceea313747cd27dea9ca26cc7d3cf9b4319faf37656b0c7b5134d8ca6a94a9bbf4c345aa8015bcab2a99648d38dddc272
 DIST limnoria-plugins-jlu5-20200105_p20210610.tar.gz 100971 BLAKE2B 4000ce710f287d40e0ce84946fc682f702bfa562cfc114b98a8951714d30cdceff32a599850818cf4e2072167797e6db1f3fa9a3209712a04b16ecea491b87ba SHA512 bd1eaa294af7909f400c622008dfcedbe0ac9df2eb2414f2bfe97b5eff83c0d635c09861686359ec1d8103f404ce6ea606db3434917caf1b406a8875bbfb1dac
-EBUILD limnoria-plugins-jlu5-20200105_p20210530.ebuild 1031 BLAKE2B b594e855da77e4b4b811d25092f087cce7c59fbcf2a6732c2fbf54fd030515ba69844b2a8755c484f59b4eca1df9ef9211251de6b082f6e13a3dbf0904ff98a2 SHA512 fe89093287d636b27406234d70afeefcff7a54914439e6f32b918c8d0a40574ae46bbebd1661bf5cd10e6f02d20cee539c8462debe866525f7eabd68a75d647b
+DIST limnoria-plugins-jlu5-20200105_p20210703.tar.gz 98161 BLAKE2B 939f91bc4deff6bdd31b2c8897e6842a07f4e93c61b9b63b5753e13f85791ce907583664955fe0e471cbe567b6f1ba909ad4579984e41bd7d0de8f47b6dac781 SHA512 5e3608449eaccc0a6559107d1e5bc2279026d3ff0c2df60e3f06f3b7bec72dd779f385ffa91b4a5b0c6d051871c23f8c62744b91423c6b30e0935d2dcaa061b0
 EBUILD limnoria-plugins-jlu5-20200105_p20210610.ebuild 1031 BLAKE2B 4cf2cfa4a35bfb153e1bf5fc6da77b8afc3ac86422a7c0e43801c024d64c6b392183d951498da29c69fb44d6a70832c7de9c6dd800f18a2fbecb8bd9ee4e10d9 SHA512 5a0664e6e269fcc36cc4bfabdcb1f2ad8a81d45fe7db082b33cc8278457296344aa9288158b414a973d23216521e638b99f7cc03294857e46cba615b48db7843
+EBUILD limnoria-plugins-jlu5-20200105_p20210703.ebuild 1031 BLAKE2B 204e561e2a7f6d724f3edfa3784eb1985ba90f835eca48dbe222cf15a5d8369bbb39002248ddf9186aa8a3d247506b3bd7564d6982c2611febc83a0a3f3438ec SHA512 48777a09f81652d7b1c3be0b765b2c37351a64fad58f16f272a0044eb8c5b9d0d9359181a472d3829506ea5c029f2ef4f13892038363bf77604a9fd5a2a9763a
 MISC metadata.xml 411 BLAKE2B bed572da8c5e82c8cda548c287e3ecdfbfc8b7db97144f55b8d5e075eb794e6f1c6ff6c20eb3be15f01f71e244ecc9d64a112886b990cd5a09659b836e8102df SHA512 63d0c4ce1e98bb3068293b6f7fd33842085be1d7edfc4f3f63f9ceadda23531e99abb0e6a1ec1877baec3e8f0a1e6edda5742085a615c9404e0975d1fd102ddd
diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210530.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
index 9d1174845dfb..7130f90270df 100644
--- a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210530.ebuild
+++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="7e695c00dfb665a16ff4f1d66ad3deb4598ea029"
+COMMIT="7e959b9f24632d0fa9f587da6e1cde951397ae97"
 
 DESCRIPTION="A collection of plugins for the Limnoria IRC bot."
 HOMEPAGE="https://github.com/jlu5/SupyPlugins"
diff --git a/net-irc/limnoria-plugins-progval/Manifest b/net-irc/limnoria-plugins-progval/Manifest
index 8fb89e0f52b5..0e8a2e1b2a5a 100644
--- a/net-irc/limnoria-plugins-progval/Manifest
+++ b/net-irc/limnoria-plugins-progval/Manifest
@@ -1,5 +1,5 @@
-DIST limnoria-plugins-progval-20210523.tar.gz 4936882 BLAKE2B 3404d6d07f1d2e55357759000734df37566f2b9563149ea2efbcc2b4b3dbbc73e321280ee2846ed61df8b23400bcd8e1f5088921ffa1a77bf86625713c00aa98 SHA512 6a3b9d0c65070b8c6c4f762f273f4ebee37550c4aca00e82fc7232a957863aaff5bd5d1768eb8b00b40666b71f4d83ec6253d0f42132ebf7563208aadaacd48d
 DIST limnoria-plugins-progval-20210616.tar.gz 4940211 BLAKE2B c6bdc9e1949303c18081d7ab16bb12e6c51b3af6ac70c5ba5cf5352fe13befe7b1896a8178df4b60c19ff10bb81f9454d20cff89218ead55ea218bb9d5e5c728 SHA512 b2f962890bf0d125ec77f0cdfec0e4449444565bd429c3bb6c2f0386e2dfdee9f9bdaa8c25334fced4866c19cb29220a045e83f40c6e35476d44e2c1d0d4c325
-EBUILD limnoria-plugins-progval-20210523.ebuild 1043 BLAKE2B 9d736be8c03ddae9992f96702629a0c7102797f3ad27938cbd383193669022c09dfdac9bdd8b2efbd545db922cc1100d7d5b443598d6c8caed1818b2c1e3d9c8 SHA512 7e8ef11988437d18f331c121b73ddc79ff66bbf40814397d23c2984c24fee9e54bb54b3f2dcc787d4ba73a84089baa7f349552a2fbe5e24c9fcc3b8acc773efd
+DIST limnoria-plugins-progval-20210629.tar.gz 4940004 BLAKE2B 286b502daa37bfa5aafd8f5d92176ecc5956d0922322bc1ce1ffd4221bc6f9cef14b7cb9ca52c1d520e17852941a34006a250d8f6504134c40fc0b896b71a99c SHA512 30985a54ef6c1d027356b0f6efd0b1cbde777bb4fe2999ef63ebc94ae944933d9dc90f1ce937ccda5b54bacdd786ead79b01bc1514113a51b749cfcccba993d1
 EBUILD limnoria-plugins-progval-20210616.ebuild 1042 BLAKE2B 3f6bc0242c97373d1f6f2dd22aa408813a33d01b77ac13b10ed8c3af25951b728c4b4d808a53bfd854f60a11e7dda3918e153c1db8a81cf924688ce81938ad85 SHA512 cda409ffec963f212b2d8fdaf999de8959d239c950ccd3ca9812c40c8884059d1ba4d963642dfa1ac10ddc8862ee6efac1ae99cb5e99811558c638a8eac2c5e7
+EBUILD limnoria-plugins-progval-20210629.ebuild 1042 BLAKE2B ec0b4fccee623834d2e9fff73bca5c8ad49839d1f8bdf6f108faf433c96780dcd1cb7b06e71c06746cb93e2b69f9bc6c43a27dbe914c0d740c67df9fe24cdef4 SHA512 86ca1427236d55978ee77ab1a876e2c7a9661b2ca84ff94e336fb636301b27d35e788daac3649a4a8fbc535001896468955c55ab110c2e81e31fb9ae39cda4c7
 MISC metadata.xml 425 BLAKE2B cbe61a9744a8e26cd1c10bbf799eb2957e76befa76b350565383543b2b1373327c61aa011778b6688f15e58ec7b727365980b195609e085d4c5ceb2aab45e2e8 SHA512 efd2dc704d5fa2f11df62ca009d7fb7c2f2abc6244917c87b6dddcfd7dff22587c20172a4c3136ef79c7f534fd2f52181dc3557567abfa804f0748dc69942585
diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210523.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210629.ebuild
index 102b8797f770..ca33528f14c4 100644
--- a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210523.ebuild
+++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210629.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="8781713a715800e8ba535ce2525d1441b3702bcb"
+COMMIT="eaf99ec03bb60da78612d8a73e47fba1f6708b0a"
 
 DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked."
 HOMEPAGE="https://github.com/ProgVal/Supybot-plugins"
@@ -30,7 +30,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "Before this plugin can be used, your bot will need to be told where to"
-	elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ncoevoet when"
+	elog "load it from. To do this, add /usr/share/limnoria-extra-plugins/ProgVal when"
 	elog "prompted during the bot creation wizard, or add it to a running bots config"
 	elog "with the command"
 	elog
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index 3e9f0a0ec217..db8ba7ba4c0f 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,6 +1,7 @@
+AUX limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch 457 BLAKE2B bda2855d4d735e7a65bdbd2b42a73519f12f100020206c7f1e3371db16c929ef91a99d503090bfb46fd14a215cdc002335f3f190e7960c2d19ab56f09943be3c SHA512 35c78678b9c114802676f3850721c6641c9a970d002b184e097cfba65fc9f7c2f0968ac9cc77e03e332c706f7bf591cbc31838e4c68fd294e35465291e266aa8
 DIST limnoria-20210527.tar.gz 1092017 BLAKE2B 1c01ecbb47927d62e30e1768bb8e4574bad7422fea379ddd3d6700351a2f8dd006370a24aeeb7a5b10003e53f1010c8fb3998ecf1ef4f11a2ce48f9145605d30 SHA512 2e09415931cb3bdc358d4a243be3f1abccd569f2371d5d2b2c67e856492475affa473c8c32c77cb2c973b64202f9c6657397fa35b5b16086fbaf4e5b44706184
 DIST limnoria-20210617.tar.gz 1094438 BLAKE2B 3253af8ad764acfaadf90ce49d0f40a47f32554d75c3860079284f98373eb3bc8f60f1f308b501265973c0e6c2a552211415f4f9c3044ce78f818d305b598cbe SHA512 25dddf843e22967a95c769c62f9398129830f63e23d506f0a9abaf7044fa9ffbeca95138c494caf3b36813919c7b1f0880b0715a06bc519de1a87837a948a039
 EBUILD limnoria-20210527.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
-EBUILD limnoria-20210617.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+EBUILD limnoria-20210617-r1.ebuild 2463 BLAKE2B ee3c85c8fe60ef730cddbfc4ef66d8189d70e504f3570cf1a9fad9ae2c2cd6a94c05a9d52ac02b36bc5a1bccbd3ee1d7a58644e8c806c8beae86c422ecbea651 SHA512 c04126c7b043babcc12ac6c86d0f3aa9574e3a24baa3960d9bc0165df3304367b231ba1253b7547f600d8b2170de92a6e9c2fec1a2bc0b1aedf99e788d8e985f
 EBUILD limnoria-9999.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
 MISC metadata.xml 537 BLAKE2B b5b3c724a256cfeb8c99426ebe011fab7aa09f099c92f5ab4684989a4553a6820816bebeb12e8fbe1801c54d9b279e47e9ca4f46f654f3575d5bc5f7badb1b53 SHA512 7583b486dbc023fc3dadd694ca8bc123296685b613e2eebd4f4f8de0105c68a58f0dc7c3997c3b1a5a93bb689758199e59f8e25fc136a310bea7568ce90cf5dd
diff --git a/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch b/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
new file mode 100644
index 000000000000..f3a579112848
--- /dev/null
+++ b/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
@@ -0,0 +1,12 @@
+diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py
+index eab10c61b..a9e3c07c6 100644
+--- a/plugins/RSS/test.py
++++ b/plugins/RSS/test.py
+@@ -102,6 +102,7 @@ def testCantAddDuplicatedFeed(self):
+ 
+     @mock_urllib
+     def testRemoveAliasedFeed(self, mock):
++        mock._data = xkcd_new
+         try:
+             self.assertNotError('rss announce add http://xkcd.com/rss.xml')
+             self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
diff --git a/net-irc/limnoria/limnoria-20210617.ebuild b/net-irc/limnoria/limnoria-20210617-r1.ebuild
index 03b9171f694b..cdecec64aaaf 100644
--- a/net-irc/limnoria/limnoria-20210617.ebuild
+++ b/net-irc/limnoria/limnoria-20210617-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests
 inherit distutils-r1
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
@@ -43,10 +44,14 @@ RDEPEND="
 	!net-irc/supybot-plugins"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-python_prepare() {
-	einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
-	einfo "bindings and feedparser."
-	rm -r "plugins/RSS" || die
+PATCHES=(
+	"${FILESDIR}/${P}-rss-testRemoveAliasedFeed-mock_data.patch" # GH#1479
+)
+
+python_prepare_all() {
+	# replace "installed on ${timestamp}" with real version
+	echo "version='${MY_PV}'" > "${S}"/src/version.py || die
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
@@ -56,8 +61,6 @@ python_test() {
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
 	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
-	# Runs despite --no-network (GH #1392)
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" )
 	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 6d637abd0f55..56a41b408897 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,7 @@
 DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
 DIST polari-3.38.1.tar.xz 1050280 BLAKE2B 7c1e640a62003bda2217d914f9f19d6eea3994f780785334fd681c792653aa3ef1b4e3e4bc05d7bb15a614cc70e317f8e8a55445fe6e03c249f66b6b3e97af3d SHA512 196fd58324e1ee24eb58efcf9e11b9bec1cfd11781cba5d09b34344b7d3715f9bc215c7a3ec3b021ac5e1d2575a8200d8ab896b201488bf7da2acb10beb04262
+DIST polari-40.0.tar.xz 1051416 BLAKE2B ea6aea087ff3ba74e2cf16e848c228c0984eb7e5b7cc16579bbe8ceeb3655babb5dfbf3adbe245b66b590999c5b7e0077630b659d0db00e2da6ce0ac8b0281da SHA512 267eb904286f33e6ac510357de072285889d1c72ca832eb6a8520a20b1c2487708eaa0187d4c91b46b3b8019866f37a9ac036a71dee9cd9c9ad83443df0f146c
 EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
 EBUILD polari-3.38.1.ebuild 1066 BLAKE2B d9445e6b750a1d794efaa5e0a3f655fdf46040f9dc8aae0cbf98c8feba3afc54663838c22027e65a2056dfb66d10b65f0b3d922c38bd8abd0399c7a8715c00a1 SHA512 e5d49b48436e9fb4b452f838bc53eaf248ffc71061272d63c866abfad21bc5e7d550f300746d755bf6ee70b3e3d8a33609f13378b5f5d99a098e86627349a84c
+EBUILD polari-40.0.ebuild 1128 BLAKE2B 3fee28824958c0fe4c4c957576a958717f528e992cf74384cb7895a70b9a9a840aac049bbd8bd13d6f7c8d5ac74ef631d1202f8b5a9cbfc2f2840084c6467cd2 SHA512 e6a08eb53759ded4991950fdeb52f8c1b35c6ec2296cd099c70b7e1fc07326036378a46682446a6f0daecfb7e91d2da39a9f4315a3a866355309989a03e37733
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/polari-40.0.ebuild b/net-irc/polari/polari-40.0.ebuild
new file mode 100644
index 000000000000..d7d2fbaf9dc4
--- /dev/null
+++ b/net-irc/polari/polari-40.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+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.67.2
+
+	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="${DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		dev-lang/spidermonkey:78
+		dev-libs/json-glib
+	)
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}