On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote: > Hi. > > Next version of devel/py-gobject3 will loose python2 support. > Direct dependencies involve: > > audio/exaile > misc/gpsd > x11/dbus-python > > Out of these 3, x11/dbus-python is the most problematic because these are > dependending on the non python3 FLAVOR of it: > > audio/exaile > editors/py-qscintilla > net/pidgin > x11/py-qt4 > x11/py-qt5 > x11/compiz/ccsm > > We could use some help moving these to x11/dbus-python,python3 :-) > Thanks. I looked at x11/py-qt5 as user of the Python 2 flavour and came up with editors/py-qscintilla as user of py-qt5's Python 2 flavour.
`show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user and qgis is Python 3 only, so we can make py-qscintilla Python 3 only as well - first step towards py-qt5 becoming Python 3 only. I tested the following diff with $ cd /usr/ports $ make -C devel/quirks package ... $ make -C editors/py-qscintilla package ... $ doas pkg_add py-qscintilla py-qscintilla-2.11.4p2: ok $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz quirks-3.435->3.437: ok $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/py3-qscintilla-2.11.4p3.tgz py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok Read shared items: ok Feedback? OK? Index: editors/Makefile =================================================================== RCS file: /cvs/ports/editors/Makefile,v retrieving revision 1.141 diff -u -p -r1.141 Makefile --- editors/Makefile 28 Jun 2020 21:25:18 -0000 1.141 +++ editors/Makefile 20 Sep 2020 16:31:07 -0000 @@ -51,7 +51,6 @@ SUBDIR += nvi,iconv SUBDIR += py-neovim SUBDIR += py-neovim,python3 - SUBDIR += py-qscintilla SUBDIR += py-qscintilla,python3 SUBDIR += qscintilla SUBDIR += scintilla Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1044 diff -u -p -r1.1044 Makefile --- devel/quirks/Makefile 20 Sep 2020 04:27:37 -0000 1.1044 +++ devel/quirks/Makefile 20 Sep 2020 16:31:45 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.436 +PKGNAME = quirks-3.437 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1062 diff -u -p -r1.1062 Quirks.pm --- devel/quirks/files/Quirks.pm 20 Sep 2020 04:27:37 -0000 1.1062 +++ devel/quirks/files/Quirks.pm 20 Sep 2020 16:34:05 -0000 @@ -478,6 +478,7 @@ my $stem_extensions = { 'rgain' => 'rgain3', 'py-urwid' => 'py3-urwid', 'py-ply' => 'py3-ply', + 'py-qscintilla' => 'py3-qscintilla', }; my $obsolete_reason = { Index: editors/py-qscintilla/Makefile =================================================================== RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- editors/py-qscintilla/Makefile 3 Jul 2020 21:12:53 -0000 1.25 +++ editors/py-qscintilla/Makefile 20 Sep 2020 16:30:52 -0000 @@ -4,7 +4,7 @@ COMMENT-main = Python binding for the S COMMENT-common = common files for py-qscintilla VERSION = 2.11.4 -REVISION = 2 +REVISION = 3 MODPY_EGG_VERSION = ${VERSION} DISTNAME = QScintilla-${VERSION} @@ -35,12 +35,10 @@ PYQTVER = PyQt5 SIPDIR = share/sip/PyQt5${MODPY_BIN_SUFFIX} FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 -.if ${FLAVOR:Mpython3} FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/} FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR} -.endif BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \ Index: editors/py-qscintilla/pkg/PLIST-common =================================================================== RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-common,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-common --- editors/py-qscintilla/pkg/PLIST-common 19 Feb 2020 17:35:36 -0000 1.1 +++ editors/py-qscintilla/pkg/PLIST-common 20 Sep 2020 16:52:01 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $ -@conflict py3-qscintilla-${QTVER}-* +@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-* @pkgpath editors/py-qscintilla,${QTVER} lib/${QTVER}/qsci/ lib/${QTVER}/qsci/api/ Index: editors/py-qscintilla/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-main,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-main --- editors/py-qscintilla/pkg/PLIST-main 19 Feb 2020 17:35:36 -0000 1.1 +++ editors/py-qscintilla/pkg/PLIST-main 20 Sep 2020 16:28:56 -0000 @@ -1,7 +1,9 @@ @comment $OpenBSD: PLIST-main,v 1.1 2020/02/19 17:35:36 juanfra Exp $ @conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-* +@conflict py-qscintilla-* @pkgpath editors/py-qscintilla,${QTVER} @pkgpath editors/py-qscintilla +@pkgpath editors/py-qscintilla,-main lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi @so lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so lib/python${MODPY_VERSION}/site-packages/QScintilla-${MODPY_EGG_VERSION}.dist-info/