On Mon Feb 01, 2021 at 11:26:35PM +0000, Mikolaj Kucharski wrote:
> Hi,
>
> This happens for a while, but recently I don't have good chunk of time
> to dive and provide a diff. Decided to finally sent an email.
>
> (I do have some not committed port on my machine)
>
> # pkg_add -Dupdate -Dupdatedepends -Drepair -u -U -V
> quirks-3.524 signed on 2021-01-30T16:42:18Z
> Collision in py-sip-4.19.19p0v0->4.19.24v0: the following files already exist
> /usr/local/lib/python2.7/site-packages/PyQt5/sip.pyi
> (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0)
> /usr/local/lib/python2.7/site-packages/PyQt5/sip.so
> (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0)
> Can't install
> py-qt5-5.13.2p1+py3-sip-qt5-5.5.0->py-qt5-5.15.2+py3-sip-qt5-5.5.0p0: can't
> resolve py-sip-4.19.24v0
> Couldn't find updates for github-cli-1.5.0 promplot-0.17.0 py-qt5-5.13.2p1
> py-sip-4.19.19p0v0 py-sip-qt5-4.19.19p0 py3-hvac-0.10.6pre0 py3-sip-qt5-5.5.0
> Couldn't install py-qt5-5.15.2 py-sip-4.19.24v0 py3-sip-qt5-5.5.0p0
>
> --
> Regards,
> Mikolaj
>
I think we forgot the py2 conflict in devel/py-sip.
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 2fa86521b49..edf7b384b6a 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -10,6 +10,7 @@ EPOCH= 0
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
+REVISION= 0
HOMEPAGE= https://www.riverbankcomputing.com/software/sip/intro
diff --git a/devel/py-sip/pkg/PLIST b/devel/py-sip/pkg/PLIST
index 410b31651e2..4c0fcdcad29 100644
--- a/devel/py-sip/pkg/PLIST
+++ b/devel/py-sip/pkg/PLIST
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.12 2021/01/19 06:26:49 rsadowski Exp $
@conflict py3-sip-qt5-<5.5.0
+@conflict py-sip-qt5-<5.5.0
@bin bin/sip${MODPY_BIN_SUFFIX}
include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}/sip.h
lib/python${MODPY_VERSION}/site-packages/PyQt5/
