bump; ebuild based on graaf's verion from his overlay with additions to the doc builds, thx graaf. Remove old ebuilds and patch, see Bug 522472

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 32 insertions, 143 deletions

diff --git a/dev-util/reviewboard/ChangeLog b/dev-util/reviewboard/ChangeLog
index 288527e4a744..85951667b61f 100644
--- a/dev-util/reviewboard/ChangeLog
+++ b/dev-util/reviewboard/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/reviewboard
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/ChangeLog,v 1.10 2014/08/22 10:26:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/ChangeLog,v 1.11 2014/09/21 09:24:45 idella4 Exp $
+
+*reviewboard-1.7.28 (21 Sep 2014)
+
+  21 Sep 2014; Ian Delaney <idella4@gentoo.org> +files/1.7.28-docs.patch,
+  +reviewboard-1.7.28.ebuild, -files/docs.patch, -reviewboard-1.7.7.1-r1.ebuild,
+  -reviewboard-1.7.7.1.ebuild:
+  bump; ebuild based on graaf's verion from his overlay with additions to the
+  doc builds, thx graaf. Remove old ebuilds and patch, see Bug 522472
 
   22 Aug 2014; Ian Delaney <idella4@gentoo.org> -reviewboard-1.7.12.ebuild:
   remove old unviable version
diff --git a/dev-util/reviewboard/Manifest b/dev-util/reviewboard/Manifest
index 49e25a0e2f9a..3b8cb446b16c 100644
--- a/dev-util/reviewboard/Manifest
+++ b/dev-util/reviewboard/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.7.28-docs.patch 2031 SHA256 a5c1ed5a041136b77bd5de703fe13a7e2d30dc398e2d660e88540b885bf79990 SHA512 91570e7d044ca413a6d8b383754f081d650403afe66c76278c9920ad7d551c333bf8047098d1cd53869a0c3be1a953e8bfc7ef509c3ff08ffe898e8a40c9985a WHIRLPOOL e51d7865ab7b5a3b8bb47a9e5ee0fa1b19da5bfa743a3555a374605fdbb11e246c459543feb0521526f10a268cb607790f71838fcbd76a365fe7df5151128e10
 AUX CVE-2013-2209-sec.patch 3367 SHA256 18ae4b1f4af8c8872497b8efdcf304d13bcb2192d2c2857a293dd32edaf0d0d0 SHA512 e12d36ee960134f3233647e6cc3e9f7c134282e88259c920e346823e578e29bcc21062c417e12c0f13c3c1cc4310e8e18ce6be740dfaa2219c335c2e28e832a6 WHIRLPOOL fe391e1f110973c9cf81442454e33c1cc5086b5f93389315aebc4f478220202149d314e0d6b07d7f43537b1b69f81b957800b98df9fc1587623bbae068403279
