BUMP!

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

3 files changed, 162 insertions, 15 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 01b1e82ac5e0..70a620e4825b 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.30 2014/02/13 04:36:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.31 2014/02/20 21:00:22 prometheanfire Exp $
+
+*glance-2013.2.2 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.2.2.ebuild:
+  BUMP!
 
 *glance-2013.2.1-r1 (13 Feb 2014)
 
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 27bb89893c43..5d7d5355b449 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -8,27 +8,29 @@ AUX glance.initd 2504 SHA256 8000f93dfacd93fa5c4a6d07090bc3c27b63912b6ae55a026e2
 AUX havana-1-CVE-2014-1948.patch 1340 SHA256 12e12e016154dd5c8ca6c1e7093f46024a3f4e3c48d06492e0dd4dc76dfe7dbb SHA512 3976077da2c00c6e847c67e36c37e646a9186e0d123b7fbfb2e5adac61ffcf3c8a6f36f6e935b5a1c94ef519d8062db0ab7e14bb32da031c75a9270d9a400a41 WHIRLPOOL 53b735fe5ff6028cae7d506d67933fa232b45a1ef7096f8680fa410d48f36d3260493f5936aab7f48875cf0817b88bb5bb7d0d0b81cd6cb716c077a9f3b0c550
 DIST glance-2013.1.4.tar.gz 724110 SHA256 dfb8070a12bbf5761db1c55d21db4772fe81ed903d57cf991618e5224cbdcd67 SHA512 31c6c4ba0e777fcd345fe24d32eab548f8e9756764051d8b3c50d4d54404c902473760a0dc1158e8b6b42a0b81e14ae6a31d03bb07d4254fcb4960b05dd747a9 WHIRLPOOL 770f782f539b0ac465c00e726552f4b7fc8824c4a9da1a94ef4103ef56ce17ff1c2ccc75140b71c9f4d3d875885f169d3c1c6d761fed7ff691c83484b86de74f
 DIST glance-2013.2.1.tar.gz 1616541 SHA256 f04eb070a862c0d14bdd94204a6f17f4a813dbeacc1978dffb53752c360731aa SHA512 42a30004d7677c946216bd934712094f585d1a98c8e4d7a4b51a14af93eac3e251bd7ef16fa9d9915f3c2f75974969306439742aaeaa64bf3d983ab458531ee5 WHIRLPOOL b76513207e56f3ceb18976b901a79fd5fbff2a9779df1179e79dc5d10049d3b100124e61b55e26ef47f5df54f03a1122752939e4b028d7873b0b0b771aabe9ac
+DIST glance-2013.2.2.tar.gz 1333129 SHA256 311805e1df5005ee554871f0096845c966af3cec41cbcf00f1a7e906582b05e1 SHA512 4516b0ce08be63aa22ffaeb7b0f2bf7ef5e6637d9058461337bdaffb18c5876637cef5240068954f40c72a8021969d755a678c4d7172606592acce1e731594ae WHIRLPOOL a8c6ad325f3e78786762b5717dcee5878540cc0a06f4428cd47657ee85d93db5c2a3d7b47dc758e88e174c9ea141aba48bef902b52671b4d415c5f2d9463da2a
 EBUILD glance-2013.1.4.ebuild 3146 SHA256 1ea12e958ef036f33d7479bf594251c189d922af33cf4ddb0441ad429193bd96 SHA512 b8fa8788dbd8274fa43fa0dfe88fc8f43f832a82913d4816174bf771639eeb907659faad3315981706bac41b7143b75c5c3ae50d5ad8794d4fd9c88c932ae99a WHIRLPOOL 6a7826ce32d9ba75111c58d130366602d706f406ad0cfd4fa17f42694d73c985cf0c19ffb3f26f78fad58cf88f101456bd6e4614c29f54609e620c313f19626d
 EBUILD glance-2013.1.9999.ebuild 3106 SHA256 fc2b671e94bc47402a2e1037c68ca57791ff573b52b56b0b98b972b7e757ad8c SHA512 5a0a9517f6538c8824c18dcd3add74003c6f06d5277b11e6b62606c17428ecef6db7d6f35e0b7f5cdc29573cc08d3e702da0e20394c0e72f1b0bbea28fed852e WHIRLPOOL d6b1811af8f6ce1dfb190815c7f8b4ea6f23e9b8091939b816b4657c293dcd9e8652ae5443b5777c009c6ba9bf310c5b4be6665d64c966f0b5673138e7011070
 EBUILD glance-2013.2.1-r1.ebuild 5244 SHA256 4557b4ba949f54fe9f3079bc1b2eded9bd0cc914f536f7d6a797e846837dafcd SHA512 ce7b13fc86cf13f43e40fc847d95f8c6011a0e7b694ec9a08c7000d2c1234da958ed6e9f10aca3f37e0899d1e1575ee2b358d027e34600daabafd352b383ef66 WHIRLPOOL 371c3b19ac96435f9003c600778756f765ca8bb2875077c261f920be1554289ee5d80b070ce8c55232a36acf29a30aac6db59b1e032a37bbdfa2c39ab139790a
