diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2014-05-11 11:51:25 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2014-05-11 11:51:25 +0000 |
| commit | e2871b846c8120b9eff8f5b9ac74fd0a3a598b36 (patch) | |
| tree | a523a9b13b6c8c256a094ef900714c7fed550eab /app-admin | |
| parent | Bug 509192 (diff) | |
| download | gentoo-2-e2871b846c8120b9eff8f5b9ac74fd0a3a598b36.tar.gz gentoo-2-e2871b846c8120b9eff8f5b9ac74fd0a3a598b36.tar.bz2 gentoo-2-e2871b846c8120b9eff8f5b9ac74fd0a3a598b36.zip | |
slot conflicts. bugs 508002, 509192
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key E1DF22D5)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/glance/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/glance/files/glance.initd | 6 | ||||
| -rw-r--r-- | app-admin/glance/glance-2014.1-r1.ebuild (renamed from app-admin/glance/glance-2014.1.ebuild) | 16 |
3 files changed, 18 insertions, 12 deletions
diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog index 100aee53f78e..ee59dcc63da6 100644 --- a/app-admin/glance/ChangeLog +++ b/app-admin/glance/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/glance # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.39 2014/04/28 01:54:37 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.40 2014/05/11 11:51:25 vadimk Exp $ + +*glance-2014.1-r1 (11 May 2014) + + 11 May 2014; Vadim Kuznetsov vadimk@gentoo.org +glance-2014.1-r1.ebuild, + -glance-2014.1.ebuild, files/glance.initd: + slot conflicts. bugs 508002, 509192 *glance-2014.1.9999 (28 Apr 2014) *glance-2014.1 (28 Apr 2014) diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd index 73e97fbd3f75..f12276808aac 100644 --- a/app-admin/glance/files/glance.initd +++ b/app-admin/glance/files/glance.initd @@ -1,9 +1,9 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.6 2014/03/18 17:43:33 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.7 2014/05/11 11:51:25 vadimk Exp $ -description="Starts ${SVCNAME} service for OpenStack" +description="Starts ${SVCNAME} service for OpenStack" command=/usr/bin/${SVCNAME} command_background=yes @@ -17,6 +17,6 @@ depend() { } start_pre() { - checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0664 ${GLANCE_RUN:-/var/run/glance} + checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance} } diff --git a/app-admin/glance/glance-2014.1.ebuild b/app-admin/glance/glance-2014.1-r1.ebuild index 820c499a6da3..ee04ff2ecaae 100644 --- a/app-admin/glance/glance-2014.1.ebuild +++ b/app-admin/glance/glance-2014.1-r1.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/app-admin/glance/glance-2014.1.ebuild,v 1.1 2014/04/28 01:54:37 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.1-r1.ebuild,v 1.1 2014/05/11 11:51:25 vadimk Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -45,12 +45,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - sqlite? ( >=dev-python/sqlalchemy-0.7.8[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.99[mysql,${PYTHON_USEDEP}] ) - postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[postgres,${PYTHON_USEDEP}] ) + >=dev-python/sqlalchemy-0.7.8[${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 ) >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}] >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] @@ -76,7 +75,8 @@ RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}] >=dev-python/six-1.5.2[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]" + >=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}] + dev-python/oslo-vmware[${PYTHON_USEDEP}] " PATCHES=( "${FILESDIR}"/${PN}-2013.2-sphinx_mapping.patch ) |