5 files changed, 24 insertions, 75 deletions

diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index cb5eaf682d1b..57c99056c37d 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jira
-PORTVERSION=	0.13
-PORTREVISION=	2
+PORTVERSION=	0.16
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,15 +11,17 @@ DISTNAME=	jira-python-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 MAINTAINER=	akosiaris+ports@gmail.com
 COMMENT=	Library to ease use of the JIRA 5 REST APIs
 
+LICENSE=	BSD2CLAUSE
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>=1.0.0:${PORTSDIR}/www/py-requests1 \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.0:${PORTSDIR}/www/py-requests-oauthlib \
 		${PYTHON_PKGNAMEPREFIX}ipython>=0:${PORTSDIR}/devel/ipython \
 		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.1:${PORTSDIR}/security/py-tlslite \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2:${PORTSDIR}/textproc/py-sphinx
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	jira_python
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-jira/distinfo b/devel/py-jira/distinfo
index 7accb03c6fc3..2652db2f14fd 100644
--- a/devel/py-jira/distinfo
+++ b/devel/py-jira/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jira-python-0.13.tar.gz) = 995cdace8cac68fd3189e0c19ae7fe283cbbcbf6a3442cba15f2da9fc303014d
-SIZE (jira-python-0.13.tar.gz) = 31945
+SHA256 (jira-python-0.16.tar.gz) = 16692bc27470363e7ba2c46179e03a2b7c88c0ee48718238673f405ad0babfd2
+SIZE (jira-python-0.16.tar.gz) = 42573
diff --git a/devel/py-jira/files/patch-setup.py b/devel/py-jira/files/patch-setup.py
new file mode 100644
index 000000000000..55f84b4c6a0b
--- /dev/null
+++ b/devel/py-jira/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- setup.py.orig	2014-03-31 18:51:32.994913332 +0600
++++ setup.py	2014-03-31 18:51:50.178924965 +0600
+@@ -8,11 +8,6 @@
+     version=__version__,
+     packages=find_packages(),
+ 
+-    install_requires=['requests>=1.2.3',
+-                      'requests_oauthlib>=0.3.3',
+-                      'ipython>=0.13',
+-                      'tlslite>=0.4.4'],
+-    setup_requires=['sphinx', 'requests_oauthlib'],
+     extras_require={
+         'magic': ['filemagic>=1.6'],
+     },
diff --git a/devel/py-jira/files/patch-tlslite_requirement b/devel/py-jira/files/patch-tlslite_requirement
deleted file mode 100644
index fd14ed0e1ac1..000000000000
--- a/devel/py-jira/files/patch-tlslite_requirement
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru setup.py setup.py
---- setup.py 2013-04-10 09:30:59.000000000 +0300
-+++ setup.py 2013-07-12 10:37:27.000000000 +0300
-@@ -11,7 +11,7 @@
-     install_requires=['requests>=1.0.0',
-                       'requests_oauthlib>=0.3.0',
-                       'ipython>=0.13',
--                      'tlslite==0.4.1'],
-+                      'tlslite>=0.4.1'],
-     extras_require={
-         'magic': ['python-magic>=0.4.2'],
-     },
diff --git a/devel/py-jira/pkg-plist b/devel/py-jira/pkg-plist
deleted file mode 100644
index 2406dc322032..000000000000
--- a/devel/py-jira/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/auth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/auth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/auth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/hook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/hook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth/hook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/resources.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/resources.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/resources.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/version.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/version.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/tests.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/tests.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/tests.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/jirashell.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/jirashell.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools/jirashell.pyo
-bin/jirashell
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tools
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages/requests_oauth
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira/packages
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/jira
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%