CVS commit: pkgsrc/multimedia/streamlink

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 25 17:04:50 UTC 2023

Modified Files:
        pkgsrc/multimedia/streamlink: Makefile PLIST

Log Message:
streamlink: convert to wheel.mk

Add missing files to PLIST while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/streamlink/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/streamlink/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/streamlink/Makefile
diff -u pkgsrc/multimedia/streamlink/Makefile:1.41 pkgsrc/multimedia/streamlink/Makefile:1.42
--- pkgsrc/multimedia/streamlink/Makefile:1.41  Tue Nov  7 22:38:02 2023
+++ pkgsrc/multimedia/streamlink/Makefile       Mon Dec 25 17:04:50 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2023/11/07 22:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2023/12/25 17:04:50 wiz Exp $
 
 DISTNAME=      streamlink-5.5.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=streamlink/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -11,10 +11,9 @@ HOMEPAGE=    https://streamlink.github.io/
 COMMENT=       Tool that pipes video streams into a video player
 LICENSE=       2-clause-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 38
-
-USE_PKG_RESOURCES=     yes
-
+TOOL_DEPENDS+= ${PYPKGPREFIX}-versioningit>=1.1.1:../../devel/py-versioningit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=45:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-country-[0-9]*:../../geography/py-country
 DEPENDS+=      ${PYPKGPREFIX}-cryptodome>=3.4.3:../../security/py-cryptodome
 DEPENDS+=      ${PYPKGPREFIX}-isodate-[0-9]*:../../time/py-isodate
@@ -22,17 +21,14 @@ DEPENDS+=   ${PYPKGPREFIX}-lxml-[0-9]*:../
 DEPENDS+=      ${PYPKGPREFIX}-Socks>=1.5.6:../../net/py-Socks
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.26.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-websocket-client>=1.2.1:../../www/py-websocket-client
-TOOL_DEPENDS+= ${PYPKGPREFIX}-versioningit>=1.1.1:../../devel/py-versioningit
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=45:../../devel/py-setuptools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-import-order-[0-9]*:../../devel/py-flake8-import-order
 TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun>=1.0.0:../../devel/py-freezegun
 TEST_DEPENDS+= ${PYPKGPREFIX}-requests-mock-[0-9]*:../../devel/py-requests-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-asyncio-[0-9]*:../../devel/py-test-asyncio
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
-EGG_NAME=      streamlink-0.0.0+unknown
+PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
 REPLACE_PYTHON+=       src/streamlink/packages/flashmedia/flv.py
 REPLACE_PYTHON+=       src/streamlink/packages/flashmedia/tag.py
@@ -51,5 +47,5 @@ do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/streamlink/PLIST
diff -u pkgsrc/multimedia/streamlink/PLIST:1.20 pkgsrc/multimedia/streamlink/PLIST:1.21
--- pkgsrc/multimedia/streamlink/PLIST:1.20     Fri May  5 17:53:08 2023
+++ pkgsrc/multimedia/streamlink/PLIST  Mon Dec 25 17:04:50 2023
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.20 2023/05/05 17:53:08 yhardy Exp $
+@comment $NetBSD: PLIST,v 1.21 2023/12/25 17:04:50 wiz Exp $
 bin/streamlink
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/LICENSE
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/METADATA
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/RECORD
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/WHEEL
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/entry_points.txt
+${PYSITELIB}/streamlink-0.0.0+unknown.dist-info/top_level.txt
 ${PYSITELIB}/streamlink/__init__.py
 ${PYSITELIB}/streamlink/__init__.pyc
 ${PYSITELIB}/streamlink/__init__.pyo
@@ -50,6 +50,7 @@ ${PYSITELIB}/streamlink/plugin/api/__ini
 ${PYSITELIB}/streamlink/plugin/api/__init__.pyo
 ${PYSITELIB}/streamlink/plugin/api/http_session.py
 ${PYSITELIB}/streamlink/plugin/api/http_session.pyc
+${PYSITELIB}/streamlink/plugin/api/http_session.pyi
 ${PYSITELIB}/streamlink/plugin/api/http_session.pyo
 ${PYSITELIB}/streamlink/plugin/api/useragents.py
 ${PYSITELIB}/streamlink/plugin/api/useragents.pyc
@@ -646,6 +647,7 @@ ${PYSITELIB}/streamlink_cli/output/http.
 ${PYSITELIB}/streamlink_cli/output/player.py
 ${PYSITELIB}/streamlink_cli/output/player.pyc
 ${PYSITELIB}/streamlink_cli/output/player.pyo
+${PYSITELIB}/streamlink_cli/py.typed
 ${PYSITELIB}/streamlink_cli/streamrunner.py
 ${PYSITELIB}/streamlink_cli/streamrunner.pyc
 ${PYSITELIB}/streamlink_cli/streamrunner.pyo