- Update to 1.3

PR:		166419
Submitted by:	Olivier Duchateau <duchateau.olivier@gmail.com> (maintainer)

6 files changed, 8 insertions, 46 deletions

diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile
index c21376c054c1..979a1a3fb20c 100644
--- a/net/py-urllib3/Makefile
+++ b/net/py-urllib3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	urllib3
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,6 +20,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+
 post-patch:
 	@cd ${WRKSRC} && \
 		${FIND} . -type f -name '*.orig' -exec ${RM} -f \{\} \;
diff --git a/net/py-urllib3/distinfo b/net/py-urllib3/distinfo
index 4562aabc9cd1..ee91627d96fd 100644
--- a/net/py-urllib3/distinfo
+++ b/net/py-urllib3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (urllib3-1.2.2.tar.gz) = b7cda49f21ba823f97075ef9db034de969180b7965c77b25bd5d6d46dc1d0312
-SIZE (urllib3-1.2.2.tar.gz) = 35251
+SHA256 (urllib3-1.3.tar.gz) = cedd2b34adf6c6fba633308f0c5ac197fab88a246aed1f891c00ac7439f9f870
+SIZE (urllib3-1.3.tar.gz) = 36660
diff --git a/net/py-urllib3/files/patch-MANIFEST.in b/net/py-urllib3/files/patch-MANIFEST.in
deleted file mode 100644
index ecd1949e06d8..000000000000
--- a/net/py-urllib3/files/patch-MANIFEST.in
+++ /dev/null
@@ -1,5 +0,0 @@
---- MANIFEST.in.orig	2012-02-06 15:59:04.000000000 +0000
-+++ MANIFEST.in	2012-02-07 14:04:08.000000000 +0000
-@@ -1 +1 @@
--include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt test-requirements.txt
-+include README.rst CHANGES.rst LICENSE.txt CONTRIBUTORS.txt
diff --git a/net/py-urllib3/files/patch-setup.py b/net/py-urllib3/files/patch-setup.py
index c65414067fa3..1e3684b3b5ce 100644
--- a/net/py-urllib3/files/patch-setup.py
+++ b/net/py-urllib3/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2012-01-30 00:14:40.000000000 +0000
-+++ setup.py	2012-02-07 13:49:58.000000000 +0000
-@@ -44,10 +44,10 @@
+--- setup.py.orig	2012-01-30 01:14:40.000000000 +0100
++++ setup.py	2012-03-26 17:32:14.000000000 +0200
+@@ -44,7 +44,7 @@
        author_email='andrey.petrov@shazow.net',
        url='http://urllib3.readthedocs.org/',
        license='MIT',
@@ -9,8 +9,3 @@
                  'urllib3.packages.ssl_match_hostname', 'urllib3.packages.mimetools_choose_boundary',
                  ],
        requires=requirements,
--      tests_require=tests_requirements,
--      test_suite='test',
-+      #tests_require=tests_requirements,
-+      #test_suite='test',
-       )
diff --git a/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt b/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt
deleted file mode 100644
index c0cc03e21d83..000000000000
--- a/net/py-urllib3/files/patch-urllib3.egg-info_SOURCES.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- urllib3.egg-info/SOURCES.txt.orig	2012-02-06 16:01:50.000000000 +0000
-+++ urllib3.egg-info/SOURCES.txt	2012-02-07 14:05:37.000000000 +0000
-@@ -5,17 +5,6 @@
- README.rst
- setup.cfg
- setup.py
--test-requirements.txt
--dummyserver/__init__.py
--dummyserver/handlers.py
--dummyserver/server.py
--dummyserver/testcase.py
--test/__init__.py
--test/benchmark.py
--test/test_collections.py
--test/test_connectionpool.py
--test/test_poolmanager.py
--test/test_response.py
- urllib3/__init__.py
- urllib3/_collections.py
- urllib3/connectionpool.py
-@@ -33,4 +22,4 @@
- urllib3/packages/__init__.py
- urllib3/packages/six.py
- urllib3/packages/mimetools_choose_boundary/__init__.py
--urllib3/packages/ssl_match_hostname/__init__.py
-\ No newline at end of file
-+urllib3/packages/ssl_match_hostname/__init__.py
diff --git a/net/py-urllib3/pkg-plist b/net/py-urllib3/pkg-plist
deleted file mode 100644
index 88d6b607b32a..000000000000
--- a/net/py-urllib3/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-@dirrm %%PYTHON_SITELIBDIR%%
-@dirrm %%PYTHON_LIBDIR%%