From 3b583290d4debe5f5d0c07be2f790acbf7c7f084 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 4 May 2023 11:38:14 +0000
Subject: [PATCH] py-cyclonedx-python-lib: update to 4.0.0.

Feature

    Release 4.0.0 #341) (8fb1b14)

Breaking

    Large portions of this library have been re-written for this release and many methods and contracts have changed. (8fb1b14)
    Model classes changed to relocated Vulnerability at Bom, not at Component (8fb1b14)
    Model classes changed to relocated Vulnerability at Bom, not at Component (8fb1b14)
    (8fb1b14)
---
 security/py-cyclonedx-python-lib/Makefile     | 21 +++++---
 security/py-cyclonedx-python-lib/PLIST        | 51 +++++--------------
 security/py-cyclonedx-python-lib/distinfo     |  9 ++--
 .../patches/patch-setup.py                    | 15 ------
 4 files changed, 32 insertions(+), 64 deletions(-)
 delete mode 100644 security/py-cyclonedx-python-lib/patches/patch-setup.py

diff --git a/security/py-cyclonedx-python-lib/Makefile b/security/py-cyclonedx-python-lib/Makefile
index c570a13a7ed3..0835a4d15de9 100644
--- a/security/py-cyclonedx-python-lib/Makefile
+++ b/security/py-cyclonedx-python-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2023/03/29 09:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/05/04 11:38:14 wiz Exp $
 
-DISTNAME=	cyclonedx-python-lib-3.1.0
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+DISTNAME=	cyclonedx_python_lib-4.0.0
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cyclonedx-python-lib/}
 
