Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170834350350790"
MIME-Version: 1.0
Date: Mon, 19 Feb 2024 11:51:43 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/time/khal
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240219115143.B7C1FF9F4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_170834350350790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Feb 19 11:51:43 UTC 2024

Modified Files:
	pkgsrc/time/khal: Makefile PLIST distinfo

Log Message:
khal: update to 0.11.3.

0.11.3
======
2024-02-12

* FIX support urwid 2.4.2


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/time/khal/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/time/khal/distinfo

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


--_----------=_170834350350790
Content-Disposition: inline
Content-Length: 3806
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.43 pkgsrc/time/khal/Makefile:1.44
--- pkgsrc/time/khal/Makefile:1.43	Tue Nov  7 22:38:08 2023
+++ pkgsrc/time/khal/Makefile	Mon Feb 19 11:51:43 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2023/11/07 22:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2024/02/19 11:51:43 wiz Exp $
 
-DISTNAME=	khal-0.11.2
-PKGREVISION=	2
+DISTNAME=	khal-0.11.3
 CATEGORIES=	time net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/khal/}
 
@@ -11,6 +10,7 @@ COMMENT=	CLI calendar application built 
 LICENSE=	mit
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-atomicwrites>=0.1.7:../../devel/py-atomicwrites
 DEPENDS+=	${PYPKGPREFIX}-click>=3.2:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-click-log>=0.2.0:../../devel/py-click-log
@@ -34,8 +34,6 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-vdirsyncer
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38
 
-USE_PKG_RESOURCES=	yes
-
 INSTALLATION_DIRS=	share/doc/khal ${PKGMANDIR}/man1
 REPLACE_PYTHON+=	khal/*/*.py
 REPLACE_PYTHON+=	khal/*.py
@@ -48,12 +46,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/khal.conf.sample ${DESTDIR}${PREFIX}/share/doc/khal
 	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khal.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-# as of 0.11.1
-# 27 failed, 282 passed, 1 xfailed, 2 xpassed, 6 warnings
+# as of 0.11.3
+# 5 failed, 307 passed, 1 xfailed, 2 xpassed, 15 warnings
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/time/khal/PLIST
diff -u pkgsrc/time/khal/PLIST:1.13 pkgsrc/time/khal/PLIST:1.14
--- pkgsrc/time/khal/PLIST:1.13	Thu May  4 09:58:19 2023
+++ pkgsrc/time/khal/PLIST	Mon Feb 19 11:51:43 2024
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.13 2023/05/04 09:58:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/02/19 11:51:43 wiz Exp $
 bin/ikhal
 bin/khal
-${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}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/khal/__init__.py
 ${PYSITELIB}/khal/__init__.pyc
 ${PYSITELIB}/khal/__init__.pyo

Index: pkgsrc/time/khal/distinfo
diff -u pkgsrc/time/khal/distinfo:1.26 pkgsrc/time/khal/distinfo:1.27
--- pkgsrc/time/khal/distinfo:1.26	Fri Jun 16 21:00:45 2023
+++ pkgsrc/time/khal/distinfo	Mon Feb 19 11:51:43 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2023/06/16 21:00:45 wiz Exp $
+$NetBSD: distinfo,v 1.27 2024/02/19 11:51:43 wiz Exp $
 
-BLAKE2s (khal-0.11.2.tar.gz) = fc89a4d0754a7a12bdda9d76355c03be9ed9620168647f3994e784e00ed9c5af
-SHA512 (khal-0.11.2.tar.gz) = 378a81c9f9a21a4af77ccdc5eabbcb62d109bcf5f2e2d3407c6fb504e15efd7dde545428153673cfeb46f60d9e9921efcad6805db2944884f124053e7922ab45
-Size (khal-0.11.2.tar.gz) = 196986 bytes
+BLAKE2s (khal-0.11.3.tar.gz) = 18e613451c2d983b17cdac8c61d61f4d794c3b1c8aaeebff4b1b46014076effd
+SHA512 (khal-0.11.3.tar.gz) = 1f7f82e04ad913df9e2e4bd315a70b9832b1af3f6d2db794018c780645f5bdb6df39efb45a36b38e3c1327932a1cb91d4c735f578b29a9326ef0f163fecd7bba
+Size (khal-0.11.3.tar.gz) = 196953 bytes


--_----------=_170834350350790--