py-whisper: updated to 1.1.5

1.1.5:
Python 3.x support fixes for whisper, carbon and graphite-web
REMOTE_BUFFER_SIZE = 0 now works properly
Multi-instance settings support
Increase performance of localdatabase tag db
avg_zero consolidation function fully supported now
Carbonlink queries working now for tagged series
Docker image migrated to Alpine, reducing the image size from ~530MB to 188MB

4 files changed, 50 insertions, 25 deletions

diff --git a/databases/py-whisper/ALTERNATIVES b/databases/py-whisper/ALTERNATIVES
new file mode 100644
index 00000000000..5310150dfcb
--- /dev/null
+++ b/databases/py-whisper/ALTERNATIVES
@@ -0,0 +1,16 @@
+bin/find-corrupt-whisper-files @PREFIX@/bin/find-corrupt-whisper-files-@PYVERSSUFFIX@
+bin/rrd2whisper @PREFIX@/bin/rrd2whisper-@PYVERSSUFFIX@
+bin/update-storage-times @PREFIX@/bin/update-storage-times-@PYVERSSUFFIX@
+bin/whisper-auto-resize @PREFIX@/bin/whisper-auto-resize-@PYVERSSUFFIX@
+bin/whisper-auto-update @PREFIX@/bin/whisper-auto-update-@PYVERSSUFFIX@
+bin/whisper-create @PREFIX@/bin/whisper-create-@PYVERSSUFFIX@
+bin/whisper-diff @PREFIX@/bin/whisper-diff-@PYVERSSUFFIX@
+bin/whisper-dump @PREFIX@/bin/whisper-dump-@PYVERSSUFFIX@
+bin/whisper-fetch @PREFIX@/bin/whisper-fetch-@PYVERSSUFFIX@
+bin/whisper-fill @PREFIX@/bin/whisper-fill-@PYVERSSUFFIX@
+bin/whisper-info @PREFIX@/bin/whisper-info-@PYVERSSUFFIX@
+bin/whisper-merge @PREFIX@/bin/whisper-merge-@PYVERSSUFFIX@
+bin/whisper-resize @PREFIX@/bin/whisper-resize-@PYVERSSUFFIX@
+bin/whisper-set-aggregation-method @PREFIX@/bin/whisper-set-aggregation-method-@PYVERSSUFFIX@
+bin/whisper-set-xfilesfactor @PREFIX@/bin/whisper-set-xfilesfactor-@PYVERSSUFFIX@
+bin/whisper-update @PREFIX@/bin/whisper-update-@PYVERSSUFFIX@
diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile
index 0d19c279061..7742526cadf 100644
--- a/databases/py-whisper/Makefile
+++ b/databases/py-whisper/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/11/14 10:41:17 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/08/11 18:08:01 adam Exp $
 
-DISTNAME=	whisper-1.1.4
+DISTNAME=	whisper-1.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=w/whisper/}
@@ -14,7 +14,16 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
-PYTHON_SELF_CONFLICT=	yes
+post-install:
+.for bin in find-corrupt-whisper-files rrd2whisper update-storage-times \
+	whisper-auto-resize whisper-auto-update whisper-create \
+	whisper-diff whisper-dump whisper-fetch whisper-fill \
+	whisper-info whisper-merge whisper-resize \
+	whisper-set-aggregation-method whisper-set-xfilesfactor \
+	whisper-update
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} ${bin}.py ${bin}-${PYVERSSUFFIX} || ${TRUE}
+.endfor
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-whisper/PLIST b/databases/py-whisper/PLIST
index 7c3f5ff8a4d..ed64e1a47ee 100644
--- a/databases/py-whisper/PLIST
+++ b/databases/py-whisper/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2018/07/07 04:56:45 minskim Exp $
-bin/find-corrupt-whisper-files.py
-bin/rrd2whisper.py
-bin/update-storage-times.py
-bin/whisper-auto-resize.py
-bin/whisper-auto-update.py
-bin/whisper-create.py
-bin/whisper-diff.py
-bin/whisper-dump.py
-bin/whisper-fetch.py
-bin/whisper-fill.py
-bin/whisper-info.py
-bin/whisper-merge.py
-bin/whisper-resize.py
-bin/whisper-set-aggregation-method.py
-bin/whisper-set-xfilesfactor.py
-bin/whisper-update.py
+@comment $NetBSD: PLIST,v 1.3 2019/08/11 18:08:01 adam Exp $
+bin/find-corrupt-whisper-files-${PYVERSSUFFIX}
+bin/rrd2whisper-${PYVERSSUFFIX}
+bin/update-storage-times-${PYVERSSUFFIX}
+bin/whisper-auto-resize-${PYVERSSUFFIX}
+bin/whisper-auto-update-${PYVERSSUFFIX}
+bin/whisper-create-${PYVERSSUFFIX}
+bin/whisper-diff-${PYVERSSUFFIX}
+bin/whisper-dump-${PYVERSSUFFIX}
+bin/whisper-fetch-${PYVERSSUFFIX}
+bin/whisper-fill-${PYVERSSUFFIX}
+bin/whisper-info-${PYVERSSUFFIX}
+bin/whisper-merge-${PYVERSSUFFIX}
+bin/whisper-resize-${PYVERSSUFFIX}
+bin/whisper-set-aggregation-method-${PYVERSSUFFIX}
+bin/whisper-set-xfilesfactor-${PYVERSSUFFIX}
+bin/whisper-update-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/whisper.py
 ${PYSITELIB}/whisper.pyc
diff --git a/databases/py-whisper/distinfo b/databases/py-whisper/distinfo
index 11cf942e158..fa429dfe6dc 100644
--- a/databases/py-whisper/distinfo
+++ b/databases/py-whisper/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2018/11/14 10:41:17 adam Exp $
+$NetBSD: distinfo,v 1.4 2019/08/11 18:08:01 adam Exp $
 
-SHA1 (whisper-1.1.4.tar.gz) = dceaa212ac687043c6c5ac485b99fdda156642c4
-RMD160 (whisper-1.1.4.tar.gz) = 05323a4ff28a9f8afbe5a5e2e3db9be805130855
-SHA512 (whisper-1.1.4.tar.gz) = aacdad56c84104e175f1b13af08c9a3cab9b6daa36970584c2902ab3297626209424cdd87098cac1c7674cf9567156010768a8a4735d3c359384276d24a92247
-Size (whisper-1.1.4.tar.gz) = 31395 bytes
+SHA1 (whisper-1.1.5.tar.gz) = 8fa3658f5ae134b08ac4e872e2bfe0a4013c08e2
+RMD160 (whisper-1.1.5.tar.gz) = 4619530d9edd2419e395679fdf787116e8dd5da3
+SHA512 (whisper-1.1.5.tar.gz) = 4aa7cd37cbc45b57643f57bcbd29ad726bb28026201419e28945be4a1e2201ba2f32a4d6ee263fdfed2f7d3cd099556f4c48813992041c5f8b4973c667152bd4
+Size (whisper-1.1.5.tar.gz) = 31660 bytes