From 6f98c271b9179833ca4806a60606d136441ea4f2 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 3 Oct 2022 22:11:28 +0000
Subject: [PATCH] update to py3-rebulk-3.1.0

---
 textproc/py-rebulk/Makefile  | 13 ++++------
 textproc/py-rebulk/distinfo  |  4 ++--
 textproc/py-rebulk/pkg/PLIST | 46 ++++++++++++++++++++++++++++++------
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/textproc/py-rebulk/Makefile b/textproc/py-rebulk/Makefile
index cb37798e5c7..4d6df625252 100644
--- a/textproc/py-rebulk/Makefile
+++ b/textproc/py-rebulk/Makefile
@@ -1,10 +1,9 @@
 COMMENT =	define simple search patterns in bulk to perform
 
-MODPY_EGG_VERSION =	3.0.1
+MODPY_EGG_VERSION =	3.1.0
 
 DISTNAME =	rebulk-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
 
 CATEGORIES =	textproc
 
@@ -13,14 +12,12 @@ HOMEPAGE =	https://github.com/Toilal/rebulk/
 # MIT
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
+MODULES =	lang/python
 
-MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
-MODPY_PYTEST_ARGS =	rebulk
+MODPY_PI =	Yes
+MODPY_PYBUILD =	setuptools
 
-BUILD_DEPENDS =		devel/py-test-runner${MODPY_FLAVOR}
+BUILD_DEPENDS =	devel/py-test-runner${MODPY_FLAVOR}
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/textproc/py-rebulk/distinfo b/textproc/py-rebulk/distinfo
index de1df1795cb..62f7e72981f 100644
--- a/textproc/py-rebulk/distinfo
+++ b/textproc/py-rebulk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rebulk-3.0.1.tar.gz) = Al0ZHBGr+RdMav8ABleWJAR9M3GmVDM8S/ektCFVLNw=
-SIZE (rebulk-3.0.1.tar.gz) = 260207
+SHA256 (rebulk-3.1.0.tar.gz) = gJ3jqXxor6gx9xAbENMW/mLgYdyff2ekS3c4EochFzo=
+SIZE (rebulk-3.1.0.tar.gz) = 260087
diff --git a/textproc/py-rebulk/pkg/PLIST b/textproc/py-rebulk/pkg/PLIST
index 0750c1024b0..49a29f6d473 100644
--- a/textproc/py-rebulk/pkg/PLIST
+++ b/textproc/py-rebulk/pkg/PLIST
@@ -1,29 +1,46 @@
 lib/python${MODPY_VERSION}/site-packages/rebulk/
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/rebulk-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/rebulk/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}chain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}chain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}formatters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}formatters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}introspector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}introspector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}loose.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}loose.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}match.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}match.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}pattern.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}pattern.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}processors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}processors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}rebulk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}rebulk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}remodule.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}remodule.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}toposort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}toposort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rebulk/__version__.py
 lib/python${MODPY_VERSION}/site-packages/rebulk/builder.py
@@ -41,20 +58,35 @@ lib/python${MODPY_VERSION}/site-packages/rebulk/rules.py
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}default_rules_module.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}default_rules_module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}rebulk_rules_module.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}rebulk_rules_module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}rules_module.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}rules_module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_chain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_chain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_introspector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_introspector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_loose.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_loose.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_match.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_match.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_pattern.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_pattern.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_processors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_processors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_rebulk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_rebulk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_toposort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_toposort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/${MODPY_PYCACHE}test_validators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/default_rules_module.py
 lib/python${MODPY_VERSION}/site-packages/rebulk/test/rebulk_rules_module.py