[pkgsrc/trunk]: pkgsrc/lang/python pyversion.mk: Do not create self-conflicts...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7df03e7a1812
branches:  trunk
changeset: 443684:7df03e7a1812
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Dec 19 13:12:00 2020 +0000

description:
pyversion.mk: Do not create self-conflicts for incompatible versions

This resolves a problem where graphics/py-cairo and graphics/py-cairo118
cannot be installed simulatenously despite not conflicting.

PR pkg/55881

diffstat:

 lang/python/pyversion.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 740183eafed7 -r 7df03e7a1812 lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Sat Dec 19 12:26:57 2020 +0000
+++ b/lang/python/pyversion.mk  Sat Dec 19 13:12:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.133 2020/12/04 20:43:43 nia Exp $
+# $NetBSD: pyversion.mk,v 1.134 2020/12/19 13:12:00 nia Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -136,7 +136,9 @@
 # Additional CONFLICTS
 .if ${PYTHON_SELF_CONFLICT:U:tl} == "yes"
 .  for i in ${PYTHON_VERSIONS_ACCEPTED:N${_PYTHON_VERSION}}
+.    if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${i})
 CONFLICTS+=    ${PKGNAME:S/py${_PYTHON_VERSION}/py${i}/:C/-[0-9].*$/-[0-9]*/}
+.    endif
 .  endfor
 .endif # PYCONFLICTS