update of glance to 2013.1 (grizzly)

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

3 files changed, 93 insertions, 15 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index ff9a30f5e16a..be288febbd1e 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2013/03/26 04:49:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.5 2013/04/10 16:41:21 prometheanfire Exp $
+
+*glance-2013.1 (10 Apr 2013)
+
+  10 Apr 2013; Matthew Thode <prometheanfire@gentoo.org> +glance-2013.1.ebuild:
+  update of glance to 2013.1 (grizzly)
 
 *glance-2012.2.3-r2 (26 Mar 2013)
 
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index f5a3cb98f531..f3e58ed48c0d 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -5,24 +5,26 @@ AUX glance-folsom-3-CVE-2013-1840.patch 1069 SHA256 a6379989a860975b07cf34e7cfaa
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 1206 SHA256 23c091ad32832b9a522518676427a2f98bc7dfa826c0bb67a0f9befaa615cafe SHA512 cd0a13ee2a7134cb2917cf2d5579f63c88a6d04769a1370ef5bdc1cfd8ebe7ad2986c501b976ae9752688c177c7a71457bae79cd3e89f84dbf9d5ac259f4099a WHIRLPOOL e59dd3a7a11b3bd74abfbc5e29bc84ce4ff3381ae411359d0d097e3123487d2eded8aefbc54f0a7feae06ecea0861e16a1cb0bd7fcb467a7c714e9c65afb7dd1
 DIST glance-2012.2.3.tar.gz 638592 SHA256 9431c6cc0d95eb75994b9cd63c9d2c7829edc158f091ca0b0e9208d657183eec SHA512 1df5e9ccba5d1ae2c6ea1fe13dbc867af49ff15ea732f9a6c051dc723a94656c9f312a00e23a84fb44ab50477e65437060b5cbf818b4690cd1f431fa287bb01f WHIRLPOOL 0742259a9b6a9ac6d78b699aae48a7b962482daa0cb414f48c371d4f29bbd8e8ac45858c4dce080f9766b614f612837c831ce6158168d04760fadf7b663d7748
+DIST glance-2013.1.tar.gz 716226 SHA256 f4deee125ee6729daee5315c6aacd9e265c3015692a62ae6aefeadbd3fef7f70 SHA512 9dc8c99b2c26e8b260e94d020fb4401c123c2360c0ad1f616e994b0a562898030d22cb0c0020531132cad5b51beaebc68cc70aaf87d2814498b1dbd58fbd3931 WHIRLPOOL 1899eeb00c02f3f353a7720e2d17f7dd5873909d2a214b250d7325c82ae2d610e5432caeb603ddaabe2178552964650b3b98489fc74bd0136e9e9438a26d9bb7
 EBUILD glance-2012.2.3-r2.ebuild 2236 SHA256 5026555a6ceaaa80029803e7759b772f4c68f8c26f80172674c909b6f3a35f3a SHA512 28e766c95be486178e8455a4e1ca5a28c9d673dab2d806c21d8e9f4c7740c22de54fa46190e8731c0a2438c5af2884078bdda06616680d1ad721f76c9caa9bde WHIRLPOOL 981a45893af893cbd9693187661ac93509bd976ddf30b1028178360203dd4309bb063d026564889aadc2ef8e63b616da9972925de7c9100dd3c74dfc8f2dc752
+EBUILD glance-2013.1.ebuild 2444 SHA256 2d00b6096cb0a118bb7859b975a826558e5652692e92c0cb2ed6867eb2171771 SHA512 907b07a9731a4508db18d864c420810e2bc7ff2f3eb1cd2e75736022afdd8205ecb6a17c13486c1d607d1a7f4c346adc83f5ab3ac0b132b007454ff5d74c5010 WHIRLPOOL 538084fa8ce3c6da14c2b630a7558b67d4ae4011bda4a45327bc8debadb9bf9a5e44611bcccbffaf3fbda4db48b6adc5241a95d17b9c842ea7fbeb7203e90749
 EBUILD glance-9999.ebuild 2142 SHA256 93e355cd08a53ee9207ff8be720f65500700e254a0e9b4808b8951f2dd0fa16e SHA512 4030208c6c72c42efa57269e3604976f42b4715ba3fe20fceafe925cc20746b3bff3564d85388fea6b4af67384a13241d965d635f9b3e2b07e3cccb1ff10b9fc WHIRLPOOL bdaf62271f572bf238401b7e8bba240a1d536fbfa40716306ae865cc4b00a007ca6ebf22f9e267bd6a7046ae37d0a7a18a228800976065ffdf6169cbcc361a01