@@ -10,19 +10,26 @@ HOMEPAGE=	https://github.com/CycloneDX/cyclonedx-python-lib
 COMMENT=	Python library for generating CycloneDX SBOMs
 LICENSE=	apache-2.0
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=0:../../devel/py-poetry-core
 DEPENDS+=	${PYPKGPREFIX}-packageurl>=0.9:../../devel/py-packageurl
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=47.0.0:../../devel/py-setuptools
+DEPENDS+=	${PYPKGPREFIX}-serializable>=0.11.1:../../devel/py-serializable
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=2.4.0:../../devel/py-sortedcontainers
-DEPENDS+=	${PYPKGPREFIX}-toml>=0.10.0:../../textproc/py-toml
+TEST_DEPENDS+=	${PYPKGPREFIX}-ddt-[0-9]*:../../devel/py-ddt
+TEST_DEPENDS+=	${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
+TEST_DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-xmldiff-[0-9]*:../../textproc/py-xmldiff
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+
 .include "../../lang/python/pyversion.mk"
 
-.if ${PYTHON_VERSION} == 307
+.if ${PYTHON_VERSION} < 308
 DEPENDS+=	${PYPKGPREFIX}-importlib-metadata>=3.4:../../devel/py-importlib-metadata
 .endif
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cyclonedx-python-lib/PLIST b/security/py-cyclonedx-python-lib/PLIST
index ea04333d1a27..d26b4e8153b9 100644
--- a/security/py-cyclonedx-python-lib/PLIST
+++ b/security/py-cyclonedx-python-lib/PLIST
@@ -1,77 +1,49 @@
-@comment $NetBSD: PLIST,v 1.5 2022/09/18 11:53:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/05/04 11:38:14 wiz Exp $
 ${PYSITELIB}/cyclonedx/__init__.py
 ${PYSITELIB}/cyclonedx/__init__.pyc
-${PYSITELIB}/cyclonedx/__init__.pyo
 ${PYSITELIB}/cyclonedx/exception/__init__.py
 ${PYSITELIB}/cyclonedx/exception/__init__.pyc
-${PYSITELIB}/cyclonedx/exception/__init__.pyo
 ${PYSITELIB}/cyclonedx/exception/factory.py
 ${PYSITELIB}/cyclonedx/exception/factory.pyc
-${PYSITELIB}/cyclonedx/exception/factory.pyo
 ${PYSITELIB}/cyclonedx/exception/model.py
 ${PYSITELIB}/cyclonedx/exception/model.pyc
-${PYSITELIB}/cyclonedx/exception/model.pyo
 ${PYSITELIB}/cyclonedx/exception/output.py
 ${PYSITELIB}/cyclonedx/exception/output.pyc
-${PYSITELIB}/cyclonedx/exception/output.pyo
 ${PYSITELIB}/cyclonedx/factory/__init__.py
 ${PYSITELIB}/cyclonedx/factory/__init__.pyc
-${PYSITELIB}/cyclonedx/factory/__init__.pyo
 ${PYSITELIB}/cyclonedx/factory/license.py
 ${PYSITELIB}/cyclonedx/factory/license.pyc
-${PYSITELIB}/cyclonedx/factory/license.pyo
 ${PYSITELIB}/cyclonedx/model/__init__.py
 ${PYSITELIB}/cyclonedx/model/__init__.pyc
-${PYSITELIB}/cyclonedx/model/__init__.pyo
 ${PYSITELIB}/cyclonedx/model/bom.py
 ${PYSITELIB}/cyclonedx/model/bom.pyc
-${PYSITELIB}/cyclonedx/model/bom.pyo
 ${PYSITELIB}/cyclonedx/model/bom_ref.py
 ${PYSITELIB}/cyclonedx/model/bom_ref.pyc
-${PYSITELIB}/cyclonedx/model/bom_ref.pyo
 ${PYSITELIB}/cyclonedx/model/component.py
 ${PYSITELIB}/cyclonedx/model/component.pyc
-${PYSITELIB}/cyclonedx/model/component.pyo
 ${PYSITELIB}/cyclonedx/model/dependency.py
 ${PYSITELIB}/cyclonedx/model/dependency.pyc
-${PYSITELIB}/cyclonedx/model/dependency.pyo
 ${PYSITELIB}/cyclonedx/model/impact_analysis.py
 ${PYSITELIB}/cyclonedx/model/impact_analysis.pyc
-${PYSITELIB}/cyclonedx/model/impact_analysis.pyo
 ${PYSITELIB}/cyclonedx/model/issue.py
 ${PYSITELIB}/cyclonedx/model/issue.pyc
-${PYSITELIB}/cyclonedx/model/issue.pyo
 ${PYSITELIB}/cyclonedx/model/release_note.py
 ${PYSITELIB}/cyclonedx/model/release_note.pyc
-${PYSITELIB}/cyclonedx/model/release_note.pyo
 ${PYSITELIB}/cyclonedx/model/service.py
 ${PYSITELIB}/cyclonedx/model/service.pyc
-${PYSITELIB}/cyclonedx/model/service.pyo
 ${PYSITELIB}/cyclonedx/model/vulnerability.py
 ${PYSITELIB}/cyclonedx/model/vulnerability.pyc
-${PYSITELIB}/cyclonedx/model/vulnerability.pyo
 ${PYSITELIB}/cyclonedx/output/__init__.py
 ${PYSITELIB}/cyclonedx/output/__init__.pyc
-${PYSITELIB}/cyclonedx/output/__init__.pyo
 ${PYSITELIB}/cyclonedx/output/json.py
 ${PYSITELIB}/cyclonedx/output/json.pyc
-${PYSITELIB}/cyclonedx/output/json.pyo
-${PYSITELIB}/cyclonedx/output/schema.py
-${PYSITELIB}/cyclonedx/output/schema.pyc
-${PYSITELIB}/cyclonedx/output/schema.pyo
-${PYSITELIB}/cyclonedx/output/serializer/__init__.py
-${PYSITELIB}/cyclonedx/output/serializer/__init__.pyc
-${PYSITELIB}/cyclonedx/output/serializer/__init__.pyo
-${PYSITELIB}/cyclonedx/output/serializer/json.py
-${PYSITELIB}/cyclonedx/output/serializer/json.pyc
-${PYSITELIB}/cyclonedx/output/serializer/json.pyo
 ${PYSITELIB}/cyclonedx/output/xml.py
 ${PYSITELIB}/cyclonedx/output/xml.pyc
-${PYSITELIB}/cyclonedx/output/xml.pyo
 ${PYSITELIB}/cyclonedx/parser/__init__.py
 ${PYSITELIB}/cyclonedx/parser/__init__.pyc
-${PYSITELIB}/cyclonedx/parser/__init__.pyo
 ${PYSITELIB}/cyclonedx/py.typed
+${PYSITELIB}/cyclonedx/schema/__init__.py
+${PYSITELIB}/cyclonedx/schema/__init__.pyc
 ${PYSITELIB}/cyclonedx/schema/bom-1.0.xsd
 ${PYSITELIB}/cyclonedx/schema/bom-1.1.xsd
 ${PYSITELIB}/cyclonedx/schema/bom-1.2-strict.schema.json
@@ -90,13 +62,18 @@ ${PYSITELIB}/cyclonedx/schema/ext/bom-descriptor-1.0.xsd
 ${PYSITELIB}/cyclonedx/schema/ext/dependency-graph-1.0.xsd
 ${PYSITELIB}/cyclonedx/schema/ext/vulnerability-1.0-SNAPSHOT.schema.json
 ${PYSITELIB}/cyclonedx/schema/ext/vulnerability-1.0.xsd
+${PYSITELIB}/cyclonedx/schema/schema.py
+${PYSITELIB}/cyclonedx/schema/schema.pyc
 ${PYSITELIB}/cyclonedx/schema/spdx.schema.json
 ${PYSITELIB}/cyclonedx/schema/spdx.xsd
+${PYSITELIB}/cyclonedx/serialization/__init__.py
+${PYSITELIB}/cyclonedx/serialization/__init__.pyc
 ${PYSITELIB}/cyclonedx/spdx.py
 ${PYSITELIB}/cyclonedx/spdx.pyc
-${PYSITELIB}/cyclonedx/spdx.pyo
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
diff --git a/security/py-cyclonedx-python-lib/distinfo b/security/py-cyclonedx-python-lib/distinfo
index f160a9b63b67..1dd430314abb 100644
--- a/security/py-cyclonedx-python-lib/distinfo
+++ b/security/py-cyclonedx-python-lib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2022/09/18 11:53:56 wiz Exp $
+$NetBSD: distinfo,v 1.10 2023/05/04 11:38:14 wiz Exp $
 
-BLAKE2s (cyclonedx-python-lib-3.1.0.tar.gz) = abf09c81505e439f0b8808a601d85a3c7a507d9ad67362f6267eb32152949b90
-SHA512 (cyclonedx-python-lib-3.1.0.tar.gz) = 7743b8f7fe539957e7a065be0f102670c42b89aaef3c605252f891035ff81ce7e94195c8d2cd624f59e7adb660a4ed7099a0514dc8df9bd144bd8b4a49abccf2
-Size (cyclonedx-python-lib-3.1.0.tar.gz) = 163761 bytes
-SHA1 (patch-setup.py) = f48060c553b57a7943004ef76770d8b4518a80fe
+BLAKE2s (cyclonedx_python_lib-4.0.0.tar.gz) = 1e855e6064cc49d53316583cc34b89231dc3f4129016e25cdca5d72cb7f3f891
+SHA512 (cyclonedx_python_lib-4.0.0.tar.gz) = 6b935014f4130b3b79408ca9f7b9c29fc7f0382e5e0e2a0cef59475ecbe9694a3c093501f978762e42719c04aaa0892fa8d3dea84ba62620a110e0d2e9c275b4
+Size (cyclonedx_python_lib-4.0.0.tar.gz) = 246199 bytes
diff --git a/security/py-cyclonedx-python-lib/patches/patch-setup.py b/security/py-cyclonedx-python-lib/patches/patch-setup.py
deleted file mode 100644
index 9a6160bd5c06..000000000000
--- a/security/py-cyclonedx-python-lib/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.3 2022/06/13 09:59:01 wiz Exp $
-
-Be less restrictive in dependencies.
-
---- setup.py.orig	2022-06-10 20:01:07.074393300 +0000
-+++ setup.py
-@@ -16,7 +16,7 @@ install_requires = \
- ['packageurl-python>=0.9',
-  'setuptools>=47.0.0',
-  'sortedcontainers>=2.4.0,<3.0.0',
-- 'toml>=0.10.0,<0.11.0']
-+ 'toml>=0.10.0']
- 
- extras_require = \
- {':python_version < "3.8"': ['importlib-metadata>=3.4']}