now with more kilo

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 408 insertions, 15 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 51fe1753f662..61946a35d65c 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.65 2015/04/13 03:02:24 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.66 2015/04/30 19:00:26 prometheanfire Exp $
+
+*glance-2015.1.0 (30 Apr 2015)
+*glance-2015.1.9999 (30 Apr 2015)
+
+  30 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2015.1.0.ebuild, +glance-2015.1.9999.ebuild:
+  now with more kilo
 
   13 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2014.2.3.ebuild,
   glance-2014.2.9999.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index bd4aab0eea96..c3f2cd78381c 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -6,24 +6,27 @@ AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af5794
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1e234f0834d36d108690ce85be4 SHA512 c7e0365fec7553a12b3f326f3f7fe69323bc9c20653aa6a972226ffee48cd54f4850cb3ee591b78f6932c6f2808cc260b7bc336cdb2f0a80852a05bf56dd717a WHIRLPOOL 96d1e7e5fc5061b0b87bfeb5371788d79c860d69ae638d61a616f74e930492b4c6dfe2206d427462cffb4c537f6ba99ac8d4bd81907cebc400084918e8500efa
+DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
 EBUILD glance-2014.2.3.ebuild 6038 SHA256 e7ee0d58799a7aa1693dfeb1fef22fde87472ffd9c52971b54b760aa75f5cf4e SHA512 9a8728458833616bea0b31004e2ffc4492837b92972b72d4d4b766def8c892f13c3be5b6ab6a89edf6500604f3899cb34eca3faf07a93b0bf34694b4cc754ebc WHIRLPOOL e128f5beb5143134645bbbd8b54dde48ae3f46ed6e320d7f44157dbc72e5e2c4a9f428dcf6646a3cfb75109be1f43fb58e9eefedea56271f01f8e2c8c18cfef5
 EBUILD glance-2014.2.9999.ebuild 6048 SHA256 a3967e4b9f55d8a6d656bdaa811fca1c56005795598ef4d190e49ef3ecff5359 SHA512 50a27b93d296528974a41c11db2b948d66aab8aa5d4c9cf2480eca5632f67efeb666341b6416d166300e6b76ab380956d51a931011d4ee6d04277b88e976f9a0 WHIRLPOOL 5757379469b4104a5d31453702c7aff0ea5bde32de446114d89fce09bdda971636b195a0ee953615dbd31b137f68c1d7464855f6bf2f73d2564d40e2156c14d9
