gentoo resync : 25.08.2020

4 files changed, 204 insertions, 13 deletions

diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index c577cc5f5dca..06e8491f0eee 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,6 @@
+AUX err-6.1.4-slixmpp.patch 8036 BLAKE2B 1217bc47c7e8dfb6496aff8f4bbb0e3c328d9491f5920a05ec0bebd9995392700499ef2d566778afd667b9ccce6d459afc59a79811d70689debf454d1663554a SHA512 dce31ad8ccc3e0df7cf3e8b228dacb276601e5dd2c087329c5d9bbfa5c491103a886f66fd558c2612851ec8f8be8eb4f064bd4b7397a7f8e60ca71440254e82f
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
-DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
-EBUILD err-5.2.0-r1.ebuild 2247 BLAKE2B 3e05f17de459ce69ffa21c3e48c6aafb912495cc9a908139089f3b51a7ebafe585c6920503c73a9b145260cf83996191b82eb09558a1ceb9a56340a4ae18dbc4 SHA512 b8222d6be7edd44e27f51fac4129b8521f602a756b610a25f711d689cb4ad295c21bc4f1c56607d2d6bef9fda540c492e3c0e150882bdb5608ba43999eedbc1d
-MISC metadata.xml 565 BLAKE2B 0f8c06a4387ace540e55b6c2411b11729246cdbf13b5a0cd2a3d6db52390953e41d4e3c44755b231069cea099acb7c0c54db110d596a0bc00fd148e49bad5b19 SHA512 b7181c500317c3b91a747e707dff966f42744a85b97f7b51b8aad30814b5464e092405bc3868900968cca1670637150ea259281463fa769cb1c3e39783d87285
+DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d
+EBUILD err-6.1.4.ebuild 2398 BLAKE2B 7473ede2525b2d21818eb4eb30b172f301f54ed72b744ea046ba9f3f60172dfbdf125d98a2650bd2001d4d86ba1b5b09279f47f405719bb359863ac600f69401 SHA512 1eca01501945beb4d87dec19657f64266335846da4d5fb8a8db63a76ec018b631fe91d462994397540ef5a8abe6b4bed44669fd47e83d44d939d8203eb334707
+MISC metadata.xml 460 BLAKE2B 8c1deeb593953a71ed352b3491fc87e138550a6f943e4892a1482175241f6050f137797ce65f4f84d7241db57c0280eb83f264bb9958f3d3f0ae5aaf72f7e9af SHA512 bf07d6c10087bd3f64d028f35874f6f3a4a0d09dbaa97a8750d577914fde1e95c583e4b22d34e7d96a75a4fa6ef98acf3983f9fb81c0d11b10fa2d40a1a5012c
diff --git a/net-im/err/err-5.2.0-r1.ebuild b/net-im/err/err-6.1.4.ebuild
index 282cefd5b968..65c20b5d54fb 100644
--- a/net-im/err/err-5.2.0-r1.ebuild
+++ b/net-im/err/err-6.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 
 MY_PN="errbot"
 MY_P="${MY_PN}-${PV}"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 inherit distutils-r1 user
 
 DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
