From 1783ecec7fb1c14175dd4441aa2c0a2f9154e35b Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Wed, 14 Nov 2018 10:41:17 +0000
Subject: py-whisper: updated to 1.1.4

1.1.4:
Include tests in PyPI distributions
Add Python 3.7 testing to Travis
---
 databases/py-whisper/Makefile                         | 14 +++++++-------
 databases/py-whisper/distinfo                         | 11 +++++------
 databases/py-whisper/patches/patch-bin_rrd2whisper.py | 16 ----------------
 3 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 databases/py-whisper/patches/patch-bin_rrd2whisper.py

(limited to 'databases')

diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile
index 16e727f0b99..0d19c279061 100644
--- a/databases/py-whisper/Makefile
+++ b/databases/py-whisper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2018/07/07 04:56:45 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2018/11/14 10:41:17 adam Exp $
 
-DISTNAME=	whisper-1.1.3
+DISTNAME=	whisper-1.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	databases
+CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_PYPI:=w/whisper/}
 
 MAINTAINER=	riz@NetBSD.org
@@ -10,11 +10,11 @@ HOMEPAGE=	https://github.com/graphite-project/whisper
 COMMENT=	Fixed-size database, similar in design to RRD
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	# none
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-.include "../../lang/python/distutils.mk"
+USE_LANGUAGES=	# none
 
-post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/bin/*.orig
+PYTHON_SELF_CONFLICT=	yes
 
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-whisper/distinfo b/databases/py-whisper/distinfo
index 4d9794e447f..11cf942e158 100644
--- a/databases/py-whisper/distinfo
+++ b/databases/py-whisper/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/07/07 04:56:45 minskim Exp $
+$NetBSD: distinfo,v 1.3 2018/11/14 10:41:17 adam Exp $
 
-SHA1 (whisper-1.1.3.tar.gz) = 3a4a959c5859f5d7260dd251c0c5a4000a77255f
-RMD160 (whisper-1.1.3.tar.gz) = e3e774b9ceec193c04d1e953b76c5633bddeb38c
-SHA512 (whisper-1.1.3.tar.gz) = abad7c8abbf6ea4dd07a644ec6347be24ebac2a669fc584e5be8a41aa6476544ccbbb16b96a867496e701d04a0fe6bf91c1d70af2e360bfdc0dd6034eb9a7003
-Size (whisper-1.1.3.tar.gz) = 24490 bytes
-SHA1 (patch-bin_rrd2whisper.py) = 332b5ceec5d7ebec9f7428b94875bacece5a5f43
+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
diff --git a/databases/py-whisper/patches/patch-bin_rrd2whisper.py b/databases/py-whisper/patches/patch-bin_rrd2whisper.py
deleted file mode 100644
index 8cd527ef2ce..00000000000
--- a/databases/py-whisper/patches/patch-bin_rrd2whisper.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bin_rrd2whisper.py,v 1.1 2018/07/07 04:56:45 minskim Exp $
-
-Make the command work with Python 3.
-https://github.com/graphite-project/whisper/pull/254
-
---- bin/rrd2whisper.py.orig	2018-04-04 08:34:11.000000000 +0000
-+++ bin/rrd2whisper.py
-@@ -20,7 +20,7 @@ except ImportError:
- # Ignore SIGPIPE
- signal.signal(signal.SIGPIPE, signal.SIG_DFL)
- 
--aggregationMethods = whisper.aggregationMethods
-+aggregationMethods = list(whisper.aggregationMethods)
- 
- # RRD doesn't have a 'sum' or 'total' type
- aggregationMethods.remove('sum')
-- 
cgit v1.2.3