CVS commit: pkgsrc/lang/python

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Dec 19 13:12:00 UTC 2020

Modified Files:
        pkgsrc/lang/python: pyversion.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/lang/python/pyversion.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.133 pkgsrc/lang/python/pyversion.mk:1.134
--- pkgsrc/lang/python/pyversion.mk:1.133       Fri Dec  4 20:43:43 2020
+++ pkgsrc/lang/python/pyversion.mk     Sat Dec 19 13:12:00 2020
@@ -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 @@ PKG_FAIL_REASON+=   "No valid Python versi
 # 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