gentoo resync : 03.03.2021

13 files changed, 58 insertions, 79 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index eb77fb8afa85..7415d4719eef 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index fe1daf7402b7..0d1095533ad3 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -4,6 +4,6 @@ AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc465
 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
 EBUILD eggdrop-1.8.3.ebuild 1720 BLAKE2B c10f202e1ef55e875b1182d50240f2f1555e13d7d357202dd682d55866eabee4660695f5711139b11ada087dfb47e1367b7ddc55ff6bbee9f4a303b0b177e165 SHA512 8ebf2205e9bbd244a99bd3b9af23ec423bd773f77978d2cf9cf46e174cdd3a01868aad71781175e97d27d5fd5ce609d0aff872e217a4eeafc5acdd8ff70883ba
-EBUILD eggdrop-1.8.4-r1.ebuild 1601 BLAKE2B 0e2fce2a0939ac790860f8ad8eb5c41cd64111bba9a6fc6372d21301b9372ee791b87057375cafd03bad37a8824edc28a75e7768c44a9e0eed98b53a36124cdd SHA512 1ff8ae7165dee88c9c8ca0af807d86e2bcc6bbfacfc74e31d89fa90396045f41741b380a2ec060fd83210734f79d7761f8578b237afffca69774f2ab29b65673
+EBUILD eggdrop-1.8.4-r1.ebuild 1597 BLAKE2B 0065b8ad7eb64ec7e4b292d436ee3bc11d8d90ea9544309479673a7d02aa7e86cea6f2e0728295e5a08baa3ced51aecffaabbe4caf7e4a641d63a838dff2e8a1 SHA512 e4ef8727085f68f35ff2a7b4ec4cd8ed524175cd82eed85f18e26a3708a8aa030bc94dd8e03ed9dfe8ad5eb02da4ef0062066a22367c47951422c76cf7811116
 EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild b/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild
index 1ddb84ab8e16..9ca61a7717c9 100644
--- a/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
index 85eada005577..4b1b6b4b8e1d 100644
--- a/net-irc/emech/Manifest
+++ b/net-irc/emech/Manifest
@@ -1,4 +1,4 @@
 AUX emech-3.0.99_p3-buildfix.patch 2732 BLAKE2B b5af908f431049c8e3f5d631477a62769ef578ec1b610182a71fdf0811d0da37b77601c4d2de78d4f78de6a7330488a5878b7c11612c85263fef1573a807a0c4 SHA512 40119107c596f29838474fd3828c08736abdbf0fdf069556da6842393e64a3514d2fbb31dbe8c267649e12bf9ec678295b07c725f11161da852dc285ef3c6151
 DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165
 EBUILD emech-3.0.99_p3.ebuild 1823 BLAKE2B 114978224d6baf351bc8635454e1975d54a780cc23ec7bd47ccd774d0a9cbb53ad40db977864b6d70acee677ae6611518522875577e58504f65be6a118ac83ec SHA512 38ace68ec4fb9c75025091a0dcdefc58a40cf1c2d1d023dc63ee983477392be63e8d5c9498354223f9b32a0b66be811596c8fb37df97a0aa1e5240891abe6c4f
-MISC metadata.xml 375 BLAKE2B 62804e73401c54751bf6394037337c2c93f95caedc8ada8ce64ff872e6c59622fb64ceabdd47df9f636de180c6bc08a75804be3a90791b6b646120470096a52a SHA512 19c676648690f2f4eac811f15d774ec9a85b9e1ce475944fd2d4dd9cca253bc10efd74f6988479f3d95828e56b790b1759002db272e8918768fba7b70f9f48a5
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
index d376f2bcd4b1..1b2becffa26c 100644
--- a/net-irc/emech/metadata.xml
+++ b/net-irc/emech/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dawid.weglinski@gmail.com</email>
-		<name>Dawid Węgliński</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index e982392b90b6..c87509d5dd99 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -8,6 +8,6 @@ DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d
 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-r1.ebuild 2667 BLAKE2B f771115e1b1771efb1f7a5edb74a188a89714efe2ddd45f257b3ccb670b516d08e38a545aa04e8f4e1e233d7df4170e6dae7920df30794ab1c152e182ced94ef SHA512 f884b72be1dc570c8faef33d328c0a4574ea31795febc07a1ff1db2764f2765f84a12d86842a8ca1b5ae53988655572a70b55089a288f1a5755468ab5ad78f1a