-AUX docs.patch 2031 SHA256 b013c83c282756b78adc128b2e2a26914eb3b64f3940e0091cc0cff54d618e5f SHA512 3a99f5cb314e8a315325c02bc3f5fa8c700baf958564dc46c64d4715229cadef5512014409b3647c8adf7fc20c29c2de0fd1f1ff58867c719d70b16fcf3cf2dd WHIRLPOOL 433ff7949062eda6bf8d0c5d5a6967b78b00a806082775e528f5cb9a3c3e76a22f30bb32f7ba991df28275722eb6d69832a3e8ca62844b8d8150dbfd7928b8c8
-DIST ReviewBoard-1.7.7.1.tar.gz 2946656 SHA256 4e3306cd55e572179cdd1157e50a3e3bb4b0b8847bc14d0bafdb7fd7fe696208 SHA512 3896be4ee0dcd6817f21e326ef4a55ed04d1101939971c92f88d8e3501b8133a793816bd94c93475fb59528a4c37f1c405691a98bf896bc0df3fc0c8c08df02a WHIRLPOOL b288af9765a6df271ffc1e51f9fadca91f604a5166dd6f44a7c28c3ecea8e63676d96e5a84f5e1a18331fdab2cbb799dbb3d33ac28e9bd37c7af66fed17070ac
-EBUILD reviewboard-1.7.7.1-r1.ebuild 3846 SHA256 317cece5eded099143b9cad2728e92706797b7a0aac29d106cc402b090a7acb7 SHA512 81adfac592a6af7cba8dc12c10321197da20f27c7445fe6df33e0a45424fc9401523ef223ffcebab70e85ba8657b521df65bdb70bb9408840999e45df480d652 WHIRLPOOL aabc71d795b5daafed465e99b948edde39b64689c6d56a7c225f7a896a77cdb082d80aef8485fe0dd3446e29f6ad1f0e5089ea3bc1d3810560e3cabefbb4397a
-EBUILD reviewboard-1.7.7.1.ebuild 3765 SHA256 8f4be71279b6c85c48dd82c29dc84abf2f60c1963a5b4dac94b4889b86f6efaf SHA512 a2727ca06c0eb82c745ec5e3990ac93fc2e4d5d1798ddfad9f7712a82bae5c33690f58dc52d2815dc21b5ecc89cbcdaa9c4a303552ff8425c699646768896db8 WHIRLPOOL 21c47afc9ee97c8d43574fd02f49a9a3b0e6326bfdaa4dc95e1306ec8482dd6615e389523cad6b99af69c916d26ab2b822cb658b9a7cce7ab1e6a9fa4c46868c
-MISC ChangeLog 1710 SHA256 da6f9f41d661803d425248d5c5d3a8dd54e2b9d1caf9887f31ffa816a9da2eb4 SHA512 9043cbad971c5742adaead8db723657b8b746290bc6c72c9b7fdeb6f6ad1ba464ddcf2a9da774d782b0f06f64af41509aebebfe8b92b5b8c2e0703bb877a09fb WHIRLPOOL f062dcf09661999f0a2ee2cbbde1377fe5730dfa4793b3c59842b3846b402154064527de9de29960712a0133a5751369f69a592728e4fa0fdff49131fc14a41d
+DIST ReviewBoard-1.7.28.tar.gz 2957387 SHA256 69a976e69c1e805b23aa78f43fc1954599b7513dff1d1cfd0bafa6112a946931 SHA512 9e97b56b68da6c06f713d98c70dda321ea3fdf6f26986b4272fbb392c1c633f1ce44170bb515e8b685813b69a0ae8ada9f392b5e776793222dd25c3b7d4fa704 WHIRLPOOL 51a731117b9a84b9f8e1cd785511da516bf4d7216f7f08a8ba83d200af94a235d994d53c630b26f430d28f1ce4a7ca8a47d83b87c241bc4b1f5469f7668cc03d
+EBUILD reviewboard-1.7.28.ebuild 3785 SHA256 6091e2241c89a1f5c6bdd5cf253821e0fd77d53c425c653289eea08d143c7b0a SHA512 f6c74cd629cd51ed2e2e45644223335874e1669c7526573d7e1a20d4ba1de435444acbb34c0528d1a90d9b3e83ed76c8a2fef943d307e73f687726909c62f06b WHIRLPOOL 8d960bacd7c4007c1d01206d4f855f480de18bc88b5ec8287cc80a197f0dba8714f67a0d01b86e05134a33ea468745df77a23344cfa2b4c3b4448281d0fb2d32
+MISC ChangeLog 2080 SHA256 4f513ab7024d5e3897fb6819e260104b5fe78bd83f1a7908fc7227456f06bdde SHA512 bf6d41c3b0c666c075b3b1241ff01798693a653dd86e247cf3aaf68e598cddd697564fa4ce46e8ab745d0365fc4d751f6a3660d6742b926e35ebaedefae579c0 WHIRLPOOL c3a0a901365103767e9fc0d309935c4ee514a9a5819cec4e45884271d37e6501e6312538bebcc31fb197ab8c00a6d634b04a8eda98a05befbd0ab0b2dbde3dc9
 MISC metadata.xml 462 SHA256 d8d96800a4de27dd2ecd60879f9d2cdd035baf3512d214f11d9c002b22ca7aba SHA512 dc032d4b08177d4d39b4b415ffe96806b003674f4352870aa3f008822a65ece18e8448a9a5cda8b398f9595728c0e80ade6680d83ae20a2bcc11b909bf47d1cd WHIRLPOOL 5d6cb94e8ca4f3189fa9a945c12a9eee8542f7050e48e643e9056a377e036da54c2ffc10d77ae61b9ea753023e84ac0978ef12f90574ed1099530eeecd9a1f66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlP3GMMACgkQso7CE7gHKw0FzACguH36r1wBblXETr58ua2JIy85
