[gentoo-commits] dev/graaff:master commit in: dev-util/reviewboard/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     27d9b67aa355b45bca78bd4ba1eae4f8718a3339
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sat Nov 21 08:30:17 2015 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 08:30:17 2015 +0000
URL:        https://gitweb.gentoo.org/dev/graaff.git/commit/?id=27d9b67a

dev-util/reviewboard: add 2.0.20

I can't seem to migrate directly to 2.5.1.1 so hopefully
doing this in two steps works better.

Also change markdown depependency to a version still
supported in Gentoo.

Package-Manager: portage-2.2.20.1

 dev-util/reviewboard/Manifest                                |  1 +
 ...{reviewboard-2.5.1.1.ebuild => reviewboard-2.0.20.ebuild} | 12 ++++++++----
 dev-util/reviewboard/reviewboard-2.5.1.1.ebuild              |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest
index 4cad3b1..6293046 100644
--- a/dev-util/reviewboard/Manifest
+++ b/dev-util/reviewboard/Manifest
@@ -1 +1,2 @@
+DIST ReviewBoard-2.0.20.tar.gz 8360873 SHA256 cb83d5aabcb2a685043cd2dd516b833e6f73d3777fcbd0402a3c347f8ac75196 SHA512 9a6f9e1bc3a59264f365b4ce057cb4961e8ead03cc11735e909e280109a5a30a9ec12d16eb2679e7b8e83abe92fc7caacfa82ca1d31ee487e54c6891880ed7aa WHIRLPOOL ead1ff1af5e0d6239822c498e8b87044a3fb93b5a7f8fe94588f0e2f8b9766f13f88dbfe7c4b25d482bc7618621105871c9d60f1193f32b6450b9cdf0a2f441e
 DIST ReviewBoard-2.5.1.1.tar.gz 12734864 SHA256 96cbef615fc654dbb4220257ecc49d6e569b183fe92c2150fcd676ac84f7a892 SHA512 920bf14817b442df973e493707668e39ede1365dc528a67811009e142ac325c5f89b0e176397b2ef6a68c2558c237258c09ec333a814c1c1a9f2e6a8b95b05cf WHIRLPOOL 0059a96e3dbe7ae59cda3b7d4034ecb21adc6b8911fdd211e54ce542ff2ec6d3e7bfc9cbfd694f10494ff55db012685c51bd634fb85e2e55d3987799b340a414

diff --git a/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild b/dev-util/reviewboard/reviewboard-2.0.20.ebuild
similarity index 91%
copy from dev-util/reviewboard/reviewboard-2.5.1.1.ebuild
copy to dev-util/reviewboard/reviewboard-2.0.20.ebuild
index 134f326..66ba44f 100644
--- a/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild
+++ b/dev-util/reviewboard/reviewboard-2.0.20.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_PN="ReviewBoard"
 DESCRIPTION="A web-based code review tool that offers developers an easy way to handle code reviews"
 HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/2.5/${MY_PN}-${PV}.tar.gz"
+SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/2.0/${MY_PN}-${PV}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="codebase doc manual rnotes test"
 
@@ -25,11 +25,12 @@ RDEPEND=">=dev-python/django-1.6.11.1[${PYTHON_USEDEP},sqlite]
 	<dev-python/django-evolution-0.8[${PYTHON_USEDEP}]
 	>=dev-python/django-haystack-2.3.1[${PYTHON_USEDEP}]
 	dev-python/django-multiselectfield[${PYTHON_USEDEP}]
-	>=dev-python/Djblets-0.9[${PYTHON_USEDEP}]
-	<dev-python/Djblets-0.10[${PYTHON_USEDEP}]
+	>=dev-python/Djblets-0.8.22[${PYTHON_USEDEP}]
+	<dev-python/Djblets-0.9[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/markdown-2.7[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.12[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
@@ -56,6 +57,9 @@ python_prepare_all() {
 	# # The version bordering of python-dateutil is long out of date and wrong since end of March 2012!
 	sed -e 's:==1.5:>=1.5:' -i setup.py || die
 
+	# Use newer markdown version still available
+	sed -i -e '/markdown/ s/2.4/2.6/g' setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 

diff --git a/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild b/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild
index 134f326..c9e615a 100644
--- a/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild
+++ b/dev-util/reviewboard/reviewboard-2.5.1.1.ebuild
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/django-1.6.11.1[${PYTHON_USEDEP},sqlite]
 	<dev-python/Djblets-0.10[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/markdown-2.7[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.12[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
@@ -56,6 +57,9 @@ python_prepare_all() {
 	# # The version bordering of python-dateutil is long out of date and wrong since end of March 2012!
 	sed -e 's:==1.5:>=1.5:' -i setup.py || die
 
+	# Use newer markdown version still available
+	sed -i -e '/markdown/ s/2.4/2.6/g' setup.py || die
+
 	distutils-r1_python_prepare_all
 }