From b7af0105e7f46ad3b4c9205142168eac8f0c1347 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@openbsd.org>
Date: Sun, 26 Mar 2017 11:17:22 +0000
Subject: [PATCH] Update to py-xdis 3.3.0

---
 devel/py-xdis/Makefile  | 15 ++++++---------
 devel/py-xdis/distinfo  |  4 ++--
 devel/py-xdis/pkg/PLIST | 13 +++++--------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/devel/py-xdis/Makefile b/devel/py-xdis/Makefile
index 2367166ce68..64b92c88009 100644
--- a/devel/py-xdis/Makefile
+++ b/devel/py-xdis/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2017/01/03 19:19:49 landry Exp $
+# $OpenBSD: Makefile,v 1.10 2017/03/26 11:17:22 shadchin Exp $
 
 COMMENT =		cross-version byte-code disassembler and marshal routines
 
-MODPY_EGG_VERSION =	3.2.4
+MODPY_EGG_VERSION =	3.3.0
 DISTNAME =		xdis-${MODPY_EGG_VERSION}
 PKGNAME =		py-xdis-${MODPY_EGG_VERSION}
 CATEGORIES =		devel
-REVISION =		0
 
 HOMEPAGE =		https://github.com/rocky/python-xdis/
 
@@ -18,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MODULES =		lang/python
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
-TEST_DEPENDS =		devel/py-nose${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-test-runner${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
@@ -26,11 +25,9 @@ MODPY_SETUPTOOLS =	Yes
 FLAVORS =		python3
 FLAVOR ?=
 
-post-install:
-	mv ${PREFIX}/bin/pydisasm ${PREFIX}/bin/pydisasm${MODPY_BIN_SUFFIX}
+NO_TEST =		Yes
 
-do-test:
-	cd ${WRKSRC} && \
-	    ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} --first-package-wins
+post-install:
+	mv ${PREFIX}/bin/pydisasm{,${MODPY_BIN_SUFFIX}}
 
 .include <bsd.port.mk>
diff --git a/devel/py-xdis/distinfo b/devel/py-xdis/distinfo
index 9c93a1aecd3..8f02579c67f 100644
--- a/devel/py-xdis/distinfo
+++ b/devel/py-xdis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xdis-3.2.4.tar.gz) = sxElO5ejIatFYlCJpynMv4vLExmoxMAWe3GfgcCBVDw=
-SIZE (xdis-3.2.4.tar.gz) = 127507
+SHA256 (xdis-3.3.0.tar.gz) = Mu62kOk3atQEwfsYwfh6CTRfm+yjHO4eqPId0PDcqgc=
+SIZE (xdis-3.3.0.tar.gz) = 146531
diff --git a/devel/py-xdis/pkg/PLIST b/devel/py-xdis/pkg/PLIST
index 70c12ec80ff..b9b4f7c50a7 100644
--- a/devel/py-xdis/pkg/PLIST
+++ b/devel/py-xdis/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2016/12/17 11:25:33 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.6 2017/03/26 11:17:22 shadchin Exp $
 bin/pydisasm${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/xdis/
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/xdis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/xdis/__init__.py
@@ -17,17 +16,12 @@ lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}load.${MODPY_PYC_M
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}magics.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}marsh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}std.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}unmarshal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}verify.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/${MODPY_PYCACHE}wordcode.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/xdis/bin/
-lib/python${MODPY_VERSION}/site-packages/xdis/bin/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdis/bin/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/xdis/bin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/xdis/bin/${MODPY_PYCACHE}pydisassemble.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/xdis/bin/pydisassemble.py
 lib/python${MODPY_VERSION}/site-packages/xdis/bytecode.py
 lib/python${MODPY_VERSION}/site-packages/xdis/code.py
 lib/python${MODPY_VERSION}/site-packages/xdis/dropbox/
@@ -44,6 +38,7 @@ lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_15.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_20.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_21.${MODPY_PYC_MAGIC_TAG}pyc
@@ -65,6 +60,7 @@ lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_3x.
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy26.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy27.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/${MODPY_PYCACHE}opcode_pypy32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/base.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_15.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_20.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_21.py
@@ -86,6 +82,7 @@ lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_3x.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy26.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy27.py
 lib/python${MODPY_VERSION}/site-packages/xdis/opcodes/opcode_pypy32.py
+lib/python${MODPY_VERSION}/site-packages/xdis/std.py
 lib/python${MODPY_VERSION}/site-packages/xdis/unmarshal.py
 lib/python${MODPY_VERSION}/site-packages/xdis/util.py
 lib/python${MODPY_VERSION}/site-packages/xdis/verify.py