Wed Oct 24 11:52:33 2018 UTC ()
py-onionbalance: fix building; use Pypi; use egg.mk; fix PLIST


(adam)
diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/Makefile
diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/PLIST
diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/distinfo
cvs diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/Makefile 2018/10/23 03:18:06 1.1
+++ pkgsrc/net/py-onionbalance/Makefile 2018/10/24 11:52:33 1.2
@@ -1,44 +1,41 @@ @@ -1,44 +1,41 @@
1# $NetBSD: Makefile,v 1.1 2018/10/23 03:18:06 riastradh Exp $ 1# $NetBSD: Makefile,v 1.2 2018/10/24 11:52:33 adam Exp $
2 2
3.include "net/py-onionbalance/Makefile.common" 3.include "../../net/py-onionbalance/Makefile.common"
4 4
5DISTNAME= onionbalance-${VERSION} 5DISTNAME= OnionBalance-${VERSION}
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
7CATEGORIES= net python 7CATEGORIES= net python
8MASTER_SITES= ${MASTER_SITE_GITHUB:=DonnchaC/} 8MASTER_SITES= ${MASTER_SITE_PYPI:=O/OnionBalance/}
9GITHUB_PROJECT= onionbalance 
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://onionbalance.readthedocs.io/ 11HOMEPAGE= https://onionbalance.readthedocs.io/
13COMMENT= Tor onion service load balancer 12COMMENT= Tor onion service load balancer
14LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
15 14
16USE_LANGUAGES= # none 
17 
18DEPENDS+= ${PYPKGPREFIX}-crypto>=2.6.1:../../security/py-crypto 15DEPENDS+= ${PYPKGPREFIX}-crypto>=2.6.1:../../security/py-crypto
19DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future 16DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
20DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle 17DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
21DEPENDS+= ${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem 18DEPENDS+= ${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem
22DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml 19DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
23 
24TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 20TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
25TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect 21TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
26TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 22TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
27TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock 23TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
28TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox 24TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
29 25
30REPLACE_PYTHON+=onionbalance.py 26USE_LANGUAGES= # none
31REPLACE_PYTHON+=docs/conf.py 27
 28PYTHON_SELF_CONFLICT= yes
 29
 30REPLACE_PYTHON+= onionbalance.py
 31REPLACE_PYTHON+= docs/conf.py
32 32
33CHECK_INTERPRETER_SKIP+= test/scripts/install-chutney.sh 33CHECK_INTERPRETER_SKIP+= test/scripts/install-chutney.sh
34CHECK_INTERPRETER_SKIP+= test/scripts/install-tor.sh 34CHECK_INTERPRETER_SKIP+= test/scripts/install-tor.sh
35 35
36do-test: 36do-test:
37 cd ${WRKSRC} && \ 37 cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
38 ${SETENV} PATH=${PATH:Q}:${DESTDIR:Q}${PREFIX:Q}/bin \ 
39 ${SETENV} PYTHONPATH=${DESTDIR:Q}${PREFIX:Q}/lib/python${PYVERSSUFFIX}/site-packages \ 
40 py.test-${PYVERSSUFFIX} 
41 38
42.include "../../lang/python/application.mk" 39.include "../../lang/python/application.mk"
43.include "../../lang/python/distutils.mk" 40.include "../../lang/python/egg.mk"
44.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/PLIST (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/PLIST 2018/10/23 03:18:06 1.1
+++ pkgsrc/net/py-onionbalance/PLIST 2018/10/24 11:52:33 1.2
@@ -1,54 +1,55 @@ @@ -1,54 +1,55 @@
1@comment $NetBSD: PLIST,v 1.1 2018/10/23 03:18:06 riastradh Exp $ 1@comment $NetBSD: PLIST,v 1.2 2018/10/24 11:52:33 adam Exp $
2bin/onionbalance 2bin/onionbalance
3bin/onionbalance-config 3bin/onionbalance-config
4${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO 4${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
5${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt 5${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
6${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt 6${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
7${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/entry_points.txt 7${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
8${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/requires.txt 8${PYSITELIB}/${EGG_INFODIR}/pbr.json
9${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt 9${PYSITELIB}/${EGG_INFODIR}/requires.txt
 10${PYSITELIB}/${EGG_INFODIR}/top_level.txt
10${PYSITELIB}/onionbalance/__init__.py 11${PYSITELIB}/onionbalance/__init__.py
11${PYSITELIB}/onionbalance/__main__.py 
12${PYSITELIB}/onionbalance/__init__.pyo 
13${PYSITELIB}/onionbalance/__init__.pyc 12${PYSITELIB}/onionbalance/__init__.pyc
14${PYSITELIB}/onionbalance/__main__.pyo 13${PYSITELIB}/onionbalance/__init__.pyo
 14${PYSITELIB}/onionbalance/__main__.py
15${PYSITELIB}/onionbalance/__main__.pyc 15${PYSITELIB}/onionbalance/__main__.pyc
16${PYSITELIB}/onionbalance/config.pyo 16${PYSITELIB}/onionbalance/__main__.pyo
17${PYSITELIB}/onionbalance/config.pyc 
18${PYSITELIB}/onionbalance/consensus.pyo 
19${PYSITELIB}/onionbalance/consensus.pyc 
20${PYSITELIB}/onionbalance/descriptor.pyo 
21${PYSITELIB}/onionbalance/descriptor.pyc 
22${PYSITELIB}/onionbalance/eventhandler.pyo 
23${PYSITELIB}/onionbalance/eventhandler.pyc 
24${PYSITELIB}/onionbalance/instance.pyo 
25${PYSITELIB}/onionbalance/instance.pyc 
26${PYSITELIB}/onionbalance/log.pyo 
27${PYSITELIB}/onionbalance/log.pyc 
28${PYSITELIB}/onionbalance/manager.pyo 
29${PYSITELIB}/onionbalance/manager.pyc 
30${PYSITELIB}/onionbalance/scheduler.pyo 
31${PYSITELIB}/onionbalance/scheduler.pyc 
32${PYSITELIB}/onionbalance/service.pyo 
33${PYSITELIB}/onionbalance/service.pyc 
34${PYSITELIB}/onionbalance/settings.pyo 
35${PYSITELIB}/onionbalance/settings.pyc 
36${PYSITELIB}/onionbalance/status.pyo 
37${PYSITELIB}/onionbalance/status.pyc 
38${PYSITELIB}/onionbalance/util.pyo 
39${PYSITELIB}/onionbalance/util.pyc 
40${PYSITELIB}/onionbalance/config.py 17${PYSITELIB}/onionbalance/config.py
 18${PYSITELIB}/onionbalance/config.pyc
 19${PYSITELIB}/onionbalance/config.pyo
41${PYSITELIB}/onionbalance/consensus.py 20${PYSITELIB}/onionbalance/consensus.py
 21${PYSITELIB}/onionbalance/consensus.pyc
 22${PYSITELIB}/onionbalance/consensus.pyo
42${PYSITELIB}/onionbalance/data/config.example.yaml 23${PYSITELIB}/onionbalance/data/config.example.yaml
43${PYSITELIB}/onionbalance/data/torrc-instance 24${PYSITELIB}/onionbalance/data/torrc-instance
44${PYSITELIB}/onionbalance/data/torrc-server 25${PYSITELIB}/onionbalance/data/torrc-server
45${PYSITELIB}/onionbalance/descriptor.py 26${PYSITELIB}/onionbalance/descriptor.py
 27${PYSITELIB}/onionbalance/descriptor.pyc
 28${PYSITELIB}/onionbalance/descriptor.pyo
46${PYSITELIB}/onionbalance/eventhandler.py 29${PYSITELIB}/onionbalance/eventhandler.py
 30${PYSITELIB}/onionbalance/eventhandler.pyc
 31${PYSITELIB}/onionbalance/eventhandler.pyo
47${PYSITELIB}/onionbalance/instance.py 32${PYSITELIB}/onionbalance/instance.py
 33${PYSITELIB}/onionbalance/instance.pyc
 34${PYSITELIB}/onionbalance/instance.pyo
48${PYSITELIB}/onionbalance/log.py 35${PYSITELIB}/onionbalance/log.py
 36${PYSITELIB}/onionbalance/log.pyc
 37${PYSITELIB}/onionbalance/log.pyo
49${PYSITELIB}/onionbalance/manager.py 38${PYSITELIB}/onionbalance/manager.py
 39${PYSITELIB}/onionbalance/manager.pyc
 40${PYSITELIB}/onionbalance/manager.pyo
50${PYSITELIB}/onionbalance/scheduler.py 41${PYSITELIB}/onionbalance/scheduler.py
 42${PYSITELIB}/onionbalance/scheduler.pyc
 43${PYSITELIB}/onionbalance/scheduler.pyo
51${PYSITELIB}/onionbalance/service.py 44${PYSITELIB}/onionbalance/service.py
 45${PYSITELIB}/onionbalance/service.pyc
 46${PYSITELIB}/onionbalance/service.pyo
52${PYSITELIB}/onionbalance/settings.py 47${PYSITELIB}/onionbalance/settings.py
 48${PYSITELIB}/onionbalance/settings.pyc
 49${PYSITELIB}/onionbalance/settings.pyo
53${PYSITELIB}/onionbalance/status.py 50${PYSITELIB}/onionbalance/status.py
 51${PYSITELIB}/onionbalance/status.pyc
 52${PYSITELIB}/onionbalance/status.pyo
54${PYSITELIB}/onionbalance/util.py 53${PYSITELIB}/onionbalance/util.py
 54${PYSITELIB}/onionbalance/util.pyc
 55${PYSITELIB}/onionbalance/util.pyo
cvs diff -r1.1 -r1.2 pkgsrc/net/py-onionbalance/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/distinfo 2018/10/23 03:18:06 1.1
+++ pkgsrc/net/py-onionbalance/distinfo 2018/10/24 11:52:33 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1 2018/10/23 03:18:06 riastradh Exp $ 1$NetBSD: distinfo,v 1.2 2018/10/24 11:52:33 adam Exp $
2 2
3SHA1 (onionbalance-0.1.8.tar.gz) = e34e8685f1659d4c884d96fa61a60150d062042e 3SHA1 (OnionBalance-0.1.8.tar.gz) = ec37b1ed1314318853f6f149c265853462c4be77
4RMD160 (onionbalance-0.1.8.tar.gz) = 26a7259cdb01486762eeb41ed81539780d5566d5 4RMD160 (OnionBalance-0.1.8.tar.gz) = fbdfe5e4e815595c89f5d0fdfc1a3ea290c6e519
5SHA512 (onionbalance-0.1.8.tar.gz) = 062d853b8b873ca630bf313bba713e15e0efc8ed32cc16b0c14f7d5675dc5677c5bcc5ea5bd96a5ff5dca3f044cca12b5916161b73e353b09afe5808805207ce 5SHA512 (OnionBalance-0.1.8.tar.gz) = dc43a8419a6bb2d3b44dfa6f6be3ea7ed4e303c41b64249e82156610d712b5c717be47c90e6b8b37f6d4308dd616cc4312aa6132a73a8a9136f1027375a4cca6
6Size (onionbalance-0.1.8.tar.gz) = 139113 bytes 6Size (OnionBalance-0.1.8.tar.gz) = 55919 bytes