From 2850efc2fcc94cc2c9448c9dfe7b2d915116a716 Mon Sep 17 00:00:00 2001
From: Derek Schrock <dereks@lifeofadishwasher.com>
Date: Sat, 6 Apr 2024 23:50:56 -0400
Subject: [PATCH] textproc/py-sphinxcontrib-autoprogram: Update to 0.1.9

- Update to 0.1.9
- Use pep517
- Add pep420 changes
- Directly run tests via unittest
- Directly builds docs via sphinx-build
---
 .../py-sphinxcontrib-autoprogram/Makefile     | 30 ++++++++++++-------
 .../py-sphinxcontrib-autoprogram/distinfo     |  6 ++--
 .../files/patch-setup.py                      | 21 +++++++++++++
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 textproc/py-sphinxcontrib-autoprogram/files/patch-setup.py

diff --git a/textproc/py-sphinxcontrib-autoprogram/Makefile b/textproc/py-sphinxcontrib-autoprogram/Makefile
index fbbb952a1e5d..5f93d11e86e4 100644
--- a/textproc/py-sphinxcontrib-autoprogram/Makefile
+++ b/textproc/py-sphinxcontrib-autoprogram/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sphinxcontrib-autoprogram
-DISTVERSION=	0.1.8
+DISTVERSION=	0.1.9
 CATEGORIES=	textproc
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,28 +10,38 @@ WWW=		https://github.com/sphinx-contrib/autoprogram
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_PORTDOCS=		*
-DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
-			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
+
+post-extract:
+	@(cd ${BUILD_WRKSRC}; ${RM} sphinxcontrib/__init__.py;)
+
+pre-build-DOCS-on:
+	@(cd ${BUILD_WRKSRC}; \
+	${SETENVI} ${WRK_ENV} \
+	sphinx-build-${PYTHON_VER} \
+		-b html -d _build/doctress doc/ build/sphinx/html)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
-	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+		"! -name .buildinfo -and ! -name objects.inv")
 
 do-test:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	@cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} \
+	${PYTHON_CMD} -m unittest -v sphinxcontrib/autoprogram.py
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinxcontrib-autoprogram/distinfo b/textproc/py-sphinxcontrib-autoprogram/distinfo
index 7a8e76f4c4e6..029790121b49 100644
--- a/textproc/py-sphinxcontrib-autoprogram/distinfo
+++ b/textproc/py-sphinxcontrib-autoprogram/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676784775
-SHA256 (sphinxcontrib-autoprogram-0.1.8.tar.gz) = 5a69729db9d283e0e4c6d349bd60e62a4b8ebd2c07c0ab634b82d08a4121f10a
-SIZE (sphinxcontrib-autoprogram-0.1.8.tar.gz) = 18656
+TIMESTAMP = 1710625404
+SHA256 (sphinxcontrib-autoprogram-0.1.9.tar.gz) = 219655507fadca29b3062b5d86c37d94db48f03bde4b58d61526872bf72f57cc
+SIZE (sphinxcontrib-autoprogram-0.1.9.tar.gz) = 18843
diff --git a/textproc/py-sphinxcontrib-autoprogram/files/patch-setup.py b/textproc/py-sphinxcontrib-autoprogram/files/patch-setup.py
new file mode 100644
index 000000000000..cf8fe25ae54d
--- /dev/null
+++ b/textproc/py-sphinxcontrib-autoprogram/files/patch-setup.py
@@ -0,0 +1,21 @@
+--- setup.py.orig	2024-04-07 02:53:48 UTC
++++ setup.py
+@@ -3,7 +3,7 @@ from __future__ import with_statement
+ 
+ import sys
+ 
+-from setuptools import setup, find_packages
++from setuptools import find_namespace_packages, setup, find_packages
+ 
+ 
+ # Do not change the variable name.  It's parsed by doc/conf.py script.
+@@ -49,8 +49,7 @@ setup(
+     ],
+     python_requires='>=3.8',
+     platforms='any',
+-    packages=find_packages(),
+-    namespace_packages=['sphinxcontrib'],
++    packages=find_namespace_packages(include=['sphinxcontrib']),
+     include_package_data=True,
+     install_requires=requires,
+     test_suite='sphinxcontrib.autoprogram.suite'
-- 
2.44.0