-MISC ChangeLog 1123 SHA256 ccc63aae93b06974dad0b7b30376f84d8367df5b5ea9a7519ba93fffc4c58b23 SHA512 f90c27edd01928494c93c71c7901a9d4e11dc838a62d83b82f8bc12caa269c2ca903bde27d6d75e1863f6740c3e45f1843090e956fe772dc3a151a304cb919f1 WHIRLPOOL 6fb7cf64ca243ef6272d822efb005e201b49511497d6f32c1461b39b0121124757b6ad9cc2471d085219b66f8c8359167c3c70555dbddc9fecb57c89a0620363
+MISC ChangeLog 1273 SHA256 a5427f6fa77d6b331ba6aaf5c7780d3eb580ec44be5929f4545aded04d23ba26 SHA512 3dd5de49ffb848fd8e9a029256580cbb90fb43658f9f11d30a8277b09927b2d3d43b6bffbfb349615801c7e9229307441c7e59d75124a9e7cea9792bbb44d8f2 WHIRLPOOL f22fb4f374c37e741c04ce616eaac4694e1f8cf59a5262c01d83aebdb39517e10ccd71a8344ad201358b50cfde9e6c5e89e47ce3deea940703d58551140ebc3f
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRUSkGAAoJECRx6z5ArFrDfn8QAL8j3E1BdEF+1IxSM2kv7QBq
-9R8RFPv1x51T3lZr3QJdK28fYWHsmSXKWczl3KL6PG5OBzruNjlLsRCGy4Q7rerw
-4TFv108BY/P8sg0g6cAjddyO81hKOoh5172bi/nH+UBpfg6tqIf5uvXvb9eC1YS/
-TSJ2zQzjwDcJ4sckkhrLZYVnk6jU8KIwBr5JzgFJsA5G224I6RLzm990phxCWXVG
-QRSMeMH7o6mg1l1XgAIK1JCgid71B514PHA1rpDNUB/+E/4EEaKlN46sDkp+v0tC
-AWjQaPDO38aMnRttlqOIWVYW005uxM/fMOIyQI8KWcRxE3/4QykoFtmvSQURM8ef
-t2FvroTSs4XmidpY+w8na7Ij5Vevm5y8wB87RVBcgWz6NZ65eTf28sO/beKI2GwI
-qsxg69vkX6F9/c74zEsBHoAzMfmvKrisIDwXvCkcWiEmDgNrdwPbBC+6G0kC/yck
-l7vO5wMH1rHSw2Ut5HhoQllVHhFbmac1tIGug6CNy0bfeM5GHEw5bSqSGh01y5jk
-jkv7/xG2DiRd9ViTZdduGTTru1oC4fhK6CWp3gJujzE6VOp5tTsdiQ94iCFFGfQL
-x7Fn8wsJ2j3rxOs4rQgedAzf/7wWh+Y4CqI2Zi1ugJBblprJhiSfG8YQekZg5+ow
-AW7SS6CuaufPCiOFmT/N
-=gIXG
+iQIcBAEBCAAGBQJRZZZdAAoJECRx6z5ArFrDwFYQAJXwK1YvTNq1Izv/i3H+xeZ5
+r+7Pp/YtdCbW9Y5E9mD/gEDsOTWzu3s0TEH/8y3wsr1mZijeduXMDToav22qqhJl
+Gcr93VjpJevPFw8paxV78lVUSFvB7Cz16Nq37yl1U4Lv/7cYFmrWJShk8gQLhQE2
+v6u5/2jl3MXF7God0T/LQwYVFcp0WSjaHRY/Sn2GeID1YlD8CD/xC08mtsqt44Zi
+cS/nFhJkelGtT31OmQ2BQbzLTI/dK3zspbGor/oVKGCxcrn1jaOAOYf9f5UEW/5C
+yPtzYHjQodgIwIzq9p3tZlxN4wmn7G4eRK+utDCYSOyh8wfSmxoZ1d+ZY1XbXluq
+QRVIOK69VLuqO//YWhU5mOF8NV5DWwhfyKOiqaMtpZspnIDs0zv4iZpUMoNgoHYW
+aEKR1Ku8kgRsd3nkHkGW/JXaxcDvyp40FXlK5ijDIKqNhxgFYK9DqdTpLKw2oy+S
+PIeFjBSug5PEWVa6ykSPxa5ZrfsHrdquTurFARKOPqcz7KPAt5Yu2HfcBY4lWKz2
+O+o8T/wPh/70SYMym2Rkt0aArSv+o9mj5IFw8WQ2Qy21gKdO5lpioQg16NiHsfOd
+/yd74X7LkhCOFf3NfVx50A1mtxl/QGlrKWfmA1QuqAP+hAEq1mkvyUTVzNbiZTeS
+oamJRvJJ4+KZFOaT0jq2
+=tCQ6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2013.1.ebuild b/app-admin/glance/glance-2013.1.ebuild
new file mode 100644
index 000000000000..915b88ac3aca
--- /dev/null
+++ b/app-admin/glance/glance-2013.1.ebuild
@@ -0,0 +1,71 @@
+# 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.1.ebuild,v 1.1 2013/04/10 16:41:21 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/boto
+	dev-python/anyjson[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/kombu[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/pycrypto
+	>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
+	dev-python/python-glanceclient[${PYTHON_USEDEP}]
+	dev-python/routes[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	swift? (
+		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
+		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
+	)
+	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
+	          <=dev-python/sqlalchemy-0.7.9[sqlite] )
+	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
+	         <=dev-python/sqlalchemy-0.7.9[mysql] )
+	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
+	            <=dev-python/sqlalchemy-0.7.9[postgres] )
+	ldap? ( dev-python/python-ldap )"
+
+PATCHES=(
+)
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/glance.confd" glance
+	newinitd "${FILESDIR}/glance.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/nova /var/lock/nova
+	#removed because it conflicts with glanceclient, which we install in rdepend
+	rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
+}