py-onionbalance: fix building; use Pypi; use egg.mk; fix PLIST

3 files changed, 53 insertions, 55 deletions

diff --git a/net/py-onionbalance/Makefile b/net/py-onionbalance/Makefile
index 1a184b64cab..0a87f6dd2c4 100644
--- a/net/py-onionbalance/Makefile
+++ b/net/py-onionbalance/Makefile
@@ -1,44 +1,41 @@
-# $NetBSD: Makefile,v 1.1 2018/10/23 03:18:06 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2018/10/24 11:52:33 adam Exp $
 
-.include "net/py-onionbalance/Makefile.common"
+.include "../../net/py-onionbalance/Makefile.common"
 
-DISTNAME=	onionbalance-${VERSION}
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+DISTNAME=	OnionBalance-${VERSION}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_GITHUB:=DonnchaC/}
-GITHUB_PROJECT=	onionbalance
+MASTER_SITES=	${MASTER_SITE_PYPI:=O/OnionBalance/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://onionbalance.readthedocs.io/
 COMMENT=	Tor onion service load balancer
 LICENSE=	gnu-gpl-v3
 
-USE_LANGUAGES=	# none
-
 DEPENDS+=	${PYPKGPREFIX}-crypto>=2.6.1:../../security/py-crypto
 DEPENDS+=	${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
 DEPENDS+=	${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
 DEPENDS+=	${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
-
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 
-REPLACE_PYTHON+=onionbalance.py
-REPLACE_PYTHON+=docs/conf.py
+USE_LANGUAGES=	# none
+
+PYTHON_SELF_CONFLICT=	yes
+
+REPLACE_PYTHON+=	onionbalance.py
+REPLACE_PYTHON+=	docs/conf.py
 
 CHECK_INTERPRETER_SKIP+=	test/scripts/install-chutney.sh
 CHECK_INTERPRETER_SKIP+=	test/scripts/install-tor.sh
 
 do-test:
-	cd ${WRKSRC} && \
-	${SETENV} PATH=${PATH:Q}:${DESTDIR:Q}${PREFIX:Q}/bin \
-	${SETENV} PYTHONPATH=${DESTDIR:Q}${PREFIX:Q}/lib/python${PYVERSSUFFIX}/site-packages \
-		py.test-${PYVERSSUFFIX}
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-onionbalance/PLIST b/net/py-onionbalance/PLIST
index 56eb10cd878..cfd23ef2fda 100644
--- a/net/py-onionbalance/PLIST
+++ b/net/py-onionbalance/PLIST
@@ -1,54 +1,55 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/23 03:18:06 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/10/24 11:52:33 adam Exp $
 bin/onionbalance
 bin/onionbalance-config
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/requires.txt
-${PYSITELIB}/OnionBalance-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/pbr.json
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/onionbalance/__init__.py
-${PYSITELIB}/onionbalance/__main__.py
-${PYSITELIB}/onionbalance/__init__.pyo
 ${PYSITELIB}/onionbalance/__init__.pyc
-${PYSITELIB}/onionbalance/__main__.pyo
+${PYSITELIB}/onionbalance/__init__.pyo
+${PYSITELIB}/onionbalance/__main__.py
 ${PYSITELIB}/onionbalance/__main__.pyc
-${PYSITELIB}/onionbalance/config.pyo
-${PYSITELIB}/onionbalance/config.pyc
-${PYSITELIB}/onionbalance/consensus.pyo
-${PYSITELIB}/onionbalance/consensus.pyc
-${PYSITELIB}/onionbalance/descriptor.pyo
-${PYSITELIB}/onionbalance/descriptor.pyc
-${PYSITELIB}/onionbalance/eventhandler.pyo
-${PYSITELIB}/onionbalance/eventhandler.pyc
-${PYSITELIB}/onionbalance/instance.pyo
-${PYSITELIB}/onionbalance/instance.pyc
-${PYSITELIB}/onionbalance/log.pyo
-${PYSITELIB}/onionbalance/log.pyc
-${PYSITELIB}/onionbalance/manager.pyo
-${PYSITELIB}/onionbalance/manager.pyc
-${PYSITELIB}/onionbalance/scheduler.pyo
-${PYSITELIB}/onionbalance/scheduler.pyc
-${PYSITELIB}/onionbalance/service.pyo
-${PYSITELIB}/onionbalance/service.pyc
-${PYSITELIB}/onionbalance/settings.pyo
-${PYSITELIB}/onionbalance/settings.pyc
-${PYSITELIB}/onionbalance/status.pyo
-${PYSITELIB}/onionbalance/status.pyc
-${PYSITELIB}/onionbalance/util.pyo
-${PYSITELIB}/onionbalance/util.pyc
+${PYSITELIB}/onionbalance/__main__.pyo
 ${PYSITELIB}/onionbalance/config.py
+${PYSITELIB}/onionbalance/config.pyc
+${PYSITELIB}/onionbalance/config.pyo
 ${PYSITELIB}/onionbalance/consensus.py
+${PYSITELIB}/onionbalance/consensus.pyc
+${PYSITELIB}/onionbalance/consensus.pyo
 ${PYSITELIB}/onionbalance/data/config.example.yaml
 ${PYSITELIB}/onionbalance/data/torrc-instance
 ${PYSITELIB}/onionbalance/data/torrc-server
 ${PYSITELIB}/onionbalance/descriptor.py
+${PYSITELIB}/onionbalance/descriptor.pyc
+${PYSITELIB}/onionbalance/descriptor.pyo
 ${PYSITELIB}/onionbalance/eventhandler.py
+${PYSITELIB}/onionbalance/eventhandler.pyc
+${PYSITELIB}/onionbalance/eventhandler.pyo
 ${PYSITELIB}/onionbalance/instance.py
+${PYSITELIB}/onionbalance/instance.pyc
+${PYSITELIB}/onionbalance/instance.pyo
 ${PYSITELIB}/onionbalance/log.py
+${PYSITELIB}/onionbalance/log.pyc
+${PYSITELIB}/onionbalance/log.pyo
 ${PYSITELIB}/onionbalance/manager.py
+${PYSITELIB}/onionbalance/manager.pyc
+${PYSITELIB}/onionbalance/manager.pyo
 ${PYSITELIB}/onionbalance/scheduler.py
+${PYSITELIB}/onionbalance/scheduler.pyc
+${PYSITELIB}/onionbalance/scheduler.pyo
 ${PYSITELIB}/onionbalance/service.py
+${PYSITELIB}/onionbalance/service.pyc
+${PYSITELIB}/onionbalance/service.pyo
 ${PYSITELIB}/onionbalance/settings.py
+${PYSITELIB}/onionbalance/settings.pyc
+${PYSITELIB}/onionbalance/settings.pyo
 ${PYSITELIB}/onionbalance/status.py
+${PYSITELIB}/onionbalance/status.pyc
+${PYSITELIB}/onionbalance/status.pyo
 ${PYSITELIB}/onionbalance/util.py
+${PYSITELIB}/onionbalance/util.pyc
+${PYSITELIB}/onionbalance/util.pyo
diff --git a/net/py-onionbalance/distinfo b/net/py-onionbalance/distinfo
index e7291564bb7..8080b0748ff 100644
--- a/net/py-onionbalance/distinfo
+++ b/net/py-onionbalance/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/10/23 03:18:06 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2018/10/24 11:52:33 adam Exp $
 
-SHA1 (onionbalance-0.1.8.tar.gz) = e34e8685f1659d4c884d96fa61a60150d062042e
-RMD160 (onionbalance-0.1.8.tar.gz) = 26a7259cdb01486762eeb41ed81539780d5566d5
-SHA512 (onionbalance-0.1.8.tar.gz) = 062d853b8b873ca630bf313bba713e15e0efc8ed32cc16b0c14f7d5675dc5677c5bcc5ea5bd96a5ff5dca3f044cca12b5916161b73e353b09afe5808805207ce
-Size (onionbalance-0.1.8.tar.gz) = 139113 bytes
+SHA1 (OnionBalance-0.1.8.tar.gz) = ec37b1ed1314318853f6f149c265853462c4be77
+RMD160 (OnionBalance-0.1.8.tar.gz) = fbdfe5e4e815595c89f5d0fdfc1a3ea290c6e519
+SHA512 (OnionBalance-0.1.8.tar.gz) = dc43a8419a6bb2d3b44dfa6f6be3ea7ed4e303c41b64249e82156610d712b5c717be47c90e6b8b37f6d4308dd616cc4312aa6132a73a8a9136f1027375a4cca6
+Size (OnionBalance-0.1.8.tar.gz) = 55919 bytes