-EBUILD iroffer-dinoex-3.31.ebuild 2661 BLAKE2B 7cf22a73e7a0d3dfe5a65186faf3a0eb6b0a0cf840c82848503dfae63216accf51f1f1e0c8d6a9e5e42bfe9460c6a863161ce2aacd9eb5f68791a3b29d3b3f79 SHA512 48a9d16a93129c93366f1e28c8f386b6144f2fc28f163dccbaddbba126c4845ddb4af25f2512f4ab31b7a384adcbfbfc2767585b3dac60abbae62acb1fecd23d
+EBUILD iroffer-dinoex-3.31.ebuild 2660 BLAKE2B 6d7398ffe8a3227650505116f57e918627e6a7e79d06b2b78a08e4daea4b391bfbd9244ef6e3668446b50e7588abf9234d7a803665ba307a58505487d700f4a1 SHA512 df5cd09c89b9d4ab6a1a098c77c3bba623bda69c1f3b1abaff983900b67ab7a029ebd6871bac25d852fc65c01387ba94be8992a15284f16127e7cf6b7322f445
 EBUILD iroffer-dinoex-3.32.ebuild 2671 BLAKE2B 9e8ff24df1b379b83ca154ad23c08eda4ef2e9822276e44501c24603df5f89567a7f56adbc96e879e52a0c4e87567973c56683363fb329f400972f4328a2b9a8 SHA512 743dc0b77c43262e0312e6582c3d34e2feec116683ed47dc96c840a1a0f22cc049aba1e1934ed13f167b60798e4bf5610842a18f73c7b66e5f4dca76aa1e032c
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
index deadec3b9ccc..1fb0085c0a07 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
 
 REQUIRED_USE="
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index e79e55f9abdb..4431e05a3503 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 2365 BLAKE2B 2f9b3a9a592e7f089ef5b9d4a4ec29c916c046cd74d1b4a56234d4d1a2a06a527acac1b5773810dcc623570d21f3929c71ba59c1a05b6ce558fd0868304c4331 SHA512 816dd37456b3bc74bcbcd371039a356bd1aab3e495911511f0629fb259c7297c8b7c853e6d9d71981d02cb555f0e1400f19ba0a4ba27e8585b4075363cd2ecf5
-EBUILD limnoria-99999999.ebuild 2365 BLAKE2B 2f9b3a9a592e7f089ef5b9d4a4ec29c916c046cd74d1b4a56234d4d1a2a06a527acac1b5773810dcc623570d21f3929c71ba59c1a05b6ce558fd0868304c4331 SHA512 816dd37456b3bc74bcbcd371039a356bd1aab3e495911511f0629fb259c7297c8b7c853e6d9d71981d02cb555f0e1400f19ba0a4ba27e8585b4075363cd2ecf5
-MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e
+DIST limnoria-20200124.tar.gz 1034653 BLAKE2B 895a0820efcd58429e457e0cb8dbcb864e56a3bce9fab9546cf622aabc7711a015432812c4193d2dabe7a85043c623ce427504c1c8e78530499c8db2c589bd8e SHA512 828c4927e2ce00c012d17f8a2b2d629370c34915e7e4f71de6df67259e643448c33a60d9cf742b2d827e21e17326a8fc20be875eac826edf64406eda906567a4
+EBUILD limnoria-20200124.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+EBUILD limnoria-9999.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+MISC metadata.xml 432 BLAKE2B cc531ed9f53977a608eb33275b3d17e587b7e4dccfb62c6bc952a9a568ee0c6d70bd52477a610e1b9725dc0adde664d5b5ad218a119d47a42629c5eb827865b7 SHA512 7e5bd85a3471bb3f970ebe08e4eb5efd748cb434bdbac86d574ba2117a25f05ac7a91f01812a4ee0740ce528dcd576a15006f28f844c60c31265ed512ea444d6
diff --git a/net-irc/limnoria/limnoria-20191123.ebuild b/net-irc/limnoria/limnoria-20200124.ebuild
index 9374199261b8..03b9171f694b 100644
--- a/net-irc/limnoria/limnoria-20191123.ebuild
+++ b/net-irc/limnoria/limnoria-20200124.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
 
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 MY_PN="Limnoria"
 MY_P="${MY_PN}-${MY_PV}"
 
