pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-notmuch2: Convert egg to wheel



Module Name:	pkgsrc-wip
Committed By:	Malte Dehling <mdehling%gmail.com@localhost>
Pushed By:	mdehling
Date:		Fri Mar 1 14:13:48 2024 -0800
Changeset:	f6282363253be33f9cb3aaf5bcae34addc55c037

Modified Files:
	py-notmuch2/Makefile
	py-notmuch2/PLIST
	py-notmuch2/distinfo
Added Files:
	py-notmuch2/patches/patch-__notmuch__config.py
Removed Files:
	py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py

Log Message:
py-notmuch2: Convert egg to wheel

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f6282363253be33f9cb3aaf5bcae34addc55c037

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

diffstat:
 py-notmuch2/Makefile                                         | 12 +++++++-----
 py-notmuch2/PLIST                                            |  9 ++++-----
 py-notmuch2/distinfo                                         |  2 +-
 py-notmuch2/patches/patch-__notmuch__config.py               | 11 +++++++++++
 .../patches/patch-bindings_python-cffi___notmuch__config.py  | 11 -----------
 5 files changed, 23 insertions(+), 22 deletions(-)

diffs:
diff --git a/py-notmuch2/Makefile b/py-notmuch2/Makefile
index 747ef6b2f6..0d133355f8 100644
--- a/py-notmuch2/Makefile
+++ b/py-notmuch2/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD$
 VERSION=	0.38.2
 DISTNAME=	notmuch-${VERSION}
-EGG_NAME=	notmuch2-${VERSION}
-PKGNAME=	${PYPKGPREFIX}-${EGG_NAME}
+WHEEL_NAME=	notmuch2-${VERSION}
+PKGNAME=	${PYPKGPREFIX}-${WHEEL_NAME}
 CATEGORIES=	mail python
 MASTER_SITES=	https://notmuchmail.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -12,14 +12,16 @@ HOMEPAGE=	https://notmuchmail.org/
 COMMENT=	Pythonic bindings for the notmuch mail indexer
 LICENSE=	gnu-gpl-v3
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
 DEPENDS+=	notmuch-[0-9]*:../../mail/notmuch
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-PYSETUPSUBDIR=	bindings/python-cffi
+# wheel.mk does not handle this
+#PYSETUPSUBDIR=	bindings/python-cffi
+WRKSRC=		${WRKDIR}/${DISTNAME}/bindings/python-cffi
 
 .include "../../mail/notmuch/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-notmuch2/PLIST b/py-notmuch2/PLIST
index 2d4b0e17cb..9da52dfb08 100644
--- a/py-notmuch2/PLIST
+++ b/py-notmuch2/PLIST
@@ -1,9 +1,8 @@
 @comment $NetBSD$
-${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}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/notmuch2/__init__.py
 ${PYSITELIB}/notmuch2/__init__.pyc
 ${PYSITELIB}/notmuch2/__init__.pyo
diff --git a/py-notmuch2/distinfo b/py-notmuch2/distinfo
index 04b951474e..bd9713fb8d 100644
--- a/py-notmuch2/distinfo
+++ b/py-notmuch2/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (notmuch-0.38.2.tar.xz) = 8706c2b8b8cce95b32e3d80c921c8a50739aaabd5a082dbed858629497bba845
 SHA512 (notmuch-0.38.2.tar.xz) = fcf5cd927d2acff1a3632c8a4790d4115320cd3ca0d7f61955789a060e363d196c6be64e0e98c883e9918f6b5032a72150977d5f80f9c890f9bd3ab8ed5d8154
 Size (notmuch-0.38.2.tar.xz) = 805268 bytes
-SHA1 (patch-bindings_python-cffi___notmuch__config.py) = 556084c6451cab7b090b21b951238363cebe07fd
+SHA1 (patch-__notmuch__config.py) = 682c1052c255f54385c695ae8eaa666bea02b2b5
diff --git a/py-notmuch2/patches/patch-__notmuch__config.py b/py-notmuch2/patches/patch-__notmuch__config.py
new file mode 100644
index 0000000000..4e735e6db1
--- /dev/null
+++ b/py-notmuch2/patches/patch-__notmuch__config.py
@@ -0,0 +1,11 @@
+$NetBSD$
+
+This file would normally be created by the configure script, but we
+don't run it.
+
+--- _notmuch_config.py.orig	2024-03-01 22:02:43.485120189 +0000
++++ _notmuch_config.py
+@@ -0,0 +1,3 @@
++NOTMUCH_VERSION_FILE='../../version.txt'
++NOTMUCH_INCLUDE_DIR='../../lib'
++NOTMUCH_LIB_DIR='../../lib'
diff --git a/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py b/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py
deleted file mode 100644
index 7ef7fdf9c7..0000000000
--- a/py-notmuch2/patches/patch-bindings_python-cffi___notmuch__config.py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-This file would normally be created by the configure script, but we
-don't run it.
-
---- bindings/python-cffi/_notmuch_config.py.orig	2024-02-17 05:03:35.281766718 +0000
-+++ bindings/python-cffi/_notmuch_config.py
-@@ -0,0 +1,3 @@
-+NOTMUCH_VERSION_FILE='../../version.txt'
-+NOTMUCH_INCLUDE_DIR='../../lib'
-+NOTMUCH_LIB_DIR='../../lib'


Home | Main Index | Thread Index | Old Index