fixes for bug 504266 (and fixed the creation of /var/run/glance on install

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

5 files changed, 179 insertions, 81 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 7ab5f30e358a..c90ed61e74d9 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.32 2014/02/24 05:17:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.33 2014/03/16 19:27:13 prometheanfire Exp $
+
+*glance-2013.2.2-r1 (16 Mar 2014)
+
+  16 Mar 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.2.2-r1.ebuild, files/glance.initd, glance-2013.2.9999.ebuild:
+  fixes for bug 504266 (and fixed the creation of /var/run/glance on install
 
   24 Feb 2014; Ian Delaney <idella4@gentoo.org>
   -files/havana-1-CVE-2014-1948.patch, -glance-2013.2.1-r1.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 3772ad99e58c..b1a324ed6b89 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -4,20 +4,31 @@ Hash: SHA256
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
 AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
-AUX glance.initd 2504 SHA256 8000f93dfacd93fa5c4a6d07090bc3c27b63912b6ae55a026e2b0580d9d8409a SHA512 87e2ad6cf356701455ebc70b06cf23d655d786fcaf0036f0a2d68d3a4504436abc7d51e7611db9f2846c0130cb0c36671109457dc9a0576a797eda71dcc9dbbb WHIRLPOOL de8ef76c9a36ebf7da6a04f6686666beae1dd5fc6f58348a77afefb5f92671b0e6ce679a670e8a0495c5763cae6d7542f64ed725dd01abdfaa0f60735773d152
+AUX glance.initd 654 SHA256 f7a26ee96181fc1725709851fe59f0430a604dc43396b5e5de7ba60dec167bab SHA512 a352d281039f6df44d50d7f57bf29aacabb787cda6f8b3827dbe0924c163acd864c1627a6b0b371e1b40d3ae75799810ad904f1c6bfe161f25d2183eae45f4e2 WHIRLPOOL 4045789ae1ebba3f4fde8119c9676814d7b4f917f55eeb3202900dec46b6d4feef33bc5f75417fe565f56ebc3145e092fbdac8ea74b30ca2a0c183a20ed813fe
 DIST glance-2013.1.4.tar.gz 724110 SHA256 dfb8070a12bbf5761db1c55d21db4772fe81ed903d57cf991618e5224cbdcd67 SHA512 31c6c4ba0e777fcd345fe24d32eab548f8e9756764051d8b3c50d4d54404c902473760a0dc1158e8b6b42a0b81e14ae6a31d03bb07d4254fcb4960b05dd747a9 WHIRLPOOL 770f782f539b0ac465c00e726552f4b7fc8824c4a9da1a94ef4103ef56ce17ff1c2ccc75140b71c9f4d3d875885f169d3c1c6d761fed7ff691c83484b86de74f
 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.2-r1.ebuild 5025 SHA256 64c44d245e1edafbf15880b5ab99a1ad097eb92a303a31f17c67f1e73151dc9e SHA512 4954fa3c4f82c49b1d3b58d1f6edbcd21c10930601dcb4c1cfb406e6ba89db6ab03dd3323f15b527d599c3e5d174264ca94cdaf302bdfd6985208ea0a06e5efb WHIRLPOOL 6a53872d8e4d0314d834c9e3856e51f677b21088bf6f5b288c56b3d93ad862e48952d112904b92ec91bd5f3e66b5ebebdd6ded2e10a0703d1fef1a0b74b09aa0
 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-2013.2.9999.ebuild 5038 SHA256 16b123433bbdf44b99624108eb4be1159b0ea4c75eabdfd4d8aa3cc0742957b1 SHA512 44af4b647587d9df5186c29ea157da1607fc5cbdbde34c2aeccc32670949097c46372ca36c686203d6eb29ec493123feda2522440d6f4f7b872128a8dea872c4 WHIRLPOOL 61d39954d8515fc5f82278a8d5d541b363567627cf345c28b67929a6a439a5838c77b1af2eaf033d20217c5c473eb67f208d5a6207ec016fc0ab28063c3a2cbe
 EBUILD glance-9999.ebuild 3029 SHA256 a0274ad3f834ad7be23bbcaea00c4a8422857bb3903f89954da901ebeeb7872b SHA512 2c9baf347f3577c4fcb62d1bed5f328e2dbd8e2c2149e1dd4b5b4d317520da5e8fa09d8c352d7bbeeb65c4debb35d3fc9df5c436fc51f707717e18bddeb4743e WHIRLPOOL 7f3a20e0ff8404c4ef130b1b2a84543e91acc95d51d332028dca474a2e2e44c2aae2f5e409b2258eec35a09c4c34c93939f99fd182c8050fb845d462e9bde0d4
-MISC ChangeLog 7126 SHA256 e0d72d4df0f06c3f52906f8b7d01084f4010a9f7aa497a81b70fd61e21688303 SHA512 37b9305d92955b7140105da71b9847a25e12e86858e0c541b4efad83cb99543babed923782a4dc1cc470e7f96654d9d2a0362815757b776f6048f09a3298bb83 WHIRLPOOL 2e790b9143b8fd79d21d286e00b3f23302cc67f4dde547c05c65f946395829af2f3a82faf2e2e2ee4c82ca87942bc69f90aa4a2df1d90d60d75f81f727851d86
+MISC ChangeLog 7380 SHA256 27c3c250a2c12eaabee8a5255cdbaf30032d076680a9efac22190cb0dc6ad128 SHA512 a7b66a4be0d3d33a1275d9ba5435afb23f840178c315abd0864d78719400e15ffc3b896db05333988139aa57aac69c342b566e5ea995d051070ff8afe20f8ee4 WHIRLPOOL bcd69b45a1d43822c7a06ee7997afb001cd0ba45067d2e818191238b26cc7aa5e1b1239691b3bdff923903761aa6066b1472731247b453ea8552e0c74c7eb6a7
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMK1GwACgkQso7CE7gHKw3ZgwCgtKAEwMXZ698Tm/RQ4celvFsk
-TccAn2JO8Zf0Xa3SDRFPcWEsJt2S1bOB
-=10mb
+iQIcBAEBCAAGBQJTJfs6AAoJECRx6z5ArFrDCgAP/1U8Yd/YRwYOAdPo2RMav5rn
+9kUAytB4Zz7IDIScxI9gTBmYsFfH5iINDu4pWiXe0zDETSQPfWdvdQaUUSf5ntx6
+eidf3NsaJgPqwFpxjrxXvFq1WTDhyO0RgQEFvWhUAWXa8PodCSCvc1XY6hWKrX2p
+d+96LNyC9SpoDUO6Uk/xtfutWzbVOqoehVEtkryvEBomGn+zZDpHE2W2BMssJQmc
+omB52AN0RdcTX8TYSsyGLYGpaq57FP3ECL8WlWAvPJmRnZfH1Bmut0fMarBCQUB/
+p5CsK4v5asiUfBGjfi7SB6MZEQnRRrhV/6MBRlRZQISHRzaTQIRUW3FA7F+XMxwW
+RR5NhKoi2mroa87WGWHALbQanMvKmZo49dI7OhN33NgLsuDScj6DffO8+BFVNHEq
+jFmoAWuPehIcByzELCm1bvpD2IhRswoPiEomN4/KR5ywTQfcli5DDFvGxwzHakql
+KeQvOCbeQtUW3hy6HDW9VtD/YJQ2rSLD0MC+09NQNbSmxTcUUQWlmnV/G2cAEdwq
+LCNMJW53mu+4ikMVHKrUzJ9NnjMbdfxMqHhAXH55fr4lrH7TTJufeE74keILaVOJ
+nlJD9FmQDFdZm3IvQQq0mA9Upfo0ITRNXYcI/KmFK4xrGk06PL5lsn3H5zmwCoDv
+4EaRNZ7lQJYa/+d+fweM
+=mdNZ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index 15896cc8d476..bc4bc0ab41ba 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,74 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.4 2013/12/19 05:20:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.5 2014/03/16 19:27:14 prometheanfire Exp $
 
-depend() {
-    need net
-}
+description="Starts ${SVCNAME}  service for OpenStack"
 
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
-SERVICES=( api registry scrubber )
-if [ ${SVCNAME} == 'glance' ]; then
-    SERVERNAME='all'
-fi
+command=/usr/bin/${SVCNAME}
+command_background=yes
+pidfile=/var/run/glance/${SVCNAME}.pid
+required_files=/etc/glance/${SVCNAME}.conf
 
-checkconfig() {
-    if [ ! -r /etc/conf.d/$BASENAME ]; then
-        eerror "No glance conf.dfile found: /etc/conf.d/$BASENAME)"
-        return 1
-    fi
-    if [ ${SVCNAME} == 'glance' ]; then
-        for service in ${SERVICES[*]}; do
-            if [ ! -r /etc/glance/glance-${service}.conf ]; then
-                eerror "No glance-${SERVICE} config file found: /etc/glance/glance-${SERVICE}.conf)"
-                return 1
-            fi
-        done
-    elif [ ! -r /etc/glance/${SVCNAME}.conf ]; then
-        eerror "No ${BASENAME} config file found: /etc/glance/${SVCNAME}.conf)"
-        return 1
-    fi
-    return 0
-}
+start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}"
 
-
-start() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-    
-    if [ ${SVCNAME} == 'glance' ]; then
-        for service in ${SERVICES[*]}; do
-            start-stop-daemon --start --quiet --background --make-pidfile --pidfile "${PID_PATH}/glance-${service}.pid" --user glance:glance --exec /usr/bin/glance-${service} -- --config-file /etc/glance/glance-${service}.conf
-        done
-    else
-        start-stop-daemon --start --quiet --background --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --user glance:glance --exec /usr/bin/glance-${SERVERNAME} -- --config-file /etc/glance/glance-${SERVERNAME}.conf
-    fi
-    eend $? "Failed to start ${SVCNAME}"
+depend() {
+	need net
 }
 
-stop() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Stopping ${SVCNAME}"
-    
-    if [ ${SVCNAME} == 'glance' ]; then
-        for service in ${SERVICES[*]}; do
-            start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/glance-${service}.pid" --exec /usr/bin/glance-${service} -- --config-file /etc/glance/glance-${service}.conf
-        done
-    else
-        start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/glance-control -- ${SERVERNAME} -- --config-file /etc/glance/glance-${SERVERNAME}.conf
-    fi
-    eend $? "Failed to stop ${SVCNAME}"
+start_pre() {
+	checkpath --dir --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0664 ${GLANCE_RUN:-/var/run/glance}
 }
 
-#restart() {
-#
-#}
\ No newline at end of file
diff --git a/app-admin/glance/glance-2013.2.2-r1.ebuild b/app-admin/glance/glance-2013.2.2-r1.ebuild
new file mode 100644
index 000000000000..23aa706f04ac
--- /dev/null
+++ b/app-admin/glance/glance-2013.2.2-r1.ebuild
@@ -0,0 +1,136 @@
+# 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-r1.ebuild,v 1.1 2014/03/16 19:27:13 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
+
+	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-2013.2.9999.ebuild b/app-admin/glance/glance-2013.2.9999.ebuild
index ebb8c1151bcf..047e6d05d607 100644
--- a/app-admin/glance/glance-2013.2.9999.ebuild
+++ b/app-admin/glance/glance-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.9999.ebuild,v 1.6 2014/01/08 06:44:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.7 2014/03/16 19:27:13 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -106,21 +106,20 @@ python_test() {
 
 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}
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
 	done
 
-	diropts -m 0750
-	dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	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
 
+	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"
@@ -130,8 +129,6 @@ python_install() {
 	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() {