pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: devel/py-pep8 conflicts with itself built against different versions of python



On 2019-05-01 17:04, Aleksej Lebedev wrote:
Hi,

Recently I added py-conan to wip. I was able to build it against all
supported pythons (27, 34-37) using pkgsrc-2018Q4.
When I switched to pkgsrc-2019Q1 an extra dependency appeared:
devel/py-lint -> ... -> devel/py-pep8.

devel/py-pep8 however doesn't support ALTERNATIVES yet.

I fixed it so now it works. Please consider the following patch:
...

Sorry, ALTERNATIVES is missing in the diff. Unfortunately I don't know cvs well enough.
Here is the git diff instead:

a@nl1lxl-108875:~/pkgsrc/devel/py-pep8$ git show 068167c71414886385be92144de276ca856dfc5a
commit 068167c71414886385be92144de276ca856dfc5a
Author: Aleksej Lebedev <aleksej.lebedev%tomtom.com@localhost>
Date:   Wed May 1 17:16:37 2019 +0200

    py-pep8: Added support for ALTERTANIVES.

diff --git a/devel/py-pep8/ALTERNATIVES b/devel/py-pep8/ALTERNATIVES
new file mode 100644
index 00000000000..5de7076b7e0
--- /dev/null
+++ b/devel/py-pep8/ALTERNATIVES
@@ -0,0 +1 @@
+bin/pep8 @PREFIX@/bin/pep8-@PYVERSSUFFIX@
diff --git a/devel/py-pep8/Makefile b/devel/py-pep8/Makefile
index c5d5af1e9f8..9e85a04137b 100644
--- a/devel/py-pep8/Makefile
+++ b/devel/py-pep8/Makefile
@@ -12,6 +12,9 @@ LICENSE=      mit

 USE_LANGUAGES= # none

+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} pep8 pep8-${PYVERSSUFFIX}
+
 do-test:
        cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} setup.py test

diff --git a/devel/py-pep8/PLIST b/devel/py-pep8/PLIST
index 3a938e3f774..0641739ab06 100644
--- a/devel/py-pep8/PLIST
+++ b/devel/py-pep8/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2014/04/26 11:09:24 wen Exp $
-bin/pep8
+bin/pep8-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt

--
Aleksej Lebedev


Home | Main Index | Thread Index | Old Index