- Update to 1.15

PR:		134934
Submitted by:	Matthew D. Fuller <fullermd@over-yonder.net> (maintainer)

6 files changed, 40 insertions, 16 deletions

diff --git a/devel/bazaar-ng/Makefile b/devel/bazaar-ng/Makefile
index 32a6dc3a1657..ad3845b9ef89 100644
--- a/devel/bazaar-ng/Makefile
+++ b/devel/bazaar-ng/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.14.1
+PORTVERSION=	1.15
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/26231325/
+MASTER_SITES=	https://launchpadlibrarian.net/27074733/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
+# Needed for 1.15 for files normally pre-built
+BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
+
 OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
 
 USE_PYTHON=	2.4+
diff --git a/devel/bazaar-ng/distinfo b/devel/bazaar-ng/distinfo
index 7aa9f481eefa..d31d47833241 100644
--- a/devel/bazaar-ng/distinfo
+++ b/devel/bazaar-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.14.1.tar.gz) = b04aa544fd3085af95a1cddf8645f1cd
-SHA256 (bzr-1.14.1.tar.gz) = 998ce4e260a0cc53a0619abb5b4bea5838f47e0f0cc0eae13dbfdd23c57146ab
-SIZE (bzr-1.14.1.tar.gz) = 4289604
+MD5 (bzr-1.15.tar.gz) = 3309f74f1655d7971ca8cc3d4c9e9dfb
+SHA256 (bzr-1.15.tar.gz) = 070c913a28365d14e774d27dd54fae32b0c6d50180f03cd09cb7a4e35e30edf4
+SIZE (bzr-1.15.tar.gz) = 4179567
diff --git a/devel/bazaar-ng/pkg-plist b/devel/bazaar-ng/pkg-plist
index 560aef3be84d..ad6aa4e86a79 100644
--- a/devel/bazaar-ng/pkg-plist
+++ b/devel/bazaar-ng/pkg-plist
@@ -663,6 +663,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.pyo
@@ -762,6 +765,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
@@ -1026,6 +1032,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyo
@@ -1314,9 +1326,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 32a6dc3a1657..ad3845b9ef89 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	bazaar-ng
-PORTVERSION=	1.14.1
+PORTVERSION=	1.15
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/26231325/
+MASTER_SITES=	https://launchpadlibrarian.net/27074733/
 DISTNAME=	bzr-${PORTVERSION}
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
+# Needed for 1.15 for files normally pre-built
+BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
+
 OPTIONS=	SFTP "Enable Paramiko for SFTP support" on
 
 USE_PYTHON=	2.4+
diff --git a/devel/bzr/distinfo b/devel/bzr/distinfo
index 7aa9f481eefa..d31d47833241 100644
--- a/devel/bzr/distinfo
+++ b/devel/bzr/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-1.14.1.tar.gz) = b04aa544fd3085af95a1cddf8645f1cd
-SHA256 (bzr-1.14.1.tar.gz) = 998ce4e260a0cc53a0619abb5b4bea5838f47e0f0cc0eae13dbfdd23c57146ab
-SIZE (bzr-1.14.1.tar.gz) = 4289604
+MD5 (bzr-1.15.tar.gz) = 3309f74f1655d7971ca8cc3d4c9e9dfb
+SHA256 (bzr-1.15.tar.gz) = 070c913a28365d14e774d27dd54fae32b0c6d50180f03cd09cb7a4e35e30edf4
+SIZE (bzr-1.15.tar.gz) = 4179567
diff --git a/devel/bzr/pkg-plist b/devel/bzr/pkg-plist
index 560aef3be84d..ad6aa4e86a79 100644
--- a/devel/bzr/pkg-plist
+++ b/devel/bzr/pkg-plist
@@ -663,6 +663,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dpush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_dump_btree.pyo
@@ -762,6 +765,9 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reconfigure.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_reference.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/blackbox/test_remerge.pyo
@@ -1026,6 +1032,12 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_pull.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_push.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/per_interbranch/test_update_revisions.pyo
@@ -1314,9 +1326,6 @@ bin/bzr
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.py
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_implementations.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.py
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/tests/test_http_response.pyo