py-parsedmarc: finish package

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Sep 17 23:30:54 2022 +0200
Changeset:	1c995cb7c2fed3ddf8a0317efcef6bfbc441969f

Modified Files:
	py-elastic-transport/Makefile
	py-elasticsearch-dsl/Makefile
	py-elasticsearch-dsl/distinfo
	py-parsedmarc/Makefile
	py-parsedmarc/distinfo
Added Files:
	py-elasticsearch-dsl/patches/patch-setup.py
	py-parsedmarc/patches/patch-setup.py

Log Message:
py-parsedmarc: finish package

Now needs testing.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c995cb7c2fed3ddf8a0317efcef6bfbc441969f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-elastic-transport/Makefile               |  2 +-
 py-elasticsearch-dsl/Makefile               |  4 +---
 py-elasticsearch-dsl/distinfo               |  1 +
 py-elasticsearch-dsl/patches/patch-setup.py | 15 +++++++++++++++
 py-parsedmarc/Makefile                      |  4 ++--
 py-parsedmarc/distinfo                      |  1 +
 py-parsedmarc/patches/patch-setup.py        | 17 +++++++++++++++++
 7 files changed, 38 insertions(+), 6 deletions(-)

diffs:
diff --git a/py-elastic-transport/Makefile b/py-elastic-transport/Makefile
index 7f6eb42983..6002783029 100644
--- a/py-elastic-transport/Makefile
+++ b/py-elastic-transport/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	elastic-transport-8.1.2
-PKGNAME=	${PYPKGPREFIX}-${EGG_NAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=elastic/}
 GITHUB_PROJECT=	elastic-transport-python
diff --git a/py-elasticsearch-dsl/Makefile b/py-elasticsearch-dsl/Makefile
index aa385209f3..543a5ba1d7 100644
--- a/py-elasticsearch-dsl/Makefile
+++ b/py-elasticsearch-dsl/Makefile
@@ -12,9 +12,7 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-six>=0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=0:../../time/py-dateutil
-#DEPENDS+=	elasticsearch>=7.0.0,<8.0.0:../../databases/elasticsearch
-# pkgsrc version too new
-DEPENDS+=	${PYPKGPREFIX}-elasticsearch>=0:../../wip/py-elasticsearch
+DEPENDS+=	${PYPKGPREFIX}-elasticsearch>=7.0.0:../../wip/py-elasticsearch
 
 USE_LANGUAGES=	# none
 
diff --git a/py-elasticsearch-dsl/distinfo b/py-elasticsearch-dsl/distinfo
index 79ae7d4d2b..4d2ae37b5e 100644
--- a/py-elasticsearch-dsl/distinfo
+++ b/py-elasticsearch-dsl/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (elasticsearch-dsl-7.4.0.tar.gz) = 98e2f3e9c269513ba865f91412b23ce6a73cdd21284db59e418ad2cf4da2b992
 SHA512 (elasticsearch-dsl-7.4.0.tar.gz) = 4f125cbf3750e31b1ba18f988950377db04f13c59dd2336745c5fbbf056f7a482686ca486ec41c203098f5fdfb519fb1fdac893887b06b596863f72ad430cf4e
 Size (elasticsearch-dsl-7.4.0.tar.gz) = 56549 bytes
+SHA1 (patch-setup.py) = 94e29b2b6bcf0c08e1776fa9f3a08a53bcc71693
diff --git a/py-elasticsearch-dsl/patches/patch-setup.py b/py-elasticsearch-dsl/patches/patch-setup.py
new file mode 100644
index 0000000000..c24e1fb7b5
--- /dev/null
+++ b/py-elasticsearch-dsl/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+remove bounds
+
+--- setup.py.orig	2021-07-15 15:32:37.000000000 +0000
++++ setup.py
+@@ -31,7 +31,7 @@ f.close()
+ install_requires = [
+     "six",
+     "python-dateutil",
+-    "elasticsearch>=7.0.0,<8.0.0",
++    "elasticsearch",
+     # ipaddress is included in stdlib since python 3.3
+     'ipaddress; python_version<"3.3"',
+ ]
diff --git a/py-parsedmarc/Makefile b/py-parsedmarc/Makefile
index bee58f8924..bad95c7fb0 100644
--- a/py-parsedmarc/Makefile
+++ b/py-parsedmarc/Makefile
@@ -20,8 +20,8 @@ DEPENDS+=	${PYPKGPREFIX}-requests>=2.22.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-imapclient>=2.1.0:../../mail/py-imapclient
 DEPENDS+=	${PYPKGPREFIX}-dateparser>=1.1.1:../../time/py-dateparser
 DEPENDS+=	${PYPKGPREFIX}-mailsuite>=1.6.1:../../mail/py-mailsuite
-DEPENDS+=	${PYPKGPREFIX}-elasticsearch>=0:../../databases/py-elasticsearch
-#DEPENDS+=	# TODO: elasticsearch-dsl==7.4.0>=0
+DEPENDS+=	${PYPKGPREFIX}-elasticsearch>=7:../../wip/py-elasticsearch
+DEPENDS+=	${PYPKGPREFIX}-elasticsearch-dsl>=7.4.0:../../wip/py-elasticsearch-dsl
 DEPENDS+=	${PYPKGPREFIX}-kafka-python>=1.4.4:../../devel/py-kafka-python
 DEPENDS+=	${PYPKGPREFIX}-tqdm>=4.31.1:../../misc/py-tqdm
 DEPENDS+=	${PYPKGPREFIX}-lxml>=4.4.0:../../textproc/py-lxml
diff --git a/py-parsedmarc/distinfo b/py-parsedmarc/distinfo
index ef1a18564e..8542a9163b 100644
--- a/py-parsedmarc/distinfo
+++ b/py-parsedmarc/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (parsedmarc-8.3.0.tar.gz) = 0ded0d325f1ce6a080227b2a562ddaee07866ea61a50a4d59ea260050e9e6b3e
 SHA512 (parsedmarc-8.3.0.tar.gz) = 5ab5d5291780525fd7ba728d8321542c49feb8f172894e1ea60e39e761c99bb690786e0ae2529ba47fa96fa77d13f22a431f2682875581b0f12d3938ca5bcc1c
 Size (parsedmarc-8.3.0.tar.gz) = 3642199 bytes
+SHA1 (patch-setup.py) = 193f95cd5e1796dd2c1eceb14d64ed167db92a30
diff --git a/py-parsedmarc/patches/patch-setup.py b/py-parsedmarc/patches/patch-setup.py
new file mode 100644
index 0000000000..6ea542eb1f
--- /dev/null
+++ b/py-parsedmarc/patches/patch-setup.py
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Remove bounds.
+
+--- setup.py.orig	2022-06-20 14:35:57.000000000 +0000
++++ setup.py
+@@ -98,8 +98,8 @@ setup(
+                       'requests>=2.22.0', 'imapclient>=2.1.0',
+                       'dateparser>=1.1.1',
+                       'mailsuite>=1.6.1',
+-                      'elasticsearch<7.14.0',
+-                      'elasticsearch-dsl==7.4.0',
++                      'elasticsearch',
++                      'elasticsearch-dsl',
+                       'kafka-python>=1.4.4',
+                       'tqdm>=4.31.1',
+                       'lxml>=4.4.0',