+EBUILD glance-2013.2.2.ebuild 5196 SHA256 941826da1ae57b2deb2b602e503cee0baf9f6286d68b15ad709ce8ba8147c7af SHA512 3375a9912dd019077819897cedb867508421002f96165a8f7b6770de58057a36f613c50fc06cda3e4f9b35fc8761347b390b07acc2cdbece13c403fc791fc1db WHIRLPOOL dccc6fd870afba584011f99498d61e0c5e69a96dc68b2ad5fd224c5cb733ad59eac3fbc9a94f033b751401b56b2119700ba7567e42de16f1c37004fe4ff2c7be
 EBUILD glance-2013.2.9999.ebuild 5204 SHA256 5499738bac7a4433bcb65240c77d777a346dc1213e456186a016e3b40b5cb920 SHA512 f630539d3ff76825f22f836660503e996a6dcfa6f7432ca7920c8dd48efb0f5cd085b99e4b42d8928678a15ab7751abc02b34af87add05a23b6625f07ebba2c8 WHIRLPOOL e7576b7c5e6a57e0b363fa306ff9aa105ed5cdf9a20677597474483a4db4121c9877de2e1bfe8bfbc80ae0ddc315eeb370a41c3ef336a74262c5983d19db1613
 EBUILD glance-9999.ebuild 3029 SHA256 a0274ad3f834ad7be23bbcaea00c4a8422857bb3903f89954da901ebeeb7872b SHA512 2c9baf347f3577c4fcb62d1bed5f328e2dbd8e2c2149e1dd4b5b4d317520da5e8fa09d8c352d7bbeeb65c4debb35d3fc9df5c436fc51f707717e18bddeb4743e WHIRLPOOL 7f3a20e0ff8404c4ef130b1b2a84543e91acc95d51d332028dca474a2e2e44c2aae2f5e409b2258eec35a09c4c34c93939f99fd182c8050fb845d462e9bde0d4