-b30AnRkKgZINekp86eWw8rU/FiszYxbc
-=soDJ
+iEYEAREIAAYFAlQelykACgkQso7CE7gHKw0ilwCgrq/tk198W1yvYn4SDa3xyDxJ
+yaMAnRagsBrKGGGL/t2vOlLg82cHKANq
+=SmZq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/reviewboard/files/docs.patch b/dev-util/reviewboard/files/1.7.28-docs.patch
index 8292a86355ac..99741d2e40d0 100644
--- a/dev-util/reviewboard/files/docs.patch
+++ b/dev-util/reviewboard/files/1.7.28-docs.patch
@@ -49,5 +49,4 @@ ReviewBoard-1.7.7.1/docs/releasenotes/conf.py
 -
 -
 -# Example configuration for intersphinx: refer to the Python standard library.
--intersphinx_mapping = {'http://www.reviewboard.org/docs/manual/dev': None}
-
+-intersphinx_mapping = {'https://www.reviewboard.org/docs/manual/dev': None}
diff --git a/dev-util/reviewboard/reviewboard-1.7.7.1-r1.ebuild b/dev-util/reviewboard/reviewboard-1.7.28.ebuild
index ee142bd9316e..aa75ae0b5e6b 100644
--- a/dev-util/reviewboard/reviewboard-1.7.7.1-r1.ebuild
+++ b/dev-util/reviewboard/reviewboard-1.7.28.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/reviewboard-1.7.7.1-r1.ebuild,v 1.3 2014/07/04 19:46:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/reviewboard-1.7.28.ebuild,v 1.1 2014/09/21 09:24:45 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -19,19 +19,21 @@ LICENSE="MIT"
 SLOT="0"
 S=${WORKDIR}/${MY_PN}-${PV}
 
-RDEPEND=">=dev-python/django-1.4.3[${PYTHON_USEDEP},sqlite]
+RDEPEND=">=dev-python/django-1.4.14[${PYTHON_USEDEP},sqlite]
 	<dev-python/django-1.5[${PYTHON_USEDEP},sqlite]
-	>=dev-python/django-evolution-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/django-evolution-0.6.9[${PYTHON_USEDEP}]
+	<dev-python/django-evolution-0.7[${PYTHON_USEDEP}]
 	>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
