diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2014-07-26 23:01:46 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2014-07-26 23:01:46 +0000 |
| commit | 5a8836cb53e1c503b92f5e73c1a1919f22d2799c (patch) | |
| tree | 22712fc58059ea4c405af84dc6ae8ae94a99cabd /sys-cluster | |
| parent | drop build type hack in favor of build type none, add zeromq support (diff) | |
| download | gentoo-2-5a8836cb53e1c503b92f5e73c1a1919f22d2799c.tar.gz gentoo-2-5a8836cb53e1c503b92f5e73c1a1919f22d2799c.tar.bz2 gentoo-2-5a8836cb53e1c503b92f5e73c1a1919f22d2799c.zip | |
updating broken neutron deps
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/neutron/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/neutron/neutron-2014.1.1.ebuild | 25 | ||||
| -rw-r--r-- | sys-cluster/neutron/neutron-2014.1.9999.ebuild | 25 | ||||
| -rw-r--r-- | sys-cluster/neutron/neutron-9999.ebuild | 28 |
4 files changed, 59 insertions, 25 deletions
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog index 9d27e155a193..01a2453a4c7b 100644 --- a/sys-cluster/neutron/ChangeLog +++ b/sys-cluster/neutron/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/neutron # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.36 2014/07/17 09:17:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.37 2014/07/26 23:01:46 prometheanfire Exp $ + + 26 Jul 2014; Matthew Thode <prometheanfire@gentoo.org> + neutron-2014.1.1.ebuild, neutron-2014.1.9999.ebuild, neutron-9999.ebuild: + updating broken neutron deps 17 Jul 2014; Matthew Thode <prometheanfire@gentoo.org> +files/neutron-2014.1.1-CVE-2014-3555.patch, neutron-2014.1.1.ebuild: diff --git a/sys-cluster/neutron/neutron-2014.1.1.ebuild b/sys-cluster/neutron/neutron-2014.1.1.ebuild index 79284d28d3d5..23f7ec5ff3e3 100644 --- a/sys-cluster/neutron/neutron-2014.1.1.ebuild +++ b/sys-cluster/neutron/neutron-2014.1.1.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/sys-cluster/neutron/neutron-2014.1.1.ebuild,v 1.4 2014/07/17 09:17:53 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.1.ebuild,v 1.5 2014/07/26 23:01:46 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -53,12 +53,23 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}] >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}] <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] ) - sqlite? ( dev-db/sqlite ) + sqlite? ( + >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + dev-python/mysql-python + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) + postgres? ( + dev-python/psycopg:2 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}] diff --git a/sys-cluster/neutron/neutron-2014.1.9999.ebuild b/sys-cluster/neutron/neutron-2014.1.9999.ebuild index d8c3be52f51f..03f17195c5cf 100644 --- a/sys-cluster/neutron/neutron-2014.1.9999.ebuild +++ b/sys-cluster/neutron/neutron-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/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.4 2014/07/13 03:40:50 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.5 2014/07/26 23:01:46 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -54,12 +54,23 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}] >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}] <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] - sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] ) - mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] ) - postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] ) + sqlite? ( + >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + dev-python/mysql-python + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) + postgres? ( + dev-python/psycopg:2 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}] diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild index b022385ddac0..61842b79be13 100644 --- a/sys-cluster/neutron/neutron-9999.ebuild +++ b/sys-cluster/neutron/neutron-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/sys-cluster/neutron/neutron-9999.ebuild,v 1.11 2014/07/13 03:40:50 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.12 2014/07/26 23:01:44 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -51,15 +51,23 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] >=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}] <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] dev-python/pyudev[${PYTHON_USEDEP}] - sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}] - !=dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) - mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}] - !=dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) - postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}] - !=dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) + sqlite? ( + >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + dev-python/mysql-python + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) + postgres? ( + dev-python/psycopg:2 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) >=dev-python/webob-1.2[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}] <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}] |