git: 0d0b4d9bb908 - main - */*: Remove qtbuilder and sip from RUN_DEPENDS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Oct 2024 07:38:53 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0d0b4d9bb9082b6b330b1817d00eec83632476d6
commit 0d0b4d9bb9082b6b330b1817d00eec83632476d6
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-10-19 06:54:43 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-10-19 07:21:41 +0000
*/*: Remove qtbuilder and sip from RUN_DEPENDS
devel/py-qtbuilder and devel/py-sip should only be used as a
BUILD_DEPENDS. (e.g. USE_PYQT=qtbuilder:build sip:build)
Usually, these are only used to build the PyQt framework, but a few
other ports need them to build. Ports that have them as a BUILD_DEPENDS
unnecessarily haven't been audited yet.
Sip used to be needed for run, but this hasn't been the case for quite
some time. Runtime is provided by the devel/py-qt[56]-sip ports.
(USE_PYQT=pysip). The main PyQt ports provide this automatically, so
it isn't necessary to add it to individual consumers.
While here:
www/onionshare: Remove PyQt stuff completely. It uses PySide.
With hat: kde@
---
audio/cadence/Makefile | 2 +-
audio/carla/Makefile | 2 +-
audio/picard/Makefile | 2 +-
deskutils/calibre/Makefile | 2 +-
deskutils/treeline/Makefile | 2 +-
devel/py-qt5-qscintilla2/Makefile | 7 +++----
devel/py-qt6-qscintilla2/Makefile | 5 ++---
devel/py-qtconsole/Makefile | 2 +-
devel/spyder/Makefile | 2 +-
devel/vitables/Makefile | 2 +-
editors/retext/Makefile | 2 +-
emulators/fs-uae-launcher/Makefile | 2 +-
finance/electrum/Makefile | 2 +-
games/py-mnemosyne-proj/Makefile | 2 +-
graphics/krita/Makefile | 2 +-
graphics/qgis-ltr/Makefile | 2 +-
graphics/qgis/Makefile | 2 +-
graphics/rapid-photo-downloader/Makefile | 2 +-
math/convertall/Makefile | 2 +-
math/rpcalc/Makefile | 2 +-
net-mgmt/nagstamon/Makefile | 2 +-
print/py-frescobaldi/Makefile | 2 +-
science/code_saturne/Makefile | 2 +-
science/py-veusz/Makefile | 2 +-
www/onionshare/Makefile | 3 +--
www/py-woob-qt/Makefile | 2 +-
www/qutebrowser/Makefile | 1 -
27 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/audio/cadence/Makefile b/audio/cadence/Makefile
index 419a5a09a6ea..f3ee906ec033 100644
--- a/audio/cadence/Makefile
+++ b/audio/cadence/Makefile
@@ -21,7 +21,7 @@ USES= compiler:c++11-lang desktop-file-utils gmake localbase pkgconfig \
python pyqt:5 qt:5 shebangfix tar:bz2
SHEBANG_FILES= src/*.py
USE_QT= core gui widgets buildtools:build
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_GITHUB= yes
GH_ACCOUNT= falkTX
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index bdb3f8eb3dd6..49e07380b7dc 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
USES= compiler:c++11-lib desktop-file-utils gl gmake localbase \
pkgconfig pyqt:5 python qt:5 sdl shared-mime-info shebangfix \
tar:bz2 xorg
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_QT= core gui widgets buildtools:build
USE_GL= gl
USE_XORG= x11
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 650519ec2b8b..ed51455689c8 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
USES= desktop-file-utils gettext-tools pyqt:5 python
USE_LOCALE= en_US.UTF-8
-USE_PYQT= pyqt5:run sip
+USE_PYQT= pyqt5:run
USE_PYTHON= autoplist noflavors pep517 unittest
CONFLICTS_INSTALL= picard-tools py*-python-picard # bin/picard
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 7c8904a038a3..ff120dcd20bf 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -72,7 +72,7 @@ GH_TUPLE= kovidgoyal:calibre-translations:0e909e6:translations \
LibreOffice:dictionaries:b871dff:hypenation
PIPER_VOICES_HASH= 40c852d339fc7532cbbf28a4a942a7c96c185c96
USE_GL= opengl
-USE_PYQT= pyqt6 pysip qtbuilder sip webengine
+USE_PYQT= pyqt6 pysip webengine qtbuilder:build sip:build
USE_QT= base
USE_RC_SUBR= calibre
USE_XORG= x11 xext xrender
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index c5bd746f2529..57f2a778c710 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -12,7 +12,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
USES= python pyqt:5 shebangfix
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
SHEBANG_FILES= source/treeline.py
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index 98e1c3e50e6e..acc0fcb448b5 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= qscintilla2
-PORTVERSION= ${QSCI2_VERSION}
+DISTVERSION= ${QSCI2_VERSION}
PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -10,7 +10,6 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for QScintilla2 (PyQt5), QSci module
WWW= https://riverbankcomputing.com/software/pyqt
-BUILD_DEPENDS= ${PY_SETUPTOOLS}
LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2@qt5
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
@@ -18,8 +17,8 @@ DESTDIRNAME= INSTALL_ROOT
USES= python pyqt:5 gl qt:5
USE_GL= gl
-USE_PYQT= pyqt5 sip:build qtbuilder
-USE_PYTHON= concurrent flavors py3kplist
+USE_PYQT= pyqt5 qtbuilder:build sip:build
+USE_PYTHON= concurrent flavors
USE_QT= core gui printsupport widgets buildtools:build qmake:build
OPTIONS_DEFINE= DEBUG
diff --git a/devel/py-qt6-qscintilla2/Makefile b/devel/py-qt6-qscintilla2/Makefile
index 00995dde29a8..b75bafc2c59e 100644
--- a/devel/py-qt6-qscintilla2/Makefile
+++ b/devel/py-qt6-qscintilla2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= qscintilla2
-PORTVERSION= ${QSCI2_VERSION}
+DISTVERSION= ${QSCI2_VERSION}
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -13,13 +13,12 @@ WWW= https://riverbankcomputing.com/software/pyqt \
LICENSE= GPLv3
-BUILD_DEPENDS= ${PY_SETUPTOOLS}
LIB_DEPENDS= libqscintilla2_qt6.so:devel/qscintilla2@qt6
USES= python pyqt:6 gl qt:6
USE_GL= gl
USE_LOCALE= C.UTF-8
-USE_PYQT= pyqt6 sip:build qtbuilder
+USE_PYQT= pyqt6 qtbuilder:build sip:build
USE_PYTHON= concurrent flavors
USE_QT= base
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 0fd37c6d759b..25ed6137eb76 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-qt>0:devel/py-pytest-qt@${PY_FLAVOR}
USES= pyqt:5 python
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_PYTHON= autoplist distutils pytest
NO_ARCH= yes
diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index 4d3cf1dd5f86..5dc1a8469b9a 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -59,7 +59,7 @@ RUN_DEPENDS= \
USES= desktop-file-utils python pyqt:5
USE_PYTHON= distutils autoplist noflavors
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_GITHUB= yes
GH_ACCOUNT= spyder-ide
diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile
index bb3494f57a41..46a21aca1e8d 100644
--- a/devel/vitables/Makefile
+++ b/devel/vitables/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYNUMPY} \
USES= dos2unix python pyqt:5
USE_PYTHON= pep517 cython noflavors autoplist pytest # 3 tests fail, see https://github.com/uvemas/ViTables/issues/124
-USE_PYQT= pyqt5:run sip:run
+USE_PYQT= pyqt5:run
USE_GITHUB= yes
GH_ACCOUNT= uvemas
diff --git a/editors/retext/Makefile b/editors/retext/Makefile
index fe3098050ff3..1a9b57dad871 100644
--- a/editors/retext/Makefile
+++ b/editors/retext/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymdown-extensions>0:textproc/py-pymdown-extensions@${PY_FLAVOR}
USES= desktop-file-utils pyqt:6 python:3.9+
-USE_PYQT= pyqt6:run sip:run
+USE_PYQT= pyqt6:run
USE_PYTHON= autoplist noflavors pep517 pytest
NO_ARCH= yes
diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile
index a7c4ebc8784f..1ddd8ccbd366 100644
--- a/emulators/fs-uae-launcher/Makefile
+++ b/emulators/fs-uae-launcher/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= gettext gmake gnome pathfix pyqt:5 python tar:xz
USE_PYTHON= distutils autoplist noflavors
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
MAKE_ARGS= prefix=${PREFIX} PYTHON=${PYTHON_CMD}
PYDISTUTILS_INSTALLARGS+= --install-lib=${PYTHON_SITELIBDIR}
diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index ba9f44952665..06f4ff714036 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -48,7 +48,7 @@ OPTIONS_SUB= yes
HARDWARE_DESC= Enable Bitcoin hardware wallet support
GUI_USES= desktop-file-utils pyqt:5
-GUI_USE= PYQT=pyqt5,sip
+GUI_USE= PYQT=pyqt5
HARDWARE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitbox02>=0.13.0:security/py-bitbox02@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}btchip-python>=0.1.32:security/py-btchip-python@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ckcc-protocol>=0.7.7:security/py-ckcc-protocol@${PY_FLAVOR} \
diff --git a/games/py-mnemosyne-proj/Makefile b/games/py-mnemosyne-proj/Makefile
index 39d3b84c7883..89bfd865dd5d 100644
--- a/games/py-mnemosyne-proj/Makefile
+++ b/games/py-mnemosyne-proj/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR}
USES= pyqt:6 python qt:6 shebangfix
-USE_PYQT= pyqt6:run sip:run webengine:run
+USE_PYQT= pyqt6:run webengine:run
USE_PYTHON= autoplist concurrent pep517
USE_QT= sqldriver-sqlite:run
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 34976058a9f1..69c108f94fca 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -75,7 +75,7 @@ OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS}
PYTHON_USES= pyqt:5
-PYTHON_USE= PYQT=pyqt5,sip,pysip
+PYTHON_USE= PYQT=pyqt5,pysip
PYTHON_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PyQt5
.include <bsd.port.mk>
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 46b5f5397c85..932951663d86 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -115,7 +115,7 @@ USES= bison cmake compiler:features desktop-file-utils \
USE_GL= gl
USE_GNOME= libxml2
USE_LDCONFIG= yes
-USE_PYQT= pyqt5 qscintilla2 pysip sip
+USE_PYQT= pyqt5 pysip qscintilla2 sip:build
USE_QT= 3d buildtools:build core concurrent dbus declarative \
designer:build qdoc:build gamepad gui linguist:build location \
multimedia network printsupport qmake:build script serialport \
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index b54c9618e397..b21bdd23be5d 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -114,7 +114,7 @@ USES= bison cmake compiler:features desktop-file-utils \
USE_GL= gl
USE_GNOME= libxml2
USE_LDCONFIG= yes
-USE_PYQT= pyqt5 qscintilla2 pysip sip
+USE_PYQT= pyqt5 pysip qscintilla2 sip:build
USE_QT= 3d buildtools:build core concurrent dbus declarative \
designer:build qdoc:build gamepad gui linguist:build location \
multimedia network printsupport qmake:build script serialport \
diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile
index 14b05f37da5d..bc5798f3abc7 100644
--- a/graphics/rapid-photo-downloader/Makefile
+++ b/graphics/rapid-photo-downloader/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \
USES= desktop-file-utils gettext pyqt:5 python qt:5
USE_PYTHON= autoplist distutils noflavors
USE_QT= imageformats:run
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
BINARY_ALIAS= python3=${PYTHON_VERSION}
NO_ARCH= yes
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index f971fb8edbca..7378c90c2795 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -12,7 +12,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
USES= pyqt:5 python shebangfix
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
SHEBANG_FILES= source/convertall.py
diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile
index 4181d54cbc3f..34ec05a009a9 100644
--- a/math/rpcalc/Makefile
+++ b/math/rpcalc/Makefile
@@ -12,7 +12,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
USES= pyqt:5 python shebangfix
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
SHEBANG_FILES= source/rpcalc.py
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index aa0b2004fdc5..2e6cf725101e 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -28,7 +28,7 @@ CPE_VENDOR= henri_wahl
USE_GITHUB= yes
GH_ACCOUNT= HenriWahl
GH_PROJECT= Nagstamon
-USE_PYQT= pyqt5:run sip:run
+USE_PYQT= pyqt5:run
USE_PYTHON= autoplist distutils noflavors
NO_ARCH= yes
diff --git a/print/py-frescobaldi/Makefile b/print/py-frescobaldi/Makefile
index 203886e3242a..a3e602c597b7 100644
--- a/print/py-frescobaldi/Makefile
+++ b/print/py-frescobaldi/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR}
USES= desktop-file-utils gettext gmake pyqt:5 python qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
-USE_PYQT= pyqt5 sip webengine
+USE_PYQT= pyqt5 webengine sip:build
USE_PYTHON= autoplist distutils noflavors
NO_ARCH= yes
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index 209a65ed3087..ebcaaf912d8f 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -30,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
USES= autoreconf bison blaslapack compiler:c11 fortran gettext gnome gmake \
iconv localbase libtool mpi pyqt:5 python shebangfix xorg
USE_GNOME= libxml2
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_XORG= x11
SHEBANG_FILES= install_saturne.py tests/unittests.py build-aux/*.py
CFLAGS+= -D__XSI_VISIBLE -Wno-error=incompatible-function-pointer-types
diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile
index 95130f79b782..d6722d6bcd83 100644
--- a/science/py-veusz/Makefile
+++ b/science/py-veusz/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY}
USES= compiler:c++11-lang python pyqt:5 qt:5 shebangfix
USE_GITHUB= yes
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5 sip:build
USE_PYTHON= distutils concurrent autoplist pytest
USE_QT= core gui xml widgets qmake:build
diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile
index 130cd73619c4..e19b8b165217 100644
--- a/www/onionshare/Makefile
+++ b/www/onionshare/Makefile
@@ -40,9 +40,8 @@ RUN_DEPENDS= meek-client:security/meek \
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytest-qt>=0:devel/py-pytest-qt@${PY_FLAVOR}
-USES= cpe python pyqt:5 qt:5 shebangfix xorg
+USES= cpe python qt:5 shebangfix xorg
USE_GITHUB= yes
-USE_PYQT= pyqt5 sip
USE_PYTHON= distutils autoplist
USE_XORG= x11 xcb
diff --git a/www/py-woob-qt/Makefile b/www/py-woob-qt/Makefile
index 15852e104855..28d06e1d73ce 100644
--- a/www/py-woob-qt/Makefile
+++ b/www/py-woob-qt/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
USES= gmake pyqt:5 python
-USE_PYQT= pyqt5 sip
+USE_PYQT= pyqt5
USE_PYTHON= autoplist distutils
USE_GITLAB= yes
diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile
index ec73b93c9047..25e6a50918b2 100644
--- a/www/qutebrowser/Makefile
+++ b/www/qutebrowser/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}