-if [[ ${PV} == "99999999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
 	EGIT_BRANCH="testing"
 	inherit git-r3
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="https://supybot.aperio.fr/"
-LICENSE="BSD"
+HOMEPAGE="https://docs.limnoria.net"
+LICENSE="BSD GPL-2 GPL-2+"
 SLOT="0"
-IUSE="crypt ssl"
+IUSE="crypt ssl test"
+RESTRICT=" !test? ( test )"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -38,43 +40,34 @@ RDEPEND="
 	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	!net-irc/supybot
-	!net-irc/supybot-plugins
-	"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
+	!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 -rf "plugins/RSS" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/*
+	rm -r "plugins/RSS" || die
 }
 
 python_test() {
-	pushd "${T}" > /dev/null
-	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+	pushd "${T}" > /dev/null || die
+	PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins
 	EXCLUDE_PLUGINS=()
 	# 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" )
-	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
 		|| die "Tests failed under ${EPYTHON}"
-	popd > /dev/null
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
 }
 
 pkg_postinst() {
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-9999.ebuild
index 9374199261b8..03b9171f694b 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-9999.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
 
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
 MY_PN="Limnoria"
 MY_P="${MY_PN}-${MY_PV}"
 
-if [[ ${PV} == "99999999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
 	EGIT_BRANCH="testing"
 	inherit git-r3
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="https://supybot.aperio.fr/"
-LICENSE="BSD"
+HOMEPAGE="https://docs.limnoria.net"
+LICENSE="BSD GPL-2 GPL-2+"
 SLOT="0"
-IUSE="crypt ssl"
+IUSE="crypt ssl test"
+RESTRICT=" !test? ( test )"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -38,43 +40,34 @@ RDEPEND="
 	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	!net-irc/supybot
-	!net-irc/supybot-plugins
-	"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
+	!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 -rf "plugins/RSS" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/*
+	rm -r "plugins/RSS" || die
 }
 
 python_test() {
-	pushd "${T}" > /dev/null
-	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+	pushd "${T}" > /dev/null || die
+	PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins
 	EXCLUDE_PLUGINS=()
 	# 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" )
-	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
 		|| die "Tests failed under ${EPYTHON}"
-	popd > /dev/null
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
 }
 
 pkg_postinst() {
diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml
index 7d0ba75439c3..05291b97d3d0 100644
--- a/net-irc/limnoria/metadata.xml
+++ b/net-irc/limnoria/metadata.xml
@@ -5,6 +5,7 @@
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="crypt">Enables user authentication with GPG</flag>
 	</use>
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 443e9f70750b..c3246b69d974 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -7,4 +7,4 @@ EBUILD weechat-3.0-r100.ebuild 4186 BLAKE2B a39dcccb10b695521bc7fbe5aa311608df46
 EBUILD weechat-3.0.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145
 EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
 EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
-MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
+MISC metadata.xml 934 BLAKE2B a848491f3855ff1d5911c1e5d2f875cacb1bf1f6df9fa31a3ba9fce80012d33f21992faf6a4748a2f134fd532cf99d58909fa1b0da06d6d7d09982438032324f SHA512 eec6d712307496df84f6294158fddfbe0865dfdbaeedef08231bfeaf0ce9a1b25fc7c163add36c1cdfc24fffdfbbf90063771693bf0d829c82b5886eb6899197
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index bd9e657d8a9e..fcdde9d1fb93 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="fifo">Enable FIFO support (sh pipes)</flag>
 		<flag name="irc">Enable IRC protocol support</flag>
 		<flag name="logger">Enable support for logging</flag>
-		<flag name="man">Build and install man pages</flag>
 		<flag name="relay">Enable relay plugin (experimental)</flag>
 		<flag name="scripts">Build infrastructure for scripting</flag>
 		<flag name="trigger">Enable trigger plugin</flag>