address a few deprecation warnings; from upstream

sysutils/salt/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2020/05/15 11:01:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.143 2020/05/20 12:38:20 jasper Exp $
 
 # optional dependencies
 # https://github.com/saltstack/salt/blob/develop/doc/conf.py
@@ -19,6 +19,7 @@ COMMENT =		remote execution and configuration management system
 
 MODPY_EGG_VERSION =	3000.3
 DISTNAME =		salt-${MODPY_EGG_VERSION}
+REVISION =		0
 
 CATEGORIES =		sysutils net devel
 

sysutils/salt/patches/patch-salt_modules_file_py

@@ -0,0 +1,17 @@
+$OpenBSD: patch-salt_modules_file_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
+
+Fix deprecation warnings; from multiple upstream commits
+
+Index: salt/modules/file.py
+--- salt/modules/file.py.orig
++++ salt/modules/file.py
+@@ -29,7 +29,8 @@ import time
+ import glob
+ import hashlib
+ import mmap
+-from collections import Iterable, Mapping, namedtuple
++from collections import namedtuple
++from collections.abc import Iterable, Mapping
+ from functools import reduce  # pylint: disable=redefined-builtin
+ 
+ # pylint: disable=import-error,no-name-in-module,redefined-builtin

sysutils/salt/patches/patch-salt_modules_win_file_py

@@ -0,0 +1,16 @@
+$OpenBSD: patch-salt_modules_win_file_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
+
+Fix deprecation warnings; from multiple upstream commits
+
+Index: salt/modules/win_file.py
+--- salt/modules/win_file.py.orig
++++ salt/modules/win_file.py
+@@ -17,7 +17,7 @@ import os.path
+ import logging
+ # pylint: disable=W0611
+ import operator  # do not remove
+-from collections import Iterable, Mapping  # do not remove
++from collections.abc import Iterable, Mapping  # do not remove
+ from functools import reduce  # do not remove
+ import datetime  # do not remove.
+ import tempfile  # do not remove. Used in salt.modules.file.__clean_tmp

sysutils/salt/patches/patch-salt_utils_oset_py

@@ -0,0 +1,25 @@
+$OpenBSD: patch-salt_utils_oset_py,v 1.1 2020/05/20 12:38:20 jasper Exp $
+
+Fix deprecation warnings; from multiple upstream commits
+
+Index: salt/utils/oset.py
+--- salt/utils/oset.py.orig
++++ salt/utils/oset.py
+@@ -22,7 +22,7 @@ Rob Speer's changes are as follows:
+     - added __getitem__
+ '''
+ from __future__ import absolute_import, unicode_literals, print_function
+-import collections
++from collections.abc import OrderedSet
+ 
+ SLICE_ALL = slice(None)
+ __version__ = '2.0.1'
+@@ -44,7 +44,7 @@ def is_iterable(obj):
+     return hasattr(obj, '__iter__') and not isinstance(obj, str) and not isinstance(obj, tuple)
+ 
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(MutableSet):
+     """
+     An OrderedSet is a custom MutableSet that remembers its order, so that
+     every entry has an index that can be looked up.