[pkgsrc/trunk]: pkgsrc/security py-crypto and py-cryptodome CONFLICT with:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/98940e24a4c0
branches:  trunk
changeset: 357078:98940e24a4c0
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Thu Jan 12 11:53:16 2017 +0000

description:
py-crypto and py-cryptodome CONFLICT with:

${PYSITELIB}/Crypto/Cipher/AES.py

diffstat:

 security/py-crypto/Makefile     |  3 ++-
 security/py-cryptodome/Makefile |  4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 77990b6a0c53 -r 98940e24a4c0 security/py-crypto/Makefile
--- a/security/py-crypto/Makefile       Thu Jan 12 11:43:01 2017 +0000
+++ b/security/py-crypto/Makefile       Thu Jan 12 11:53:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/12/30 22:50:15 maya Exp $
+# $NetBSD: Makefile,v 1.38 2017/01/12 11:53:16 rodent Exp $
 
 DISTNAME=      pycrypto-2.6.1
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -12,6 +12,7 @@
 LICENSE=       public-domain AND python-software-foundation
 
 CONFLICTS+=    ${PYPKGPREFIX}-amkCrypto-[0-9]*
+CONFLICTS+=    ${PYPKGPREFIX}-cryptodome-[0-9]*
 SUPERSEDES+=   ${PYPKGPREFIX}-amkCrypto-[0-9]*
 
 GNU_CONFIGURE= yes
diff -r 77990b6a0c53 -r 98940e24a4c0 security/py-cryptodome/Makefile
--- a/security/py-cryptodome/Makefile   Thu Jan 12 11:43:01 2017 +0000
+++ b/security/py-cryptodome/Makefile   Thu Jan 12 11:53:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/12/30 22:50:15 maya Exp $
+# $NetBSD: Makefile,v 1.3 2017/01/12 11:53:16 rodent Exp $
 
 DISTNAME=      pycryptodome-3.4.3
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -10,6 +10,8 @@
 COMMENT=       Cryptographic and hash functions for Python
 LICENSE=       public-domain AND python-software-foundation
 
+CONFLICTS+=    ${PYPKGPREFIX}-crypto-[0-9]*
+
 do-test:
        ${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} ${PYSETUP} test