summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-apps/horizon/ChangeLog6
-rw-r--r--www-apps/horizon/horizon-2014.1.9999.ebuild3
-rw-r--r--www-apps/horizon/horizon-9999.ebuild78
3 files changed, 57 insertions, 30 deletions
diff --git a/www-apps/horizon/ChangeLog b/www-apps/horizon/ChangeLog
index 792a176efd6d..25d5cb5751fc 100644
--- a/www-apps/horizon/ChangeLog
+++ b/www-apps/horizon/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/horizon
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/ChangeLog,v 1.30 2014/07/08 16:09:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/ChangeLog,v 1.31 2014/07/08 16:16:37 prometheanfire Exp $
+
+ 08 Jul 2014; Matthew Thode <prometheanfire@gentoo.org>
+ horizon-2014.1.1-r1.ebuild, horizon-2014.1.9999.ebuild, horizon-9999.ebuild:
+ updating deps in git ebuilds
*horizon-2014.1.1-r1 (08 Jul 2014)
diff --git a/www-apps/horizon/horizon-2014.1.9999.ebuild b/www-apps/horizon/horizon-2014.1.9999.ebuild
index 3a4afca49767..8359827d3dfc 100644
--- a/www-apps/horizon/horizon-2014.1.9999.ebuild
+++ b/www-apps/horizon/horizon-2014.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/horizon-2014.1.9999.ebuild,v 1.1 2014/04/28 03:28:37 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/horizon-2014.1.9999.ebuild,v 1.2 2014/07/08 16:16:37 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -42,6 +42,7 @@ RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
>=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
>=dev-python/django-openstack-auth-1.1.4[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
>=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
diff --git a/www-apps/horizon/horizon-9999.ebuild b/www-apps/horizon/horizon-9999.ebuild
index 5dbb83673458..c8b309ccd21c 100644
--- a/www-apps/horizon/horizon-9999.ebuild
+++ b/www-apps/horizon/horizon-9999.ebuild
@@ -1,43 +1,65 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/horizon-9999.ebuild,v 1.7 2014/03/27 22:06:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/horizon-9999.ebuild,v 1.8 2014/07/08 16:16:37 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 git-2
-DESCRIPTION="Horizon is a Django-based project aimed at providing a complete
-OpenStack Dashboard."
+DESCRIPTION="A Django-based project aimed at providing a complete OpenStack Dashboard."
HOMEPAGE="https://launchpad.net/horizon"
EGIT_REPO_URI="https://github.com/openstack/horizon.git"
-EGIT_BRANCH="master"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
+IUSE="test"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
- <dev-python/d2to1-0.3[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.5[${PYTHON_USEDEP}]
- <dev-python/pbr-0.6[${PYTHON_USEDEP}]
- >=dev-python/django-1.5[${PYTHON_USEDEP}]
- <dev-python/django-1.6[${PYTHON_USEDEP}]
- dev-python/django-compressor[${PYTHON_USEDEP}]
- >=dev-python/django-openstack-auth-1.0.8[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- >=dev-python/python-cinderclient-1.0.2[${PYTHON_USEDEP}]
- <dev-python/python-cinderclient-2.0.0[${PYTHON_USEDEP}]
- <dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
- >=dev-python/python-heatclient-0.2.2[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/python-novaclient-2.12.0[${PYTHON_USEDEP}]
- <dev-python/python-novaclient-3[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
- <dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/python-swiftclient-1.1[${PYTHON_USEDEP}]
- <dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/lockfile[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.9[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ dev-python/django-nose[${PYTHON_USEDEP}]
+ ~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose-exclude[${PYTHON_USEDEP}]
+ >=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
+ dev-python/nosexcover[${PYTHON_USEDEP}]
+ >=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
+ dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+ )"
+RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
+ <dev-python/django-1.7[${PYTHON_USEDEP}]
+ >=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
+ >=dev-python/django-openstack-auth-1.1.4[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+ >=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
+ >=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
+ >=dev-python/python-ceilometerclient-1.0.6[${PYTHON_USEDEP}]
+ >=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/python-heatclient-0.2.3[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
+ <dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
+ >=dev-python/python-troveclient-1.0.3[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2010h[${PYTHON_USEDEP}]
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+src_test() {
+ ./run_tests.sh -N --coverage
+}