-MISC ChangeLog 6837 SHA256 f5b1cf42533e3bf923bacb1aacf6451962d74ab023a960edcd36241a77e2e418 SHA512 cda47f074eea0435e1ead27cc6b7c0f1c6f6d05b3a684bf7e8ebaf686948cd0b7015d7ef86805bc7fd696e9f16efdcd40b4ba651ec8306a3ec2173779af08d7e WHIRLPOOL 91662aa89e62aec8818397aa8a42dd9b468cd1341d110cacdd9da540503b9fed663af56716c4d12cbb790180563928941b9c3f31a2312d3614f9d834492bef06
+MISC ChangeLog 6962 SHA256 41b10dfae6d94397894eabd9d5b7746c8c582b57acf45cadaaf9ff5ccc311be0 SHA512 2463c6cd96a22ae4bdb79c105559ee2a7473b57be1795091f1683aab42289e777f913cf2a45c2e3c209e20161a7da8d497213bc8761939f27afd07475a751890 WHIRLPOOL e730ac02cbd0b8fe36c47bddb2272575bc93bfb3720566b3e41941a24a1b9a1b3b65a668fd3a2937d87bd37ea40ca6db523518a22e0002c58f0c68f1fdf201bf
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS/EvdAAoJECRx6z5ArFrDQ/MP/A3CLm4CiyT1vlNcZLxvKiTd
-gVUuQJIz90HGztBC3lX9tZkzIaKjDdkreXuL8+P3Cz+6vsdlKed5evCUmktbbqe5
-bHImge5Ud1H5uRcc7rOQH2xzw57XsMxFuqzO8KYQWV/9CjNGY1IsTeCL38RmouSP
-DI3pZvzLobiSXD3Dh/6Aaqjb01xemkxWXSdI4z7MPBvWSUBkB/29rGEapkOg69Pv
-weHGXe9gF9FAXERVB6C2ofQOK1RoJqAU7WzVSNuRu2Z3XmRfGMNgMcjfYpnf1uNS
-OMxrUqsDxksx5zoB5hK/Tmj1f6d4x2JkVcm/IIPngHsCzlrtDSmZ5mBzIX0dOFaD
-v6tZ+CDWohXqc2k5Y9357F5lYSAsBIT75u22ulnnjh2u0dvYOtwlFnz8sLagK6Ds
-563IKU+VMCT0WgizgZna50v8NNEOpQLB6xWTFsrgTres26A9RUMdXPpRTW4EKWYD
-rtMql6QGWm1vQeThFnkZ/AyTnd6KYBJ09cqdrFjrIWYr321VukDnEp5UsIYBWeJF
-yBjF7qHCpjEIqSn/UoHyjxCZ+N8qE7zn/9m3nT796ENAHxXbdUdF0yDIbIGH4vy8
-MIjAL/d/wLNotLkQESoqCRiH88fp6KgFgDntpxozngtmDyUxfsjwrzz6ZcbrmHn9
-HIgIzZL6IYvr8O91qCTq
-=hEk0
+iQIcBAEBCAAGBQJTBmz3AAoJECRx6z5ArFrDG8kP/13ZXDzS2W+WJmUm3HX7Jayx
+2Fm+KZz9cI59QfnKt5XZ+SyLbp2kNRQyhEIiiOy2tqu9sg48YToEnJ4l3RMwHfV7
+xEvZZNA/Xrp1WAQ25vagfiQrv27119cmRfz3p2U5Z3lpvZ16jOv0QjH2Y0Gku0Kf
+FPoVR2nN/FuYNeX91VO7asQ5xMl05Bnto3QDu/Zj53Ecb/0dhg84qWll4IHbz5FA
+U/IgcCpKlc2DCS06N5n7IPZPWzjsDArwxyXLPRDH6ZMOkL53uBQ82aEQHF4LWzhZ
+F6DoqGr1ZN/tj8c+OsUyZWWBWem7OC5MIGBn+JmeoU/eZ4o6V9BL+y58gHWS6GsI
+58/L1A3/FvB8Z0NI96BceS6MK5vJydOYNB98gKkSeWcFv1q4MsAehRjFvRKYsq5U
+eVj/HfNFZjbcPCtMvxT3LHrzAiUNY2fz9RcfGjxC2AqRitouXlwc8Ami899gNTDp
+pIj3XcxATrsITzjzi2Dg/Weo1AhDSYwS0rgpfRdGkfdEN1KY+MeVbkrWMlE+s//8
+Qjglu+LO7BT/kVx0xGBrFHxnbg64+k6eqY40Z5uhdRYrVDEOMDKL3HJYpy+NyY/r
+M3K5tk38HLWI3RJYWPQhBFPz8KoJ5z7fAnCeSzhezLxKhhHVFENR3iKQeiyl/H67
+O2tHeTQhCZNp694Jk22J
+=cFV1
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2013.2.2.ebuild b/app-admin/glance/glance-2013.2.2.ebuild
new file mode 100644
index 000000000000..ebd4c545dbc3
--- /dev/null
+++ b/app-admin/glance/glance-2013.2.2.ebuild
@@ -0,0 +1,139 @@
+# 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-2013.2.2.ebuild,v 1.1 2014/02/20 21:00:22 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/nose-exclude[${PYTHON_USEDEP}]
+			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+			>=dev-python/psutil-0.6.1[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+			>=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+			<dev-python/pyflakes-0.7.4[${PYTHON_USEDEP}]
+			~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+			=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			dev-python/oslo-sphinx
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.2[${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}]
+		>=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/boto-2.13.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.8[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.1[${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.6[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" )
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+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
+	# 2013.2 requires =dev-python/iso8601-0.1.4
+	nosetests glance/ || die "tests failed under python2.7"
+}
+
+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/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"
+
+	fowners glance:glance /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber /etc/glance
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}