-HOMEPAGE="http://errbot.io/"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="irc +xmpp"
@@ -27,8 +27,10 @@ RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/daemonize[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
@@ -40,10 +42,12 @@ RDEPEND="
 	xmpp? (
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 # NOTES:
diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch
new file mode 100644
index 000000000000..ccccc171f238
--- /dev/null
+++ b/net-im/err/files/err-6.1.4-slixmpp.patch
@@ -0,0 +1,190 @@
+From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001
+From: Birger Schacht <1143280+bisco2@users.noreply.github.com>
+Date: Sat, 11 Jul 2020 11:20:53 +0000
+Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430)
+
+* Start moving to slixmpp
+
+* Pass a default value for ssl_version to the XMPPConnection
+---
+ .../plugin_development/backend_specifics.rst  |  6 +--
+ errbot/backends/xmpp.py                       | 49 +++++++++----------
+ setup.py                                      |  4 +-
+
+diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py
+index 08f49340..e27c2893 100644
+--- a/errbot/backends/xmpp.py
++++ b/errbot/backends/xmpp.py
+@@ -2,7 +2,6 @@
+ import sys
+ from functools import lru_cache
+ 
+-from threading import Thread
+ from time import sleep
+ 
+ from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person
+@@ -13,10 +12,10 @@
+ log = logging.getLogger(__name__)
+ 
+ try:
+-    from sleekxmpp import ClientXMPP
+-    from sleekxmpp.xmlstream import resolver, cert
+-    from sleekxmpp import JID
+-    from sleekxmpp.exceptions import IqError
++    from slixmpp import ClientXMPP
++    from slixmpp.xmlstream import resolver, cert
++    from slixmpp import JID
++    from slixmpp.exceptions import IqError
+ 
+ except ImportError:
+     log.exception("Could not start the XMPP backend")
+@@ -114,15 +113,10 @@ def join(self, username=None, password=None):
+         :meth:`create` on it first.
+         """
+         room = str(self)
+-        self.xep0045.joinMUC(room, username, password=password, wait=True)
++        self.xep0045.join_muc(room, username, password=password, wait=True)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+-        # Room configuration can only be done once a MUC presence stanza
+-        # has been received from the server. This HAS to take place in a
+-        # separate thread because of how SleekXMPP processes these stanzas.
+-        t = Thread(target=self.configure)
+-        t.setDaemon(True)
+-        t.start()
++        self.configure()
+         self._bot.callback_room_joined(self)
+         log.info('Joined room %s.', room)
+ 
+@@ -137,7 +131,7 @@ def leave(self, reason=None):
+             reason = ""
+         room = str(self)
+         try:
+-            self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
++            self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
+ 
+             self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+             self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+@@ -148,7 +142,7 @@ def leave(self, reason=None):
+ 
+     def create(self):
+         """
+-        Not supported on this back-end (SleekXMPP doesn't support it).
++        Not supported on this back-end (Slixmpp doesn't support it).
+         Will join the room to ensure it exists, instead.
+         """
+         logging.warning(
+@@ -186,7 +180,7 @@ def joined(self):
+         :getter:
+             Returns `True` if the room has been joined, `False` otherwise.
+         """
+-        return str(self) in self.xep0045.getJoinedRooms()
++        return str(self) in self.xep0045.get_joined_rooms()
+ 
+     @property
+     def topic(self):
+@@ -214,7 +208,7 @@ def topic(self, topic):
+         :param topic:
+             The topic to set.
+         """
+-        # Not supported by SleekXMPP at the moment :(
++        # Not supported by Slixmpp at the moment :(
+         raise NotImplementedError("Setting the topic is not supported on this back-end.")
+ 
+     @property
+@@ -261,16 +255,16 @@ def configure(self):
+         affiliation = None
+         while affiliation is None:
+             sleep(0.5)
+-            affiliation = self.xep0045.getJidProperty(
++            affiliation = self.xep0045.get_jid_property(
+                 room=room,
+-                nick=self.xep0045.ourNicks[room],
+-                jidProperty='affiliation'
++                nick=self.xep0045.our_nicks[room],
++                jid_property='affiliation'
+             )
+ 
+         if affiliation == "owner":
+             log.debug('Configuring room %s: we have owner affiliation.', room)
+-            form = self.xep0045.getRoomConfig(room)
+-            self.xep0045.configureRoom(room, form)
++            form = yield from self.xep0045.get_room_config(room)
++            self.xep0045.configure_room(room, form)
+         else:
+             log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation)
+ 
+@@ -291,7 +285,7 @@ def real_jid(self):
+         Will only work if the errbot is moderator in the MUC or it is not anonymous.
+         """
+         room_jid = self._node + '@' + self._domain
+-        jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid'))
++        jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid'))
+         return jid.bare
+ 
+     @property
+@@ -303,7 +297,8 @@ def room(self):
+ 
+ class XMPPConnection(object):
+     def __init__(self, jid, password, feature=None, keepalive=None,
+-                 ca_cert=None, server=None, use_ipv6=None, bot=None):
++                 ca_cert=None, server=None, use_ipv6=None, bot=None,
++                 ssl_version=None):
+         if feature is None:
+             feature = {}
+         self._bot = bot
+@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None,
+         self.client.register_plugin('xep_0249')  # XMPP direct MUC invites
+ 
+         if keepalive is not None:
+-            self.client.whitespace_keepalive = True  # Just in case SleekXMPP's default changes to False in the future
++            self.client.whitespace_keepalive = True  # Just in case Slixmpp's default changes to False in the future
+             self.client.whitespace_keepalive_interval = keepalive
+ 
+         if use_ipv6 is not None:
+@@ -348,7 +343,7 @@ def disconnect(self):
+         self.connected = False
+ 
+     def serve_forever(self):
+-        self.client.process(block=True)
++        self.client.process()
+ 
+     def add_event_handler(self, name, cb):
+         self.client.add_event_handler(name, cb)
+@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg):
+             msg.to = self._build_person(xmppmsg['to'].full)
+ 
+         msg.nick = xmppmsg['mucnick']
+-        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in sleekxmpp it should be ['from']
++        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in slixmpp it should be ['from']
+         self.callback_message(msg)
+ 
+     def _idd_from_event(self, event):
+@@ -582,7 +577,7 @@ def rooms(self):
+             A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances.
+         """
+         xep0045 = self.conn.client.plugin['xep_0045']
+-        return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()]
++        return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()]
+ 
+     def query_room(self, room):
+         """
+diff --git a/setup.py b/setup.py
+index 3d0c09f8..4a3c1ea1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'):
+         },
+         extras_require={
+             'graphic': ['PySide', ],
+-            'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'],
+             'IRC': ['irc', ],
+             'slack': ['slackclient>=1.0.5,<2.0', ],
+             'slack-rtm': ['slackclient>=2.0', ],
+             'telegram': ['python-telegram-bot', ],
+-            'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'],
+             ':python_version<"3.7"': ['dataclasses'],  # backward compatibility for 3.3->3.6 for dataclasses
+             ':sys_platform!="win32"': ['daemonize'],
+         },
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 21914ed5cfe5..f1f4f68229d0 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -9,11 +9,7 @@
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">gbin/err</remote-id>
-		<maintainer status="active">
-			<email>gbin@gootz.net</email>
-			<name>Guillaume BINET</name>
-		</maintainer>
+		<remote-id type="github">errbotio/errbot</remote-id>
 		<remote-id type="pypi">err</remote-id>
 	</upstream>
 </pkgmetadata>