Added; IUSE doc, test, doc build & install, test phase with diligent assistance of tester/helper Chicago

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 155 insertions, 16 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 9d47dd169bb7..9807ff044b67 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2013/10/29 05:02:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.23 2013/11/13 12:30:45 idella4 Exp $
+
+*glance-2013.2-r1 (13 Nov 2013)
+
+  13 Nov 2013; Ian Delaney <idella4@gentoo.org>
+  +files/glance-2013.2-sphinx_mapping.patch, +glance-2013.2-r1.ebuild:
+  Added; IUSE doc, test, doc build & install, test phase with diligent
+  assistance of tester/helper Chicago
 
 *glance-2013.2 (29 Oct 2013)
 *glance-2013.1.4 (29 Oct 2013)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 66259d85b28f..975e5e79d558 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX glance-2.initd 2102 SHA256 8ddaf11b40be8084a5377acd479ff2966f5db7df17be1e65831067903b5d7a28 SHA512 1e15817b7c2ba7c58a4eda3a5f92d47795e5088c04adbf9bc692f60aa7cf08be659dae30ed6ac0fd42857f75e869b42a76d7e48e0bb72f50a5659b32386c08cf WHIRLPOOL 50125c4bf247fe85e25e77c99b92931587b6c081c02b9e4a13f143996305f320ffb431656ab31d9bd11f217807c4c5f09663b53b128366d1cd7ad582a5d5b1bb
+AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
 AUX glance-gbug-474064-folsom.patch 2357 SHA256 1a8cd2bc81de9d8149590b0f11a30d13928740ac1548ab4a5e934a311f1b0d18 SHA512 7a2005899c88cd29ef1be1b3c6119767ad2ba62b878438cb4aabecea677579c65c654526ba9afac8c73016d6b8085a6fad0016167d06437087abfc8e0ab26bda WHIRLPOOL 497a415c7c1d09075ca0e809f7dc75b2a4147bcdf53e6ccb64e439d507972dfd7336e69f980f9673ce59e1047adb5497351386bdeceaec53022a79a417c129bd
 AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
@@ -12,25 +13,16 @@ DIST glance-2013.2.tar.gz 1614843 SHA256 135fb1b6fe8410894b9d070071e1b7d7ddd37fb
 EBUILD glance-2012.2.4-r4.ebuild 3037 SHA256 f398b95d3fc89f70c9df63ba2203418c663b592321a5d8f83b746761afd88901 SHA512 0a03ab6e6eb3dc71f361d8271773c2b8c3bbcd4f779e479bdda4f54dd9ed0b05e4cfa1446758bef269dae6bcf3acd6ecfb646c01c7dd56cac5b7522950d4819c WHIRLPOOL 9e27596c1019e48c69affc0f76a13b288f6357483c2ea1bd9e16966be45b1a26b09e3495cbb51f804e9cc1524cdb4b5e102f6c546e8f1980899f3997227abfe4
 EBUILD glance-2013.1.4.ebuild 3146 SHA256 1ea12e958ef036f33d7479bf594251c189d922af33cf4ddb0441ad429193bd96 SHA512 b8fa8788dbd8274fa43fa0dfe88fc8f43f832a82913d4816174bf771639eeb907659faad3315981706bac41b7143b75c5c3ae50d5ad8794d4fd9c88c932ae99a WHIRLPOOL 6a7826ce32d9ba75111c58d130366602d706f406ad0cfd4fa17f42694d73c985cf0c19ffb3f26f78fad58cf88f101456bd6e4614c29f54609e620c313f19626d
 EBUILD glance-2013.1.9999.ebuild 3108 SHA256 d5c2be3191fe463325739e687b6c1bcd8a3a0368a74070e505e0af99d7426c47 SHA512 9184b27115d249582d04a8685f5d9388613456007ab672dc91fc466f17cacb44a2b7f12367ad32300b745ed1ae59e6649348e6eedc87b4f82bf7e14325665727 WHIRLPOOL e770e0e34c1cf1a18241027bf6dc65b20cf44ce082aec50aa46b1414e03fcb0edbdf4a5329db4b045afa1ee6d3dc67939113d84c97036bf2404baf18a0c5d567
+EBUILD glance-2013.2-r1.ebuild 4819 SHA256 f00d7c59e5c6820250e8c6fd6620185f5c1a6559cd3c03ba3596176fd4a0d233 SHA512 379ebe6b0b49a7cd55f14845c246ef74e39135c864337e296ca443217461636904e25cfbeb22cd20f16f68e4f23532a228f33520b69a3a6fc4244e9c6d081a02 WHIRLPOOL b4b7fd7453e463ecfe5e9b4e2b89668e61df6c0bdd675def166f5b2d38513a81aa5120976f91344749dc121331694e94a4b25a1537178a8d034e6c1c2a69c792
 EBUILD glance-2013.2.9999.ebuild 3351 SHA256 17cbe108f9a74fa4c6fc1d5ba9ca37c493d3a10139728586f9635be80c47bc3f SHA512 3002f270763e9fbc76495d3dca1ac739885f0393831cd4c5c2a2df19cccafda53f730698d978a8f2d7f14ca46fecd2af30d8aabbddcad75ec47bacb3ae88ece9 WHIRLPOOL b87c4e8b150035ab4d8162ee7fc315671a58f1f7338e9de4856c42603de5791bf7e534940f887132bd9d039c3f582d1c3256a084d645d9c9538c0d7dc9ee0533
 EBUILD glance-2013.2.ebuild 3339 SHA256 b8f47bd6d8a6cbf7b60fcaac9eb71bbf1c46eb0e33113a1b40cefc405e20029d SHA512 2559cad07c9ad4a21a12873029d00a379a9ceacab3551f9ce92869eaef161ad54af17751f5345297f3dbbd156f41c5a8c712767496c5c56d9603a4ecd8c2461c WHIRLPOOL 79d22ae2f09b9c5c80f0d2da0852f5429c7f3c431dfbbb0c4e7d768abd77415339144d918a38e19db38258bd8282ea77322363c06fbcd41f4825dcd1ab472918
 EBUILD glance-9999.ebuild 3031 SHA256 70283c6d4784f1a524210e9fb994f5e2ab14a133581f509f833253a2fc07243f SHA512 a79d8ae559f26eba446c25ff48c58cc524bb399862dae936fed91c129facde0da906019458b586102ad5d13fe025eddf2d2a19b57a74e9395b5e6ecf33f05637 WHIRLPOOL a8ed52c906b9d840b312b39f458780aed6f42b1b0dd6a67fe5e27b04a5926bb5565ceed7ba425eceae5c43aceb3335272714d58ad64f5121e35db5d132db476b
