gentoo resync : 12.05.2022

4 files changed, 123 insertions, 2 deletions

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 9c46cf2cbd82..2acda117e831 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,8 @@
+AUX err-6.1.8-fix-irc-backend.patch 634 BLAKE2B af2172ed19774d999582f3d9b5ddf51f810b563acc8f7cc63d235106fafd4862427ebb5a13bc3dfdf0ef593714ba864b36f872926eebdae70dfaa1d686175ed8 SHA512 498dd3e2388d2bef738eb49fc2ca24cbbeefa103248de0ba9a65ed330e8cef58be53116a6d653fc0cbafe821f07d1a47fc0e1dd820c89054624596e61cfddb11
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
 DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
+DIST err-6.1.8.tar.gz 1609310 BLAKE2B e3682bfccd548c92160322287a17e26448322abd3956d464b393f333c0cc521d6d5183dab799d280603995a4508a2eb300fefb9c6159da6ed1c550247fa375d9 SHA512 5413f667ee4e121134b791f0dc8fd709ecbd9093a237b9637d282f41458c40076615ffc9167cfa95f297ae416c38b16ded8ae97aece55a81d88dc46b324ec851
 EBUILD err-6.1.7.ebuild 2301 BLAKE2B db443e087f79581fe8b2923c2ade30fbc2d5f895972407388aece1e8bfa49c8c6c5acd69c45a60286ea3a87c3be5b98fd18bebd9a1a67ac379ec30d6b6e3357a SHA512 a26edde9eb6479a18a216a3538551d1bd5a0c6f69600f55e3abb9e7029b5359ff8c29c3efdeff96119d12e8d97a587fb12b812348969c46aadf87d59da7e91ef
-MISC metadata.xml 405 BLAKE2B d9c71a11945e25d671c611071759d18c8b83d675b0fbf86f5987d641a3b4f96e36b8788f86cd6fa3f752079fd11bcb1788a9f43f08cc7abc6baa8d504d33070a SHA512 ebe259dd406f69a559527d98a6e33a8a1f7685b24e6e9afbc7629862d736e4a571af452e965b676f3f3b2f8cf39a2035441e8ffeea1175ce286a70eb65e6f864
+EBUILD err-6.1.8-r1.ebuild 2380 BLAKE2B 63ff506e09bdfa17e46c0d4f475a67f23829d4034db8db4a0fa32dc1b6c8fe9d71afd345e4a09bd887d5d3fbdb0762192205c339baf2849a46b3e1a45fc727fb SHA512 73943908459006ad55d4f3d468be526dbcd2953475fc5e099f7378e198467cd588ffbf18c065837f4b20240b6aa2e63f34801f8f593452702eb79883200fcb02
+MISC metadata.xml 624 BLAKE2B 82482586c0927ad0e4857a951aea4dba50adf18250c20a6794dc4f2f35c2b39026cd326be5bcb75db42dbd847db89c44d71956d474e89828f529a58d662a07a0 SHA512 c0159fbb1e2c0d8bea6e3b1c39bb126e005152a4c2ae7d8d738942ee21eafa8a6a2f22a819ef9668e7436dffccd346d0558ed3f2720ff7ad54ba9e03688b6ad0
diff --git a/net-im/err/err-6.1.8-r1.ebuild b/net-im/err/err-6.1.8-r1.ebuild
new file mode 100644
index 000000000000..d81238c7980a
--- /dev/null
+++ b/net-im/err/err-6.1.8-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES="${FILESDIR}/err-6.1.8-fix-irc-backend.patch"
+
+KEYWORDS="~amd64 ~riscv"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="
+	acct-group/err
+	acct-user/err"
+RDEPEND="${DEPEND}
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/deepmerge[${PYTHON_USEDEP}]
+	dev-python/dulwich[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
+	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
+
+	# NameError: name 'slack' is not defined
+	rm tests/backend_tests/slack_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		tests/commands_test.py::test_plugin_cycle
+		tests/commands_test.py::test_broken_plugin
+		tests/commands_test.py::test_backup
+		tests/plugin_management_test.py::test_check_dependencies_requi
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
+
+pkg_postinst() {
+	elog "For more backends (Hipchat, Slact, Telegram) support, use pip"
+}
diff --git a/net-im/err/files/err-6.1.8-fix-irc-backend.patch b/net-im/err/files/err-6.1.8-fix-irc-backend.patch
new file mode 100644
index 000000000000..0874e7352bc1
--- /dev/null
+++ b/net-im/err/files/err-6.1.8-fix-irc-backend.patch
@@ -0,0 +1,18 @@
+From 34df1dd98a7ce3a17c22081fadb427827b431d7f Mon Sep 17 00:00:00 2001
+From: Carlos <nzlosh@yahoo.com>
+Date: Fri, 22 Apr 2022 23:45:44 +0200
+Subject: [PATCH] Fixes #1566 remove unsupport argument reconnection_interval
+ from irc backend.
+
+diff --git a/errbot/backends/irc.py b/errbot/backends/irc.py
+index 95a8757d4..9f7e75b29 100644
+--- a/errbot/backends/irc.py
++++ b/errbot/backends/irc.py
+@@ -377,7 +377,6 @@ def __init__(
+             [(server, port, password)],
+             nickname,
+             username,
+-            reconnection_interval=reconnect_on_disconnect,
+         )
+ 
+     def connect(self, *args, **kwargs) -> None:
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index ad3280d31150..3a8a8e82fe09 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>guyu2876@gmail.com</email>
+		<name>Yu Gu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<use>
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>