Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/glance: glance-2013.1.2-r2.ebuild glance-2013.1.9999.ebuild glance-9999.ebuild ChangeLog
Date: Fri, 02 Aug 2013 18:17:35
Message-Id: 20130802181727.879012171C@flycatcher.gentoo.org
1 prometheanfire 13/08/02 18:17:27
2
3 Modified: glance-9999.ebuild ChangeLog
4 Added: glance-2013.1.2-r2.ebuild glance-2013.1.9999.ebuild
5 Log:
6 9999 version of stable/grizlly for glance
7
8 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
9
10 Revision Changes Path
11 1.4 app-admin/glance/glance-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-9999.ebuild?r1=1.3&r2=1.4
16
17 Index: glance-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- glance-9999.ebuild 11 Apr 2013 07:25:24 -0000 1.3
24 +++ glance-9999.ebuild 2 Aug 2013 18:17:27 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.3 2013/04/11 07:25:24 prometheanfire Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.4 2013/08/02 18:17:27 prometheanfire Exp $
30
31 EAPI=5
32 PYTHON_COMPAT=( python2_7 )
33 @@ -11,6 +11,7 @@
34 virtual machine images with Openstack"
35 HOMEPAGE="https://launchpad.net/glance"
36 EGIT_REPO_URI="https://github.com/openstack/glance.git"
37 +EGIT_BRANCH="master"
38
39 LICENSE="Apache-2.0"
40 SLOT="0"
41 @@ -26,7 +27,8 @@
42 >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
43 dev-python/httplib2[${PYTHON_USEDEP}]
44 dev-python/iso8601[${PYTHON_USEDEP}]
45 - dev-python/jsonschema[${PYTHON_USEDEP}]
46 + >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
47 + <dev-python/jsonschema-1[${PYTHON_USEDEP}]
48 dev-python/kombu[${PYTHON_USEDEP}]
49 dev-python/lxml[${PYTHON_USEDEP}]
50 >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
51 @@ -45,11 +47,11 @@
52 <dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
53 )
54 sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
55 - <=dev-python/sqlalchemy-0.7.9[sqlite] )
56 + <=dev-python/sqlalchemy-0.8[sqlite] )
57 mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
58 - <=dev-python/sqlalchemy-0.7.9[mysql] )
59 + <=dev-python/sqlalchemy-0.8[mysql] )
60 postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
61 - <=dev-python/sqlalchemy-0.7.9[postgres] )
62 + <=dev-python/sqlalchemy-0.8[postgres] )
63 ldap? ( dev-python/python-ldap )"
64
65 python_install() {
66 @@ -62,7 +64,20 @@
67 done
68
69 diropts -m 0750
70 - dodir /var/run/glance /var/log/nova /var/lock/nova
71 - #removed because it conflicts with glanceclient, which we install in rdepend
72 - rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
73 + dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
74 + keepdir /etc/glance
75 + keepdir /var/log/glance
76 + keepdir /var/lib/glance/images
77 + keepdir /var/lib/glance/scrubber
78 + insinto /etc/glance
79 +
80 + doins "etc/glance-api-paste.ini"
81 + doins "etc/glance-api.conf"
82 + doins "etc/glance-cache.conf"
83 + doins "etc/glance-registry-paste.ini"
84 + doins "etc/glance-registry.conf"
85 + doins "etc/glance-scrubber.conf"
86 + doins "etc/logging.cnf.sample"
87 + doins "etc/policy.json"
88 + doins "etc/schema-image.json"
89 }
90
91
92
93 1.13 app-admin/glance/ChangeLog
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.13&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.13&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?r1=1.12&r2=1.13
98
99 Index: ChangeLog
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v
102 retrieving revision 1.12
103 retrieving revision 1.13
104 diff -u -r1.12 -r1.13
105 --- ChangeLog 2 Jul 2013 15:33:35 -0000 1.12
106 +++ ChangeLog 2 Aug 2013 18:17:27 -0000 1.13
107 @@ -1,6 +1,13 @@
108 # ChangeLog for app-admin/glance
109 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
110 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.12 2013/07/02 15:33:35 prometheanfire Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.13 2013/08/02 18:17:27 prometheanfire Exp $
112 +
113 +*glance-2013.1.2-r2 (02 Aug 2013)
114 +*glance-2013.1.9999 (02 Aug 2013)
115 +
116 + 02 Aug 2013; Matthew Thode <prometheanfire@g.o>
117 + +glance-2013.1.2-r2.ebuild, +glance-2013.1.9999.ebuild, glance-9999.ebuild:
118 + 9999 version of stable/grizlly for glance
119
120 *glance-2012.2.4-r3 (02 Jul 2013)
121 *glance-2013.1.2-r3 (02 Jul 2013)
122
123
124
125 1.3 app-admin/glance/glance-2013.1.2-r2.ebuild
126
127 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild?rev=1.3&view=markup
128 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild?rev=1.3&content-type=text/plain
129 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild?r1=1.2&r2=1.3
130
131
132
133
134 1.1 app-admin/glance/glance-2013.1.9999.ebuild
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild?rev=1.1&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild?rev=1.1&content-type=text/plain
138
139 Index: glance-2013.1.9999.ebuild
140 ===================================================================
141 # Copyright 1999-2013 Gentoo Foundation
142 # Distributed under the terms of the GNU General Public License v2
143 # $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.1 2013/08/02 18:17:27 prometheanfire Exp $
144
145 EAPI=5
146 PYTHON_COMPAT=( python2_7 )
147
148 inherit git-2 distutils-r1
149
150 DESCRIPTION="Provides services for discovering, registering, and retrieving
151 virtual machine images with Openstack"
152 HOMEPAGE="https://launchpad.net/glance"
153 EGIT_REPO_URI="https://github.com/openstack/glance.git"
154 EGIT_BRANCH="stable/grizzly"
155
156 LICENSE="Apache-2.0"
157 SLOT="0"
158 KEYWORDS="~amd64 ~x86"
159 IUSE="ldap mysql postgres +sqlite +swift"
160 REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
161
162 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
163 RDEPEND="${DEPEND}
164 dev-python/boto
165 dev-python/anyjson[${PYTHON_USEDEP}]
166 >=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
167 >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
168 dev-python/httplib2[${PYTHON_USEDEP}]
169 dev-python/iso8601[${PYTHON_USEDEP}]
170 >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
171 <dev-python/jsonschema-1[${PYTHON_USEDEP}]
172 dev-python/kombu[${PYTHON_USEDEP}]
173 dev-python/lxml[${PYTHON_USEDEP}]
174 >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
175 dev-python/passlib[${PYTHON_USEDEP}]
176 dev-python/paste[${PYTHON_USEDEP}]
177 dev-python/pastedeploy[${PYTHON_USEDEP}]
178 dev-python/pycrypto
179 >=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
180 dev-python/python-glanceclient[${PYTHON_USEDEP}]
181 dev-python/routes[${PYTHON_USEDEP}]
182 >=dev-python/sqlalchemy-migrate-0.7
183 >=dev-python/webob-1.2[${PYTHON_USEDEP}]
184 virtual/python-argparse[${PYTHON_USEDEP}]
185 swift? (
186 >=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
187 <dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
188 )
189 sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
190 <=dev-python/sqlalchemy-0.8[sqlite] )
191 mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
192 <=dev-python/sqlalchemy-0.8[mysql] )
193 postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
194 <=dev-python/sqlalchemy-0.8[postgres] )
195 ldap? ( dev-python/python-ldap )"
196
197 python_install() {
198 distutils-r1_python_install
199 newconfd "${FILESDIR}/glance.confd" glance
200 newinitd "${FILESDIR}/glance.initd" glance
201
202 for function in api registry scrubber; do
203 dosym /etc/init.d/glance /etc/init.d/glance-${function}
204 done
205
206 diropts -m 0750
207 dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
208 keepdir /etc/glance
209 keepdir /var/log/glance
210 keepdir /var/lib/glance/images
211 keepdir /var/lib/glance/scrubber
212 insinto /etc/glance
213
214 doins "etc/glance-api-paste.ini"
215 doins "etc/glance-api.conf"
216 doins "etc/glance-cache.conf"
217 doins "etc/glance-registry-paste.ini"
218 doins "etc/glance-registry.conf"
219 doins "etc/glance-scrubber.conf"
220 doins "etc/logging.cnf.sample"
221 doins "etc/policy.json"
222 doins "etc/schema-image.json"
223 }
Report Message
Find on MARC Find on Google Groups