mitmproxy: Avoid pyperclip kludge now that is no more needed

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Feb 26 12:38:04 2018 +0100
Changeset:	056092a74b71228c7fda3607d43dd9d331996d56

Modified Files:
	mitmproxy/Makefile
	mitmproxy/TODO
	mitmproxy/distinfo
	mitmproxy/patches/patch-setup.py

Log Message:
mitmproxy: Avoid pyperclip kludge now that is no more needed

py-pyperclip kludge is no longer needed now that we have py-pyperclip-1.6.0,
adjust Makefile and patches/patch-setup.py accordingly.

While here also update TODO file.

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

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

diffstat:
 mitmproxy/Makefile               | 2 +-
 mitmproxy/TODO                   | 3 ---
 mitmproxy/distinfo               | 2 +-
 mitmproxy/patches/patch-setup.py | 9 +--------
 4 files changed, 3 insertions(+), 13 deletions(-)

diffs:
diff --git a/mitmproxy/Makefile b/mitmproxy/Makefile
index 3822a78184..d0c7ba366b 100644
--- a/mitmproxy/Makefile
+++ b/mitmproxy/Makefile
@@ -29,7 +29,7 @@ DEPENDS+=	${PYPKGPREFIX}-kaitaistruct>=0.7:../../devel/py-kaitaistruct
 DEPENDS+=	${PYPKGPREFIX}-ldap3>=2.4:../../databases/py-ldap3
 DEPENDS+=	${PYPKGPREFIX}-passlib>=1.6.5:../../security/py-passlib
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.3:../../devel/py-pyparsing
-DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.5.22:../../x11/py-pyperclip	# XXX: should be updated to 1.6.0 before updating
+DEPENDS+=	${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.9.1:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-ruamel-yaml>=0.13.2:../../devel/py-ruamel-yaml
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=1.5.4:../../devel/py-sortedcontainers
diff --git a/mitmproxy/TODO b/mitmproxy/TODO
index 6ae89503f5..edaa28f68c 100644
--- a/mitmproxy/TODO
+++ b/mitmproxy/TODO
@@ -1,8 +1,5 @@
 Before updating net/mitmproxy the following steps are needed:
 
- - Update x11/py-perclip (only mitmproxy depends on it)
- - Adjust Makefile and patches/patch-setup.py to requests pyperclip>=1.6.0
-   (not >=1.5.22!)
  - Import wip/py-h11 as www/py-h11
  - Import wip/py-wsproto as www/py-wsproto
  - Adjust py-h11 and py-wsproto DEPENDS in Makefile
diff --git a/mitmproxy/distinfo b/mitmproxy/distinfo
index f6dabc9a5f..a2133f8e88 100644
--- a/mitmproxy/distinfo
+++ b/mitmproxy/distinfo
@@ -4,4 +4,4 @@ SHA1 (mitmproxy-3.0.3.tar.gz) = 73c5df44ec8ebfe7bef672234578f31473cc714d
 RMD160 (mitmproxy-3.0.3.tar.gz) = 071de5dfd7b519d4be0c910127e749b46f663987
 SHA512 (mitmproxy-3.0.3.tar.gz) = 5477b8ac438b8f2ea40e658c50988881ef0f3eeda3178b2fbed9618d2a490c28f59b32174e150d8cbeb1b04b4b868a64029bde6499983dff782d4204aa0f8d37
 Size (mitmproxy-3.0.3.tar.gz) = 27171521 bytes
-SHA1 (patch-setup.py) = 0e5f67a06971016da1ab8c766dece23d06a95f8e
+SHA1 (patch-setup.py) = e692d17abb332a61d4cfec52ab17d0c93d84180a
diff --git a/mitmproxy/patches/patch-setup.py b/mitmproxy/patches/patch-setup.py
index 8327c422f8..9c6c6519c8 100644
--- a/mitmproxy/patches/patch-setup.py
+++ b/mitmproxy/patches/patch-setup.py
@@ -2,13 +2,6 @@ $NetBSD: patch-setup.py,v 1.5 2017/04/14 13:15:04 leot Exp $
 
 Avoid too strict version requirements.
 
-XXX: pyperclip>=1.5.22 is just a kludge to avoid updating x11/py-pyperclip.
-XXX: Before updating net/mitmproxy the requirement should be bumped to 1.6.0
-XXX: here and in Makefile accordingly.
-XXX: Please see:
-XXX:  <https://github.com/mitmproxy/mitmproxy/commit/d1ecf9df9431397e5e7e6fee58c7b04c6f37a44b>
-XXX: if you are more interested.
-
 --- setup.py.orig	2018-02-22 12:17:33.000000000 +0000
 +++ setup.py
 @@ -61,47 +61,47 @@ setup(
@@ -49,7 +42,7 @@ XXX: if you are more interested.
 +        "pyasn1>=0.3.1",
 +        "pyOpenSSL>=17.5",
 +        "pyparsing>=2.1.3",
-+        "pyperclip>=1.5.22",
++        "pyperclip>=1.6.0",
 +        "requests>=2.9.1",
 +        "ruamel.yaml>=0.13.2",
 +        "sortedcontainers>=1.5.4",