py-qt-builder, py-sip5: cleanups.

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Jan 17 23:04:27 2022 +0100
Changeset:	4e4f118932a1aa0501d75b6fbc91dfc8ce1aad8d

Modified Files:
	py-qt-builder/DESCR
	py-qt-builder/Makefile
	py-sip5/Makefile

Log Message:
py-qt-builder, py-sip5: cleanups.

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

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

diffstat:
 py-qt-builder/DESCR    | 34 ++++++++++++++++------------------
 py-qt-builder/Makefile |  7 +++----
 py-sip5/Makefile       |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diffs:
diff --git a/py-qt-builder/DESCR b/py-qt-builder/DESCR
index 957566f511..32e9676417 100644
--- a/py-qt-builder/DESCR
+++ b/py-qt-builder/DESCR
@@ -1,21 +1,19 @@
-SIP - A Python Bindings Generator for C and C++ Libraries
-=========================================================
+PyQt-builder is a tool for generating Python bindings for C++ libraries that
+use the Qt application framework. The bindings are built on top of the PyQt
+bindings for Qt. PyQt-builder is used to build PyQt itself.
 
-What is SIP?
-------------
+PyQt-builder also includes the pyqt-bundle command line tool used to bundle a
+copy of Qt with a PyQt wheel. This is separate from the build system and
+described in Bundling Qt Using pyqt-bundle.
 
-One of the features of Python that makes it so powerful is the ability to take
-existing libraries, written in C or C++, and make them available as Python
-extension modules.  Such extension modules are often called bindings for the
-library.
+PyQt-builder is actually an extension of the PEP 384-compliant SIP bindings
+generator and build system. In the simplest cases all that is needed is a
+pyproject.toml file that specifies how the bindings are to be generated. More
+complicated cases require additional code, typically implemented in a
+project.py file.
 
-SIP is a collection of tools that makes it very easy to create Python bindings
-for C and C++ libraries.  It was originally developed in 1998 to create PyQt,
-the Python bindings for the Qt toolkit, but can be used to create bindings for
-any C or C++ library.  For example it is also used to generate wxPython, the
-Python bindings for wxWidgets.
-
-SIP comprises a set of build tools and a sip module. The build tools process a
-set of specification files and generates C or C++ code which is then compiled
-to create the bindings extension module.  Several extension modules may be
-...
+PyQt-builder doesn't provide any additional command line build tools but does
+extend the SIP tools by providing additional command line options and options
+that can be specified in the pyproject.toml file. These are implemented by the
+pyqtbuild module which also provides an API that can be used by a project�s
+project.py file.
diff --git a/py-qt-builder/Makefile b/py-qt-builder/Makefile
index 962fb55f91..725cf2fad3 100644
--- a/py-qt-builder/Makefile
+++ b/py-qt-builder/Makefile
@@ -7,14 +7,13 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyQt-builder/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://www.riverbankcomputing.com/software/pyqt-builder/
-COMMENT=	Tool to create Python bindings for C++ libraries
-LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3 OR modified-bsd
+COMMENT=	Tool to create Python bindings for C++ libraries using Qt
+LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-sip5>=5<6:../../wip/py-sip5
+DEPENDS+=	${PYPKGPREFIX}-sip5>=5<7:../../wip/py-sip5
 
 DEPENDS+=	${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
-DEPENDS+=	${PYPKGPREFIX}-toml>=0:../../textproc/py-toml
 
 USE_LANGUAGES=	c c++
 
diff --git a/py-sip5/Makefile b/py-sip5/Makefile
index f5836e006e..33467c29a5 100644
--- a/py-sip5/Makefile
+++ b/py-sip5/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=s/sip/}
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://www.riverbankcomputing.com/software/sip/
 COMMENT=	Tool to create Python bindings for C++ libraries
-LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3 OR modified-bsd
+LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
 
 DEPENDS+=	${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging