CHANGE/NEW RDEP devel/py-test-expect

devel/py-test-expect is blocking an update of net/py-msgpack.
Interestingly, the first actually depends on u-msgpack-python, and has
been patched to use our port of py-msgpack. Diff below updates RDEP, and
removes two unneeded patches

Additionally I would like to import u-msgpack-python to resolve this
blocking issue. Port has been enclosed with this mail.

DESCR:
u-msgpack-python is a lightweight MessagePack serializer and
deserializer module written in pure Python. u-msgpack-python is fully
compliant with the latest MessagePack specification. In particular, it
supports the new binary, UTF-8 string, and application-defined ext
types.


OK?


diff --git Makefile Makefile
index da98c73fb02..2f462a825d2 100644
--- Makefile
+++ Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.1.0
DISTNAME = pytest-expect-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
-REVISION = 5
+REVISION = 6

HOMEPAGE = https://github.com/gsnedders/pytest-expect

@@ -22,7 +22,7 @@ FLAVORS = python3
FLAVOR = python3

RUN_DEPENDS = devel/py-test${MODPY_FLAVOR} \
- net/py-msgpack${MODPY_FLAVOR}
+ net/py-u-msgpack${MODPY_FLAVOR}

NO_TEST = Yes

diff --git patches/patch-pytest_expect_expect_py patches/patch-pytest_expect_expect_py
deleted file mode 100644
index dbcbe58fe48..00000000000
--- patches/patch-pytest_expect_expect_py
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-pytest_expect_expect_py,v 1.1.1.1 2017/06/28 18:00:36 shadchin Exp $
-
-Index: pytest_expect/expect.py
---- pytest_expect/expect.py.orig
-+++ pytest_expect/expect.py
-@@ -15,7 +15,7 @@ import os.path
- import sys
-
- import pytest
--import umsgpack
-+import msgpack
- from six import PY2, PY3, text_type, binary_type
-
- _magic_file_line = b"pytest-expect file v"
-@@ -142,7 +142,7 @@ class ExpectationPlugin(object):
- fp.write(line)
-
- def _parse_legacy_file(self, fp):
-- state = umsgpack.unpack(fp)
-+ state = msgpack.unpack(fp)
-
- if PY3 and b'py_version' in state:
- for key in list(state.keys()):
diff --git patches/patch-setup_py patches/patch-setup_py
deleted file mode 100644
index 592dce6bf13..00000000000
--- patches/patch-setup_py
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2017/06/28 18:00:36 shadchin Exp $
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -28,7 +28,7 @@ setup(
-
- install_requires=[
- "pytest",
-- "u-msgpack-python"
-+ "msgpack-python"
- ],
-
- packages=["pytest_expect"],