-	>=dev-python/Djblets-0.7.7[${PYTHON_USEDEP}]
+	>=dev-python/Djblets-0.7.31[${PYTHON_USEDEP}]
+	<dev-python/Djblets-0.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/markdown-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.7.6[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:python-2
 	dev-python/python-memcached[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012h[${PYTHON_USEDEP}]
 	dev-python/recaptcha-client[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -42,16 +44,12 @@ REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )"
 # Tests mostly access the inet and when run mostly fail
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}"/docs.patch
-	"${FILESDIR}"/CVE-2013-2209-sec.patch )
+PATCHES=( "${FILESDIR}"/${PV}-docs.patch )
 
 python_prepare_all() {
-	# Higher versions do not support python-2.5, while reviewboard upstream
-	# still does. We do not support python-2.5 for this package as it will
-	# prevent downgrades for some of our dependencies.
-	sed -i setup.py \
-		-e "s/python-dateutil==1.5/python-dateutil/" \
-		-e "s/django-pipeline>=1.2.24,<1.3/django-pipeline>=1.2.24/" || die
+	# Running uglify is a problem right now, so skip this step. Rather
+	# have newer versions that compacted javascript.
+	sed -e "s/'pipeline.compressors.uglifyjs.UglifyJSCompressor'/None/" -i reviewboard/settings.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -67,6 +65,7 @@ python_compile_all() {
 			einfo;einfo "$msg manual"
 			DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html
 		fi
+
 		if use codebase; then
 			pushd docs/codebase &> /dev/null
 			ln -sf ../../contrib/internal/conf/settings_local.py .
diff --git a/dev-util/reviewboard/reviewboard-1.7.7.1.ebuild b/dev-util/reviewboard/reviewboard-1.7.7.1.ebuild
deleted file mode 100644
index ea382c8d23ec..000000000000
--- a/dev-util/reviewboard/reviewboard-1.7.7.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/reviewboard/reviewboard-1.7.7.1.ebuild,v 1.1 2013/06/16 16:02:06 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_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}/1.7/${MY_PN}-${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="codebase doc manual rnotes test"
-
-LICENSE="MIT"
-SLOT="0"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-RDEPEND=">=dev-python/django-1.4.3[${PYTHON_USEDEP}]
-	<dev-python/django-1.5[${PYTHON_USEDEP}]
-	>=dev-python/django-evolution-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
-	>=dev-python/Djblets-0.7.7[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.7.6[${PYTHON_USEDEP}]
-	>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-memcached[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/recaptcha-client[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="doc? ( || ( codebase manual rnotes ) )"
-# Tests mostly access the inet and when run mostly fail
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-python_prepare_all() {
-	# Higher versions do not support python-2.5, while reviewboard upstream
-	# still does. We do not support python-2.5 for this package as it will
-	# prevent downgrades for some of our dependencies.
-	sed -i setup.py \
-		-e "s/python-dateutil==1.5/python-dateutil/" \
-		-e "s/django-pipeline>=1.2.24,<1.3/django-pipeline>=1.2.24/" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# See http://code.google.com/p/reviewboard/issues/ #3009
-	# until build of manual can find and use ROOT_URLCONF, only possible build path for manual
-	# requires sacrificing the resources section, all of which call on ROOT_URLCONF
-	local msg="Generating docs for"
-	if use doc; then
-		if use manual; then
-			rm -rf docs/manual/webapi//2.0/resources/ || die
-			einfo;einfo "$msg manual"
-			DJANGO_SETTINGS_MODULE="django.conf" emake -C docs/manual html
-		fi
-		if use codebase; then
-			pushd docs/codebase &> /dev/null
-			ln -sf ../../contrib/internal/conf/settings_local.py .
-			popd &> /dev/null
-			einfo;einfo "$msg codebase"
-			emake -C docs/codebase html
-		fi
-
-		if use rnotes; then
-			einfo;einfo "$msg release notes"
-			emake -C docs/releasenotes html
-		fi
-	fi
-}
-
-python_test() {
-	pushd ${PN} > /dev/null
-	ln -sf contrib/internal/conf/settings_local.py .
-	"${PYTHON}" manage.py test || die
-}
-
-python_install_all() {
-	if use doc; then
-		if use manual; then
-			insinto /usr/share/doc/${PF}/manual
-			doins -r docs/manual/_build/html/
-		fi
-		if use codebase; then
-			insinto /usr/share/doc/${PF}/codebase
-			doins -r docs/codebase/_build/html/
-		fi
-		if use rnotes; then
-			insinto /usr/share/doc/${PF}/release_notes
-			doins -r docs/releasenotes/_build/html/
-		fi
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "You must install any VCS tool you wish ${PN} to support."
-	elog "dev-util/cvs, dev-vcs/git, dev-vcs/mercurial or dev-util/subversion."
-	elog
-	elog "Enable the mysql, postgres or sqlite USEflag on dev-python/django"
-	elog "to use the corresponding database backend."
-	elog
-	elog "For speed and responsiveness, consider installing net-misc/memcached"
-	elog "and dev-python/python-memcached"
-}