CVS commit: pkgsrc/sysutils/py-salt-pepper

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 30 13:56:53 UTC 2024

Modified Files:
        pkgsrc/sysutils/py-salt-pepper: Makefile PLIST

Log Message:
py-salt-pepper: convert to wheel.mk.

Add missing dependency on salt (which should probably be renamed
to versioned py-salt package).

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/py-salt-pepper/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/py-salt-pepper/PLIST

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

Modified files:

Index: pkgsrc/sysutils/py-salt-pepper/Makefile
diff -u pkgsrc/sysutils/py-salt-pepper/Makefile:1.5 pkgsrc/sysutils/py-salt-pepper/Makefile:1.6
--- pkgsrc/sysutils/py-salt-pepper/Makefile:1.5 Thu Jan 13 19:31:24 2022
+++ pkgsrc/sysutils/py-salt-pepper/Makefile     Tue Apr 30 13:56:53 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2022/01/13 19:31:24 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/30 13:56:53 wiz Exp $
 
 DISTNAME=      salt-pepper-0.7.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt-pepper/}
 
@@ -11,16 +11,15 @@ HOMEPAGE=   https://github.com/saltstack/p
 COMMENT=       CLI front-end to a running salt-api system
 LICENSE=       apache-2.0
 
-USE_LANGUAGES= # none
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=      salt-[0-9]*:../../sysutils/salt
 
-USE_PKG_RESOURCES=     yes
-
-PYTHON_VERSIONED_DEPENDENCIES= setuptools_scm:build
+USE_LANGUAGES= c # for tests
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} pepper pepper-${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/py-salt-pepper/PLIST
diff -u pkgsrc/sysutils/py-salt-pepper/PLIST:1.2 pkgsrc/sysutils/py-salt-pepper/PLIST:1.3
--- pkgsrc/sysutils/py-salt-pepper/PLIST:1.2    Tue Mar 17 10:59:32 2020
+++ pkgsrc/sysutils/py-salt-pepper/PLIST        Tue Apr 30 13:56:53 2024
@@ -1,10 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2020/03/17 10:59:32 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/04/30 13:56:53 wiz Exp $
 bin/pepper-${PYVERSSUFFIX}
-${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}/pepper/__init__.py
 ${PYSITELIB}/pepper/__init__.pyc
 ${PYSITELIB}/pepper/__init__.pyo
@@ -23,3 +18,8 @@ ${PYSITELIB}/pepper/retcode.pyo
 ${PYSITELIB}/pepper/script.py
 ${PYSITELIB}/pepper/script.pyc
 ${PYSITELIB}/pepper/script.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt