CVS commit: pkgsrc/x11/py-terminator

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 10 11:33:31 UTC 2024

Modified Files:
        pkgsrc/x11/py-terminator: Makefile PLIST distinfo
        pkgsrc/x11/py-terminator/patches: patch-setup.py

Log Message:
py-terminator: convert to wheel.mk

Remove unused test dependency.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/py-terminator/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-terminator/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/py-terminator/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-terminator/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/x11/py-terminator/Makefile
diff -u pkgsrc/x11/py-terminator/Makefile:1.32 pkgsrc/x11/py-terminator/Makefile:1.33
--- pkgsrc/x11/py-terminator/Makefile:1.32      Tue Jun  6 12:42:55 2023
+++ pkgsrc/x11/py-terminator/Makefile   Sat Aug 10 11:33:31 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2023/06/06 12:42:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.33 2024/08/10 11:33:31 wiz Exp $
 
-GITHUB_PROJECT=        terminator
 DISTNAME=      terminator-2.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnome-terminator/}
+GITHUB_PROJECT=        terminator
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,6 +13,15 @@ HOMEPAGE=    https://launchpad.net/terminat
 COMMENT=       Terminator, multiple terminals in one window
 LICENSE=       gnu-gpl-v2
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+#TOOL_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=      ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
+DEPENDS+=      ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
+DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=      ${PYPKGPREFIX}-psutil>=5.6.3:../../sysutils/py-psutil
+
 REPLACE_PYTHON+=       *.py
 REPLACE_PYTHON+=       terminatorlib/*.py
 REPLACE_PYTHON+=       terminatorlib/plugins/*.py
@@ -28,18 +37,10 @@ SUBST_STAGE.manpath=        pre-configure
 SUBST_FILES.manpath=   setup.py
 SUBST_VARS.manpath=    PKGMANDIR
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-
-DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-DEPENDS+=      ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
-DEPENDS+=      ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
-DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-DEPENDS+=      ${PYPKGPREFIX}-psutil>=5.6.3:../../sysutils/py-psutil
-
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/py-terminator/PLIST
diff -u pkgsrc/x11/py-terminator/PLIST:1.4 pkgsrc/x11/py-terminator/PLIST:1.5
--- pkgsrc/x11/py-terminator/PLIST:1.4  Mon Jan 10 08:02:13 2022
+++ pkgsrc/x11/py-terminator/PLIST      Sat Aug 10 11:33:31 2024
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2022/01/10 08:02:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/08/10 11:33:31 wiz Exp $
 bin/remotinator
 bin/terminator
-${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}/AUTHORS
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/terminatorlib/__init__.py
 ${PYSITELIB}/terminatorlib/__init__.pyc
 ${PYSITELIB}/terminatorlib/__init__.pyo

Index: pkgsrc/x11/py-terminator/distinfo
diff -u pkgsrc/x11/py-terminator/distinfo:1.9 pkgsrc/x11/py-terminator/distinfo:1.10
--- pkgsrc/x11/py-terminator/distinfo:1.9       Tue Oct 26 11:34:20 2021
+++ pkgsrc/x11/py-terminator/distinfo   Sat Aug 10 11:33:31 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:34:20 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/08/10 11:33:31 wiz Exp $
 
 BLAKE2s (terminator-2.1.0.tar.gz) = ab7ddf2f55be79849e35623a4b75230d1c369fd0dafd768147a3ba7386850835
 SHA512 (terminator-2.1.0.tar.gz) = 0406b0542d5b4498084968b4e49a5ae3ff10db394907930923ad76ac5edf459c976a0a5b8617fd3a14dcde464b563ae137beb33e04b5b82ae856c497abf3fd04
 Size (terminator-2.1.0.tar.gz) = 1030864 bytes
-SHA1 (patch-setup.py) = a9b78f6e8aa34422a38e4994cd3fe6c16e1f5134
+SHA1 (patch-setup.py) = c8827cccc9c0f390136f93c72fb0037b3498d420

Index: pkgsrc/x11/py-terminator/patches/patch-setup.py
diff -u pkgsrc/x11/py-terminator/patches/patch-setup.py:1.4 pkgsrc/x11/py-terminator/patches/patch-setup.py:1.5
--- pkgsrc/x11/py-terminator/patches/patch-setup.py:1.4 Sun Jan 24 11:15:07 2021
+++ pkgsrc/x11/py-terminator/patches/patch-setup.py     Sat Aug 10 11:33:31 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.4 2021/01/24 11:15:07 kamil Exp $
+$NetBSD: patch-setup.py,v 1.5 2024/08/10 11:33:31 wiz Exp $
 
 Use the right path for man-pages in pkgsrc.
 
@@ -19,8 +19,11 @@ Install the man pages in the right direc
  
  test_deps = [
      'pytest'
-@@ -246,4 +242,3 @@ setup(name=APP_NAME,
-       package_data={'terminatorlib': ['preferences.glade', 'layoutlauncher.glade']},
-       cmdclass={'build': BuildData, 'install_data': InstallData, 'uninstall': Uninstall},
-       distclass=TerminatorDist)
--
+@@ -232,7 +228,6 @@ setup(name=APP_NAME,
+           'terminatorlib.plugins',
+       ],
+       setup_requires=[
+-          'pytest-runner',
+       ],
+       install_requires=[
+           'pycairo',