py-gsutil: Depends on py-Socks instead of py-socksipy-branch

The only code present that needs the `socks' package is also
compatible with py-Socks and used by more packages in pkgsrc.

PKGREVISION++

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-gsutil/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile	7 Oct 2018 11:20:25 -0000	1.5
+++ Makefile	2 Jan 2019 10:51:40 -0000
@@ -2,6 +2,7 @@
 
 DISTNAME=	gsutil-4.34
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gsutil/}
 
@@ -14,7 +15,7 @@ PYTHON_VERSIONS_ACCEPTED=	27
 REPLACE_PYTHON=			test/gsutil_measure_imports
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-SocksiPy-branch>=1.01:../../net/py-socksipy-branch
+DEPENDS+=	${PYPKGPREFIX}-Socks-[0-9]*:../../net/py-Socks
 DEPENDS+=	${PYPKGPREFIX}-argcomplete>=1.9.4:../../devel/py-argcomplete
 DEPENDS+=	${PYPKGPREFIX}-boto>=2.48.0:../../net/py-boto
 DEPENDS+=	${PYPKGPREFIX}-crcmod>=1.7:../../security/py-crcmod
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-gsutil/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo	7 Oct 2018 11:20:25 -0000	1.4
+++ distinfo	2 Jan 2019 10:51:40 -0000
@@ -4,4 +4,4 @@ SHA1 (gsutil-4.34.tar.gz) = f3185579520e
 RMD160 (gsutil-4.34.tar.gz) = ef5272a400b352bcdfd8a7acdc7bcf2fa90a6bba
 SHA512 (gsutil-4.34.tar.gz) = 87fc71bd9437d18e8ad2dc390fa4b9027a9bda94cb4228acb0def878f31f025e49a826bb5a029954c7fb7e9a117f4f988de5565cc537a17af1fffa122d50bfc9
 Size (gsutil-4.34.tar.gz) = 866896 bytes
-SHA1 (patch-setup.py) = 3aa468a192839dcc2f0d55b3a598e9f463bb7918
+SHA1 (patch-setup.py) = 989c02bfaa9b293ede4638ceeae49d1483553a21
Index: patches/patch-setup.py
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-gsutil/patches/patch-setup.py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup.py
--- patches/patch-setup.py	7 Oct 2018 11:20:25 -0000	1.2
+++ patches/patch-setup.py	2 Jan 2019 10:51:40 -0000
@@ -1,8 +1,9 @@
 $NetBSD: patch-setup.py,v 1.2 2018/10/07 11:20:25 adam Exp $
 
-Relax requirements.
+- Relax requirements.
+- Depends on net/py-Socks to avoid possible conflicts.
 
---- setup.py.orig	2018-08-22 06:24:42.000000000 +0000
+--- setup.py.orig	2018-09-12 02:45:08.000000000 +0000
 +++ setup.py
 @@ -36,7 +36,7 @@ management tasks, including:
  
@@ -13,7 +14,7 @@ Relax requirements.
      'crcmod>=1.7',
      'fasteners>=0.14.1',
      'gcs-oauth2-boto-plugin>=2.2',
-@@ -44,16 +44,16 @@ requires = [
+@@ -44,16 +44,14 @@ requires = [
      'httplib2>=0.11.3',
      'google-reauth>=0.1.0',
      # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
@@ -26,10 +27,10 @@ Relax requirements.
      'python-gflags>=2.0',
      'retry_decorator>=1.0.0',
      'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    # Not using 1.02 because of:
+-    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
 -    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
++    'PySocks',
  ]
  
  dependency_links = [