update of glance to havana, just for swift

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 115 insertions, 16 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index b7e7573cdaf5..6e80341321b6 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.20 2013/09/27 00:47:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.21 2013/10/22 18:24:34 prometheanfire Exp $
+
+*glance-2013.2.9999 (22 Oct 2013)
+
+  22 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.2.9999.ebuild:
+  update of glance to havana, just for swift
 
   27 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
   glance-2013.1.3-r2.ebuild, glance-2013.1.9999.ebuild, glance-9999.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 76d339f17aee..f41e380c9bd5 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -11,23 +11,24 @@ DIST glance-2013.1.3.tar.gz 721788 SHA256 642782416d790dfcb6d5bb85626dd5d48784ba
 EBUILD glance-2012.2.4-r4.ebuild 3037 SHA256 f398b95d3fc89f70c9df63ba2203418c663b592321a5d8f83b746761afd88901 SHA512 0a03ab6e6eb3dc71f361d8271773c2b8c3bbcd4f779e479bdda4f54dd9ed0b05e4cfa1446758bef269dae6bcf3acd6ecfb646c01c7dd56cac5b7522950d4819c WHIRLPOOL 9e27596c1019e48c69affc0f76a13b288f6357483c2ea1bd9e16966be45b1a26b09e3495cbb51f804e9cc1524cdb4b5e102f6c546e8f1980899f3997227abfe4
 EBUILD glance-2013.1.3-r2.ebuild 3149 SHA256 7ce743f5002f55eed47f61aa961f2623e545feaf4af1eec611f73c40572385bf SHA512 a4eaeea4d2e4a047382bac79c6c2a84f085b2f86fab13927bb35afdee240e854c39cbed9d24b8a348c4ac5c623a7393284802ae24255db803c2835822cc5e704 WHIRLPOOL 921a6b2d11c1af146fa31dab067aa220851161a5a42f7af0b54a6f9e9e592ac9ee3bfeaf6cc2394ccfa618a8a2fc1ea0a5b50143c22111d4e42ccda719a22ba7
 EBUILD glance-2013.1.9999.ebuild 3108 SHA256 d5c2be3191fe463325739e687b6c1bcd8a3a0368a74070e505e0af99d7426c47 SHA512 9184b27115d249582d04a8685f5d9388613456007ab672dc91fc466f17cacb44a2b7f12367ad32300b745ed1ae59e6649348e6eedc87b4f82bf7e14325665727 WHIRLPOOL e770e0e34c1cf1a18241027bf6dc65b20cf44ce082aec50aa46b1414e03fcb0edbdf4a5329db4b045afa1ee6d3dc67939113d84c97036bf2404baf18a0c5d567
+EBUILD glance-2013.2.9999.ebuild 3351 SHA256 17cbe108f9a74fa4c6fc1d5ba9ca37c493d3a10139728586f9635be80c47bc3f SHA512 3002f270763e9fbc76495d3dca1ac739885f0393831cd4c5c2a2df19cccafda53f730698d978a8f2d7f14ca46fecd2af30d8aabbddcad75ec47bacb3ae88ece9 WHIRLPOOL b87c4e8b150035ab4d8162ee7fc315671a58f1f7338e9de4856c42603de5791bf7e534940f887132bd9d039c3f582d1c3256a084d645d9c9538c0d7dc9ee0533
 EBUILD glance-9999.ebuild 3031 SHA256 70283c6d4784f1a524210e9fb994f5e2ab14a133581f509f833253a2fc07243f SHA512 a79d8ae559f26eba446c25ff48c58cc524bb399862dae936fed91c129facde0da906019458b586102ad5d13fe025eddf2d2a19b57a74e9395b5e6ecf33f05637 WHIRLPOOL a8ed52c906b9d840b312b39f458780aed6f42b1b0dd6a67fe5e27b04a5926bb5565ceed7ba425eceae5c43aceb3335272714d58ad64f5121e35db5d132db476b