-MISC ChangeLog 4975 SHA256 3260584ea4a49c44c219ccee458e916848613451073cf2e2d34f9e7a43e722e1 SHA512 bcc3c85c764b95b7b7939114d22249254c50e524a48eb88f9872fbebed89c5f525d1b29443fc84735d646e34e07e44618b561b86825ab76da4327e3e3f4d7c9c WHIRLPOOL 7bd4146940d9c544cea7bca1604cac426f0f27e9adcd7b12345eb2e67d57b194814d2c625b3465af559f786e60f67cc5e581fcd3f9dce4bb27481f7932f16d0c
+MISC ChangeLog 5230 SHA256 367240589ebb45d63f92c8a9e357014bf2ec4f7a38a1ade30a243403db661704 SHA512 cac15fe61b03d60a50505e1740d3eca16cc425c3405d36ff7b269c07f59a671492087325595395c7bd3df340feda5c3df65a490b9a1a140b6d6aa60dcf5c490f WHIRLPOOL c1c1d11590d6682e19cd67c7096d716bf08e00ba5a4419750782f41ced07107b702b238a9c654aeffe9bf9f1dde4975c95b34f3a6cb8f213ee9c7e6565d04f52
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSb0H/AAoJECRx6z5ArFrDeY8QALkCB0Ml9mS9EqdC0n35yOGU
-eXwVJyEMpp6jhh3foZO/hgjwJoF3FguMMVA6EzSpEmgesS5+ofLBkLbouYiwa7VG
-83IxtMfDUlKh+l4iBM02djB9kQjxvnqYqLZOCLUinhli7Z5X9JNPhHFUgJXS36sG
-a2Yo+UR2in4BTDIdNy3x2cToyUr5Is3+cpyzMe9M+R9JvvDnkic4xZUw8yo+GBcf
-qONbXQ1CWHl0pGSz0F++fp29/uJGdtdvHqGPRQtT0KzmJFuvcomEeriPE+KpHGSe
-S9fEUBBRIecfAOu8y2Z08OOz0Pk57kCh3SZaUokvIMdGl+Bf8Ahh3mTsTA4dtX3r
-1OVEdjCrTY7xOusCtE2VtMdYKTdtc88NY5+qIfP8L7HGCIsanT8qxuXWL8qnYzAn
-OZft51qrQNC0Q05N6VNAD2nv5PUsjh7wtxgSbyBK+QA4j75yyBOtltqhEbahlk6x
-KzC5IdiNrogo409uNQ16tiB3aMte5ZNUBap7fiVSHcU8bDR8McBR2/Zm9qb5Fpp5
-+9r+6HMtFqERVL2wr/Z+doQEAkTk/I3Ud0SeGujNN6N5uJj5H+XHYNTpTUTflc0t
-LEFs4VTVy8I6jifo+Q9xDCxlTNdrps+P5iVW0VVdS+mkOg32c+C+NsNTWATU4RIc
-aMhMRTTFGGoNtDV5qhoa
-=u4Dt
+iEYEAREIAAYFAlKDcQUACgkQso7CE7gHKw1o5wCgxS7B2DKYBTJH6NxZyyvXUyx3
+veUAoMAKnQogCEk5juxc1G5hotO5/0XV
+=Toqa
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch b/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
new file mode 100644
index 000000000000..0a0f575ca0d3
--- /dev/null
+++ b/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
@@ -0,0 +1,12 @@
+diff -ur glance-2013.2.orig/doc/source/conf.py glance-2013.2/doc/source/conf.py
+--- doc/source/conf.py	2013-10-17 21:39:46.000000000 +0800
++++ doc/source/conf.py	2013-11-13 18:51:29.099839976 +0800
+@@ -250,8 +250,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+-                       'nova': ('http://nova.openstack.org', None),
+-                       'swift': ('http://swift.openstack.org', None)}
diff --git a/app-admin/glance/glance-2013.2-r1.ebuild b/app-admin/glance/glance-2013.2-r1.ebuild
new file mode 100644
index 000000000000..c136132add9d
--- /dev/null
+++ b/app-admin/glance/glance-2013.2-r1.ebuild
@@ -0,0 +1,128 @@
+# 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-r1.ebuild,v 1.1 2013/11/13 12:30:45 idella4 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}/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-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.12[${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.24-r1[${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/flake8-2.0[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.7[${PYTHON_USEDEP}]
+			>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+		)
+		doc? ( dev-python/oslo-sphinx )"
+#=dev-python/pysendfile-2.0.0 & dev-python/qpid-python need making and adding to portage under test?
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		>=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=( "${FILESDIR}"/${P}-sphinx_mapping.patch )
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	nosetests glance/ -I test_notifier.py || die "tests failed under python2.7"
+}
+
+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"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}