4 files changed, 34 insertions, 25 deletions

diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index c9467b9fb614..9ed7b82d4ad0 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rhodecode
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.3
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,6 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-past
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=1.0:${PORTSDIR}/www/py-pylons \
 		${PYTHON_PKGNAMEPREFIX}waitress>=0.8.1:${PORTSDIR}/www/py-waitress \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:${PORTSDIR}/www/py-beaker \
 		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:${PORTSDIR}/www/py-formencode \
 		${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:${PORTSDIR}/www/py-webhelpers \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:${PORTSDIR}/textproc/py-mako \
diff --git a/www/py-rhodecode/distinfo b/www/py-rhodecode/distinfo
index f9096a34bd8e..b803abe4f0d4 100644
--- a/www/py-rhodecode/distinfo
+++ b/www/py-rhodecode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (RhodeCode-1.5.1.tar.gz) = de47e1a995249069270f0d68a70d2a6a42ef82294f29947c7f30e571634aef77
-SIZE (RhodeCode-1.5.1.tar.gz) = 2436257
+SHA256 (RhodeCode-1.5.3.tar.gz) = 4024a28840bd9b9b2d2e47cdf225349e008745b5282e79af7a7357cb6b94330d
+SIZE (RhodeCode-1.5.3.tar.gz) = 2569673
diff --git a/www/py-rhodecode/files/patch-setup.py.in b/www/py-rhodecode/files/patch-setup.py
index c404bed611d3..a18e2828f145 100644
--- a/www/py-rhodecode/files/patch-setup.py.in
+++ b/www/py-rhodecode/files/patch-setup.py
@@ -1,5 +1,5 @@
 diff --git setup.py setup.py
-index 17eb71e..1939a2c 100644
+index 70b6aa5..6f2c869 100644
 --- setup.py
 +++ setup.py
 @@ -33,23 +33,23 @@ __platform__ = platform.system()
@@ -8,42 +8,44 @@ index 17eb71e..1939a2c 100644
  requirements = [
 -    "waitress==0.8.1",
 -    "webob==1.0.8",
-+    "waitress>=0.8.1",
-+    "webob>=1.0.8",
-     "Pylons==1.0.0",
+-    "Pylons==1.0.0",
 -    "Beaker==1.6.4",
-+    "Beaker>=1.6.4",
-     "WebHelpers==1.3",
-     "formencode==1.2.4",
+-    "WebHelpers==1.3",
+-    "formencode==1.2.4",
 -    "SQLAlchemy==0.7.9",
 -    "Mako==0.7.3",
++    "waitress>=0.8.1",
++    "webob>=1.0.8",
++    "Pylons>=1.0.0",
++    "Beaker>=1.6.4",
++    "WebHelpers>=1.3",
++    "formencode>=1.2.4",
 +    "SQLAlchemy>=0.7.9",
 +    "Mako>=0.7.3",
      "pygments>=1.5",
-     "whoosh>=2.4.0,<2.5",
-     "celery>=2.2.5,<2.3",
+-    "whoosh>=2.4.0,<2.5",
+-    "celery>=2.2.5,<2.3",
++    "whoosh>=2.4.0",
++    "celery>=2.2.5",
      "babel",
 -    "python-dateutil>=1.5.0,<2.0.0",
-+    "python-dateutil>=1.5.0, != 2.0",
++    "python-dateutil>=1.5.0",
      "dulwich>=0.8.7,<0.9.0",
 -    "markdown==2.2.1",
-+    "markdown>=2.2.1",
-     "docutils==0.8.1",
+-    "docutils==0.8.1",
 -    "simplejson==2.5.2",
++    "markdown>=2.2.1",
++    "docutils>=0.8.1",
 +    "simplejson>=2.5.2",
      "mock",
  ]
  
-@@ -60,10 +60,10 @@ if sys.version_info < (2, 7):
-     requirements.append("unittest2")
- 
- if is_windows:
--    requirements.append("mercurial==2.4.1")
-+    requirements.append("mercurial>=2.4.1")
+@@ -64,7 +64,7 @@ if is_windows:
+     requirements.append("mercurial==2.4.2")
  else:
      requirements.append("py-bcrypt")
--    requirements.append("mercurial==2.4.1")
-+    requirements.append("mercurial>=2.4.1")
+-    requirements.append("mercurial==2.4.2")
++    requirements.append("mercurial>=2.4.2")
  
  
  dependency_links = [
diff --git a/www/py-rhodecode/pkg-plist b/www/py-rhodecode/pkg-plist
index ce61c30bbed7..d7ccf6f1ad45 100644
--- a/www/py-rhodecode/pkg-plist
+++ b/www/py-rhodecode/pkg-plist
@@ -363,6 +363,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_2.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_2.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_2.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyo
@@ -390,6 +393,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/010_version_1_5_2.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/010_version_1_5_2.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/010_version_1_5_2.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/__init__.pyo
@@ -417,6 +423,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/indexers/daemon.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/indexers/daemon.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/indexers/daemon.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/ipaddr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/ipaddr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/ipaddr.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/markup_renderer.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/markup_renderer.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/markup_renderer.pyo
@@ -1788,7 +1797,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/index_base.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/journal/journal.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/journal/journal_data.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/journal/journal_page_repos.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/journal/public_journal.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/login.html
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/templates/password_reset.html