update to py-yaml-5.4.1 (last version with py2 support; security/floss

has not had a py3 release yet, though it is in their git tree now).
ok gonzalo@ pea@

textproc/py-yaml/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2021/11/02 00:02:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2022/02/01 18:30:27 sthen Exp $
 
 COMMENT=	YAML parser and emitter in Python
 
-MODPY_EGG_VERSION=5.3.1
+MODPY_EGG_VERSION=5.4.1
 DISTNAME=	PyYAML-${MODPY_EGG_VERSION}
 PKGNAME=	py-yaml-${MODPY_EGG_VERSION}
 CATEGORIES=	textproc
-REVISION=	2
 
 HOMEPAGE=	https://pyyaml.org/wiki/PyYAML
 
@@ -15,20 +14,18 @@ MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 # BSD
 PERMIT_PACKAGE=	Yes
 
-WANTLIB+=	pthread yaml-0 ${MODPY_WANTLIB}
+FLAVORS=	python3
+FLAVOR?=
 
 MODULES=	lang/python
 MODPY_PI=	Yes
+MODPY_SETUPTOOLS= Yes
 
-FLAVORS =	python3
-FLAVOR ?=
-
+.if ${FLAVOR:Mpython3}
+MODPY_SETUP_ARGS= --with-libyaml
+CFLAGS+=	-I${LOCALBASE}/include
 LIB_DEPENDS=	devel/libyaml
-
-pre-configure:
-	${SUBST_CMD} ${WRKSRC}/setup.cfg
-
-do-test:
-	@cd ${WRKSRC} && ${MODPY_BIN} ${MODPY_SETUP} test
+WANTLIB+=	pthread yaml-0 ${MODPY_WANTLIB}
+.endif
 
 .include <bsd.port.mk>

textproc/py-yaml/distinfo

@@ -1,2 +1,2 @@
-SHA256 (PyYAML-5.3.1.tar.gz) = uOrHUsXhTT7KDm3ZGZzWJ1GMtewGrdDenTK67ub+ZF0=
-SIZE (PyYAML-5.3.1.tar.gz) = 269377
+SHA256 (PyYAML-5.4.1.tar.gz) = YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4=
+SIZE (PyYAML-5.4.1.tar.gz) = 175147

textproc/py-yaml/patches/patch-setup_cfg

@@ -1,17 +0,0 @@
-$OpenBSD: patch-setup_cfg,v 1.2 2019/06/23 16:28:30 kmos Exp $
-Index: setup.cfg
---- setup.cfg.orig
-+++ setup.cfg
-@@ -4,10 +4,10 @@
- [build_ext]
- 
- # List of directories to search for 'yaml.h' (separated by ':').
--#include_dirs=/usr/local/include:../../include
-+include_dirs=${LOCALBASE}/include
- 
- # List of directories to search for 'libyaml.a' (separated by ':').
--#library_dirs=/usr/local/lib:../../lib
-+library_dirs=${LOCALBASE}/lib
- 
- # An alternative compiler to build the extension.
- #compiler=mingw32

textproc/py-yaml/pkg/PLIST

@@ -1,6 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/01/04 14:06:39 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-@so lib/python${MODPY_VERSION}/site-packages/_yaml.${MODPY_PYC_MAGIC_TAG}so
+@comment $OpenBSD: PLIST,v 1.5 2022/02/01 18:30:27 sthen Exp $
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/_yaml/
+lib/python${MODPY_VERSION}/site-packages/_yaml/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_yaml/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/_yaml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yaml/
 lib/python${MODPY_VERSION}/site-packages/yaml/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}/
@@ -21,6 +28,7 @@ lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}resolver.${MODPY_P
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}@so lib/python${MODPY_VERSION}/site-packages/yaml/_yaml.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/yaml/composer.py
 lib/python${MODPY_VERSION}/site-packages/yaml/constructor.py
 lib/python${MODPY_VERSION}/site-packages/yaml/cyaml.py