-MISC ChangeLog 4574 SHA256 de68e6fb0ce26d8f23558d3c98503bdf130bed8041ddc5e33cc044edeac9b0ba SHA512 e691fa61796973c0ca431c418d1358029aa6e1cac072b0f944e19c439f63728332540ebcaa5e58d1ceaaf7bd569304965f4d55c89363c34c83e5a22ec0c5845b WHIRLPOOL 8ee1e0662aebf7b559c5c19e801ab52f2dfd220074ffad920a62c8bf77dd3e15c069fc3d2ae81304f03931a2a1ed9f728f8285e9088e62382adc362fea22c47f
+MISC ChangeLog 4742 SHA256 e75e2b7d104a84a1a44258c19d31d3dd82f164a326f8e8f994c1230227d1f82a SHA512 e5f8590c63ee4e74143c2182212abd1b0c072fd5d5d980c60dd1f9284dc1fb14b5395570681ee545c2aab6179cf494a18cd17daa3b27d178d0762b9479711c6c WHIRLPOOL 0842ec4d52c5db21973f4742a31d588d6af535622ba199a0c8ceec256245999cf786fb3c575ba87f55073870144ecab9a91af31a7270827be40a59e2099484a0
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSRNX3AAoJECRx6z5ArFrDBuUP/jvjhK+ZnQpZ415idySsJXVI
-Jh6WBv01h0FEGPI5TPYhB8uPJybaWdXVZNIoRlKU9uNIlVlwJ5/WPYkSJBEJX0uN
-4IIO4M6W0nbdYPAbF+MNbHX8dA8pD49HJBTf/01j22zmiMTokqsqX0FTCGqA2OKA
-TlhjDefUOwdcFo+xSjfHFvY1wG/F5/7zUjMLJxRcYrjRLMQquXBTAHDa/Yd1vRWd
-2ZB8NkxaPiIQc3kk2Lk0n4VKjMlTO/iJdanUHPgNrwyJagUguZPm0NuTVA5Qx6yQ
-d9ie+ncvh3GNhbd7C7BW3sEAevINzSrmKkXp/P93FcAhU2UM/bNR64AA79XincJ6
-SjuC7gPX/ewr4ml2EMhPLuE3/zVnePklb0A5cF0BoaQxBApVHiOhKtZWAJCBX8mR
-wJe7JYGaIhdL5Q3x2PgWEp2byf+w98u0Qz3dfQGm0pkUIkkFGBc0BdviZhOxmw4V
-EGA2OSbAeU4YMGQojzO/jEAOdeSeA5H3cAd0fCVzyQ9ga3uiY2W9r1YBwqjUL69w
-suf4PcArQ9Io33hTYzIyVibnD4whKbfj+QpHjfnD4uF0mIACa3ewT6B4OJe2tA+n
-4MozrLUoO1t8NY1OJ8Kh0CpkVqzpxus24xv+Ru7vEJic84DAGcMFuGdtVNuCMaKo
-fVhRmUe3JPe2jmXnloFO
-=nuOP
+iQIcBAEBCAAGBQJSZsNeAAoJECRx6z5ArFrDRiEP/36SnPXhcT5fpCGmHqKt8pQU
+n7BGG4hn5gncG9XyQflQdqYbNk9vyek9yY0pY0CH4gB+VtmEr4CYpRk+JtrRuq0/
+reax3EFXdZY2GuB38Zmnu+O1rssQQpIqEq0WcZJlgiyKHOcTnFI8qal/ZrslDUxy
+X4teSz48kNS+XJi014rhlN8rFETSLTYiviZDkSSuMSNgZBcdeO1/DVFjuvtKdZ3J
+O7U21BYdzAwww/S4c4DLqX3wncxZJtlKCvd1522DuibAnYVoyCoMD3ntSGqaz0jK
+kpIeRFZxfhksaY449TG8bttWpGMy40XYIQyjDtWS9UVIxWAujfMmN9dVsTT+sEDK
+PHD84BnOARDnKSDBWK3Gh2MLzQ0bQJam1XWVxqyDsKCjFsOlg9wvWIhrLVRW+o++
+rNuqizZRMGkx6eqmrl0/7y7hJiByie9abHCfx7g2mlJJf8+8EpTbqxAUgL6QG6Px
+MGic7vW+nbVflJ5hfYPmSOetYpJG2ANnLbKfgkoAfzs0ph1itfhxkFseQa4TjHN2
+U8hL/kjx+emqZ+6T2LOAZFVMFsrF5sB3GqDobMlZsyt/RUD0AQInLPdfUrT5AzZP
+MDLeunuoG8DCLw8x8+oLe8y/AsAm3vxe7TIPHurybyhiis6H1U7kk5o6TUJN6Fz/
+yLRfBij2K/GPsu90x/Hu
+=AYcl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2013.2.9999.ebuild b/app-admin/glance/glance-2013.2.9999.ebuild
new file mode 100644
index 000000000000..14cb82841eff
--- /dev/null
+++ b/app-admin/glance/glance-2013.2.9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.1 2013/10/22 18:24:34 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-2 distutils-r1
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/havana"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.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="${DEPEND}
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.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}] )
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		swift? (
+			>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
+			<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
+		)
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/glance.confd" glance
+	newinitd "${FILESDIR}/glance-2.initd" glance
+
+	for function in api registry scrubber; do
+		dosym /etc/init.d/glance /etc/init.d/glance-${function}
+	done
+
+	diropts -m 0750
+	dodir /var/run/glance /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
+
+	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"
+}