-MISC ChangeLog 13136 SHA256 7373881ee8b6ec6f0b4da63a536249fce20bdc74a2626dde839996ccad2fde37 SHA512 25b4a88e3f65111cce9e5b43db31efe1a215506b48ce5afb27dee651fe31269cd3eb9a0143e8512177cceb45e0e63418e8bc230bc81297b45df75001a091d9a2 WHIRLPOOL cd87f12758b9ce3e62ec05d86f0f79d98f2f14e68fb872d281c44039e941c8585f8a14c343f90be67db932641509f1c5bbefb2853bf64e953d3df4852317123c
+EBUILD glance-2015.1.0.ebuild 6841 SHA256 fa035a6054110101c39d9d8e463017920bb093b4cf04dee140cfa3949a118896 SHA512 a67d7901dca5a83e41eac907dd8b9522dccde29f669b78e40d056e14eebe1f0fa35989ae316ef6bc570282832e1bea830a82b925b03a85c8a264ec8ea4cc1af9 WHIRLPOOL 92947cae71dd7d6595412be412fcc881b8bb36c08b31cbdf0c778b0c269f2c8aedca2199411206c6cfcaaaab60519042f4b555cf4ba873edd3f23b9762ded303
+EBUILD glance-2015.1.9999.ebuild 6856 SHA256 86da2f5c14faa39728d4c2935b440986e5b10dd2a44ad51b6c825c3fd53a5a52 SHA512 89eb1d3ff088e6912a47e19add02c9fc13a719a369031256ef69dafe55c83f488509e6d3998878d2b04942a7414e23e3353dbbb570430284fa6bcd8c14556c2c WHIRLPOOL 6cf03be33fdf9eb8a845f29af9111de6110dc6a521a244356e2ff3404374afb90e812bda6d8989b66f8b1188eb15fbe6a2a3836a9ed77ec2efcff10afe695218
+MISC ChangeLog 13336 SHA256 5fdbfb4b2f043a2379de30f63baa36df16b8949a36f8e6ae54d758e8eb605896 SHA512 e5ebb854bc6e43a52ec3d93b8490254c1c73c53bb23b7a7f3bd1d7dc6fbe585a14d77c68042d34084db20ffda740c75feccee067bac324a8375973e6700f92cf WHIRLPOOL c0244b6db5d426a6ef65c9e43471546994b7e37aa289b60b7d22b1544c29c83bc8373a5718127bec118d7b6a5d156d23f60877dcd611ca599d7295d637600f6e
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKzHKAAoJEGSje+quGaToSHIQANnZEvdl+1JuqXpruaSOEFbC
-eT5spY2tMUVxO1CmGfBMJgBpm4eqlGqUfQcuUJTQZdswJm319fTrCSy+dZcMkGvK
-lvHZ2O8GC8OoJ8BFnx2CREl9QvSf+HHHoIuFyGPX+5MhbG1+9Z5Eu8NRUqaLNnG0
-ilNI1z8x44OIEG5g0y0B4dbTYOYgZhmAviVFAXdwoko/b9ds+JnNAyLpH2hU9xm7
-aZUIWwuv5znn9L9y32hzYTHtshmsJtchZVxWaSw7P7kQpEK7I7mzA3yMHVs94sIx
-XjofnkBUgwh/ykgRJ3H438LeOEXdcu95a8+X7xsBmXx/OKTyCuSLbW77CdjeSwlV
-1pwjxB9rtIOsbsJ2J1EcYgqAstMxTobcjdbcM5BLcsF5EjehMWAQcxWR1TvUDmEg
-jsCH5AyoIn+/IfV+FW6/N8ubOd3es7MrrP+2UR2FokIPKfKwh55LD5NT3EXy8qDq
-At13ncs7tVgbGCu/UYtweNuByorTMJMjL7qTgrwV2/Q+eDSdwJt5oSt60VhHLVY3
-Rok1h3Ad0pK0jiFmgatnCpScLENtx+o9T5rwjXwQ8GuvmENYUW1XQNjRrE+zYLxC
-+88CyNKO4iM+eBvgXyEG/rFeYLOuhRfD2JuwKziAzJDjWO1Dy09sNxpB1Tcr6ETq
-+b7QutxhGqKyp3XhMiYP
-=Nf7n
+iQIcBAEBCAAGBQJVQnvhAAoJEGSje+quGaTof7gQAILqdt2Ugj7Wfkt1LmVn+bKR
+GD4E3NuKcsZa2qlWFGiKor9gulMLrptxWyNSNzanvcz2X2AvXckm3FuJhp+E++bR
+KIExjwQ3OYDujaUkPlR92rx3SyKqs9IhkQfgE3HeOOmeNE18Dk9tiaNxP9UtBgYf
+FKj57ORImKzgu2ZMpUSg88MiDcnu5v9RLlzkf7aXf0J3H/bbm5dCPhXMVHlh3i6M
+c7fn30LbBf+jMpzeYBJ8KeCbi69bTAJAWIi3pDWS5RH4TRoheOVIWkJAleNZAj+g
+xFVhOYCU9vXwQGhtkeXAMsIzfQ+Rq86MIZgPsPW6Q/WsG+gCkFR+1S/KGLOQp2hV
+3RRtXuXu4NM8yY6AkpjNpF8T806IOQQrQd5zW8v/vo/z00cg8i6q2JgWyZVQbA5Z
+IU4ikoVO2LwWKjslCsvSF/5DbWQwggnW7eKr7chX6COuZedRB8Z800iYMX8KwhLI
+FnvUe9cjksEoN5vlNaq+cdiXhErR9sbM8Q7T14piGs8G33CwW81s49WjBTKVfd4C
+Fdn6GCuUrTGzyDesfAYmefmY2JNsNuG8S1ou+i7f2/pGEnjoLAcMzytFtQ9z5um8
+kJxFc8Cqr2dvyGdHGgIdVR7EMZ6gjjmnTfgII52MFMEzesYvWzzhiJjQki4dOM86
+z8JOJoAkwrur86o8LRpy
+=MCpG
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2015.1.0.ebuild b/app-admin/glance/glance-2015.1.0.ebuild
new file mode 100644
index 000000000000..b06724628f77
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0.ebuild,v 1.1 2015/04/30 19:00:26 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			~dev-python/Babel-1.3[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+		)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	dev-python/ordereddict[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	swift? (
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins "etc/glance-api-paste.ini"
+	doins "etc/glance-api.conf"
+	doins "etc/glance-cache.conf"
+	doins "etc/glance-registry-paste.ini"
+	doins "etc/glance-registry.conf"
+	doins "etc/glance-scrubber.conf"
+	doins "etc/logging.cnf.sample"
+	doins "etc/policy.json"
+	doins "etc/schema-image.json"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild
new file mode 100644
index 000000000000..8e169eaa5daa
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.9999.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.9999.ebuild,v 1.1 2015/04/30 19:00:26 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/kilo"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			~dev-python/Babel-1.3[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+		)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	dev-python/ordereddict[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	swift? (
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins "etc/glance-api-paste.ini"
+	doins "etc/glance-api.conf"
+	doins "etc/glance-cache.conf"
+	doins "etc/glance-registry-paste.ini"
+	doins "etc/glance-registry.conf"
+	doins "etc/glance-scrubber.conf"
+	doins "etc/logging.cnf.sample"
+	doins "etc/policy.json"
+	doins "etc/schema-image.json"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}