Skip to content

Commit 0d0b4d9

Browse files
committed
*/*: 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@
1 parent d31d645 commit 0d0b4d9

27 files changed

Lines changed: 29 additions & 33 deletions

File tree

audio/cadence/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ USES= compiler:c++11-lang desktop-file-utils gmake localbase pkgconfig \
2121
python pyqt:5 qt:5 shebangfix tar:bz2
2222
SHEBANG_FILES= src/*.py
2323
USE_QT= core gui widgets buildtools:build
24-
USE_PYQT= pyqt5 sip
24+
USE_PYQT= pyqt5
2525

2626
USE_GITHUB= yes
2727
GH_ACCOUNT= falkTX

audio/carla/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
1717
USES= compiler:c++11-lib desktop-file-utils gl gmake localbase \
1818
pkgconfig pyqt:5 python qt:5 sdl shared-mime-info shebangfix \
1919
tar:bz2 xorg
20-
USE_PYQT= pyqt5 sip
20+
USE_PYQT= pyqt5
2121
USE_QT= core gui widgets buildtools:build
2222
USE_GL= gl
2323
USE_XORG= x11

audio/picard/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
2323

2424
USES= desktop-file-utils gettext-tools pyqt:5 python
2525
USE_LOCALE= en_US.UTF-8
26-
USE_PYQT= pyqt5:run sip
26+
USE_PYQT= pyqt5:run
2727
USE_PYTHON= autoplist noflavors pep517 unittest
2828

2929
CONFLICTS_INSTALL= picard-tools py*-python-picard # bin/picard

deskutils/calibre/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ GH_TUPLE= kovidgoyal:calibre-translations:0e909e6:translations \
7272
LibreOffice:dictionaries:b871dff:hypenation
7373
PIPER_VOICES_HASH= 40c852d339fc7532cbbf28a4a942a7c96c185c96
7474
USE_GL= opengl
75-
USE_PYQT= pyqt6 pysip qtbuilder sip webengine
75+
USE_PYQT= pyqt6 pysip webengine qtbuilder:build sip:build
7676
USE_QT= base
7777
USE_RC_SUBR= calibre
7878
USE_XORG= x11 xext xrender

deskutils/treeline/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LICENSE= GPLv2+
1212
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
1313

1414
USES= python pyqt:5 shebangfix
15-
USE_PYQT= pyqt5 sip
15+
USE_PYQT= pyqt5
1616

1717
SHEBANG_FILES= source/treeline.py
1818

devel/py-qt5-qscintilla2/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PORTNAME= qscintilla2
2-
PORTVERSION= ${QSCI2_VERSION}
2+
DISTVERSION= ${QSCI2_VERSION}
33
PORTREVISION= 2
44
CATEGORIES= devel python
55
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -10,16 +10,15 @@ MAINTAINER= kde@FreeBSD.org
1010
COMMENT= Python bindings for QScintilla2 (PyQt5), QSci module
1111
WWW= https://riverbankcomputing.com/software/pyqt
1212

13-
BUILD_DEPENDS= ${PY_SETUPTOOLS}
1413
LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2@qt5
1514

1615
DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo
1716
DESTDIRNAME= INSTALL_ROOT
1817

1918
USES= python pyqt:5 gl qt:5
2019
USE_GL= gl
21-
USE_PYQT= pyqt5 sip:build qtbuilder
22-
USE_PYTHON= concurrent flavors py3kplist
20+
USE_PYQT= pyqt5 qtbuilder:build sip:build
21+
USE_PYTHON= concurrent flavors
2322
USE_QT= core gui printsupport widgets buildtools:build qmake:build
2423

2524
OPTIONS_DEFINE= DEBUG

devel/py-qt6-qscintilla2/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PORTNAME= qscintilla2
2-
PORTVERSION= ${QSCI2_VERSION}
2+
DISTVERSION= ${QSCI2_VERSION}
33
PORTREVISION= 1
44
CATEGORIES= devel python
55
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -13,13 +13,12 @@ WWW= https://riverbankcomputing.com/software/pyqt \
1313

1414
LICENSE= GPLv3
1515

16-
BUILD_DEPENDS= ${PY_SETUPTOOLS}
1716
LIB_DEPENDS= libqscintilla2_qt6.so:devel/qscintilla2@qt6
1817

1918
USES= python pyqt:6 gl qt:6
2019
USE_GL= gl
2120
USE_LOCALE= C.UTF-8
22-
USE_PYQT= pyqt6 sip:build qtbuilder
21+
USE_PYQT= pyqt6 qtbuilder:build sip:build
2322
USE_PYTHON= concurrent flavors
2423
USE_QT= base
2524

devel/py-qtconsole/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
2222
${PYTHON_PKGNAMEPREFIX}pytest-qt>0:devel/py-pytest-qt@${PY_FLAVOR}
2323

2424
USES= pyqt:5 python
25-
USE_PYQT= pyqt5 sip
25+
USE_PYQT= pyqt5
2626
USE_PYTHON= autoplist distutils pytest
2727

2828
NO_ARCH= yes

devel/spyder/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN_DEPENDS= \
5959

6060
USES= desktop-file-utils python pyqt:5
6161
USE_PYTHON= distutils autoplist noflavors
62-
USE_PYQT= pyqt5 sip
62+
USE_PYQT= pyqt5
6363

6464
USE_GITHUB= yes
6565
GH_ACCOUNT= spyder-ide

devel/vitables/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYNUMPY} \
1919

2020
USES= dos2unix python pyqt:5
2121
USE_PYTHON= pep517 cython noflavors autoplist pytest # 3 tests fail, see https://github.com/uvemas/ViTables/issues/124
22-
USE_PYQT= pyqt5:run sip:run
22+
USE_PYQT= pyqt5:run
2323

2424
USE_GITHUB= yes
2525
GH_ACCOUNT= uvemas

0 commit comments

Comments
 (0)