py-gcs-oauth2-boto-plugin: 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-gcs-oauth2-boto-plugin/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile	7 Oct 2018 11:02:01 -0000	1.3
+++ Makefile	1 Jan 2019 22:14:30 -0000
@@ -2,6 +2,7 @@
 
 DISTNAME=	gcs-oauth2-boto-plugin-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gcs-oauth2-boto-plugin/}
 
@@ -17,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-oauth2client>=2
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-retry_decorator>=1.0.0:../../devel/py-retry_decorator
 DEPENDS+=	${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-SocksiPy-branch-1.01*:../../net/py-socksipy-branch
+DEPENDS+=	${PYPKGPREFIX}-Socks-[0-9]*:../../net/py-Socks
 TEST_DEPENDS+=	${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-gcs-oauth2-boto-plugin/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	7 Oct 2018 11:02:01 -0000	1.3
+++ distinfo	1 Jan 2019 22:14:30 -0000
@@ -4,3 +4,4 @@ SHA1 (gcs-oauth2-boto-plugin-2.2.tar.gz)
 RMD160 (gcs-oauth2-boto-plugin-2.2.tar.gz) = 84e69a8d80e66d2a9bea8f016f3f8416b0f5f100
 SHA512 (gcs-oauth2-boto-plugin-2.2.tar.gz) = 1eb8af07abcf2124872e585736ae38ae40466a4782bba587264b6dc614a91fa5ca983acd937094b044c75eded1c905136a90baa95e9a60bc60121f966ae0b2ea
 Size (gcs-oauth2-boto-plugin-2.2.tar.gz) = 15840 bytes
+SHA1 (patch-setup.py) = a5c2d82e16b8e90ea62f327990f15aa12747e967
Index: patches/patch-setup.py
===================================================================
RCS file: patches/patch-setup.py
diff -N patches/patch-setup.py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup.py	1 Jan 2019 22:14:30 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Depends on net/py-Socks to avoid possible conflicts.
+
+--- setup.py.orig	2018-09-06 20:18:50.000000000 +0000
++++ setup.py
+@@ -34,9 +34,7 @@ requires = [
+     'httplib2>=0.8',
+     'oauth2client>=2.2.0',
+     'pyOpenSSL>=0.13',
+-    # Not using 1.02 because of:
+-    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'PySocks',
+     'retry_decorator>=1.0.0',
+     'six>=1.6.1'
+ ]