update to 2013.2.1 and bug 494184

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

10 files changed, 104 insertions, 376 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index b9f84c856151..76d08adef02d 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,15 @@
 # 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.27 2013/12/19 02:08:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.28 2013/12/19 05:20:42 prometheanfire Exp $
+
+*glance-2013.2.1 (19 Dec 2013)
+
+  19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.2.1.ebuild, -files/glance-2.initd, -files/glance-3.initd,
+  -files/glance-gbug-474064-folsom.patch, -glance-2013.2-r2.ebuild,
+  -glance-2013.2.ebuild, files/glance.initd, glance-2013.1.9999.ebuild,
+  glance-2013.2.9999.ebuild, glance-9999.ebuild:
+  update to 2013.2.1 and bug 494184
 
   19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
   -glance-2013.2-r1.ebuild, glance-2013.2-r2.ebuild, glance-2013.2.9999.ebuild:
diff --git a/app-admin/glance/files/glance-2.initd b/app-admin/glance/files/glance-2.initd
deleted file mode 100644
index 6898a00a015f..000000000000
--- a/app-admin/glance/files/glance-2.initd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance-2.initd,v 1.1 2013/09/26 00:58:07 prometheanfire Exp $
-
-depend() {
-    need net
-}
-
-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
-
-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() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-    
-    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/glance-control ${SERVERNAME} start 
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-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-control ${service} stop /etc/glance/glance-${service}.conf
-        done
-    else
-        start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-                --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
-    fi
-    eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/app-admin/glance/files/glance-3.initd b/app-admin/glance/files/glance-3.initd
deleted file mode 100644
index 5292c8ec1ead..000000000000
--- a/app-admin/glance/files/glance-3.initd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance-3.initd,v 1.1 2013/11/18 03:02:59 prometheanfire Exp $
-
-depend() {
-    need net
-}
-
-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
-
-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() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-    
-    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --user glance --exec /usr/bin/glance-control ${SERVERNAME} start /etc/glance/glance-${SERVERNAME}.conf
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-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-control ${service} stop /etc/glance/glance-${service}.conf
-        done
-    else
-        start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-                --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
-    fi
-    eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/app-admin/glance/files/glance-gbug-474064-folsom.patch b/app-admin/glance/files/glance-gbug-474064-folsom.patch
deleted file mode 100644
index f63a05b315dc..000000000000
--- a/app-admin/glance/files/glance-gbug-474064-folsom.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 28d0350070c6120a83287f0846c59f50814bc37a Mon Sep 17 00:00:00 2001
-From: "Mark J. Washenberger" <mark.washenberger@markwash.net>
-Date: Wed, 26 Jun 2013 15:41:25 -0700
-Subject: [PATCH] Don't rely on prog.Name for paste app
-
-Relying on the name of the program breaks packagers who need to move
-glance executables around to other locations on the file system.
-
-Fixes bug 1194987
-
-Change-Id: I7721c5181b17b1f34adc279c055dfff5d17b57e5
----
- bin/glance-api.py       | 2 +-
- bin/glance-registry.py  | 3 ++-
- glance/common/config.py | 5 +----
- 3 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/bin/glance-api b/bin/glance-api
-index a82261e..5244b84 100755
---- a/bin/glance-api
-+++ b/bin/glance-api
-@@ -53,7 +53,7 @@ if __name__ == '__main__':
-         log.setup('glance')
- 
-         server = wsgi.Server()
--        server.start(config.load_paste_app, default_port=9292)
-+        server.start(config.load_paste_app('glance-api'), default_port=9292)
-         server.wait()
-     except exception.WorkerCreationFailure as e:
-         fail(2, e)
-diff --git a/bin/glance-registry b/bin/glance-registry
-index 678bcd1..39bc3ee 100755
---- a/bin/glance-registry
-+++ b/bin/glance-registry
-@@ -47,7 +47,8 @@ if __name__ == '__main__':
-         log.setup('glance')
- 
-         server = wsgi.Server()
--        server.start(config.load_paste_app, default_port=9191)
-+        server.start(config.load_paste_app('glance-registry'),
-+                     default_port=9191)
-         server.wait()
-     except RuntimeError as e:
-         sys.exit("ERROR: %s" % e)
-diff --git a/glance/common/config.py b/glance/common/config.py
-index 45cea5d..cd4feba 100644
---- a/glance/common/config.py
-+++ b/glance/common/config.py
-@@ -158,7 +158,7 @@ def _get_deployment_config_file():
-     return os.path.abspath(path)
- 
- 
--def load_paste_app(app_name=None):
-+def load_paste_app(app_name):
-     """
-     Builds and returns a WSGI app from a paste config file.
- 
-@@ -170,9 +170,6 @@ def load_paste_app(app_name=None):
-     :raises RuntimeError when config file cannot be located or application
-             cannot be loaded from config file
-     """
--    if app_name is None:
--        app_name = CONF.prog
--
-     # append the deployment flavor to the application name,
-     # in order to identify the appropriate paste pipeline
-     app_name += _get_deployment_flavor()
--- 
-1.8.1.5
-
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index 48b3da5d5bae..15896cc8d476 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,53 +1,74 @@
 #!/sbin/runscript
 # Copyright 1999-2013 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.3 2013/09/12 06:27:27 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.4 2013/12/19 05:20:42 prometheanfire Exp $
 
 depend() {
-	need net
+    need net
 }
 
 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
 
 checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No glance conf.dfile found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	if [ ! -r /etc/glance/${SVCNAME}.conf ]; then
-		eerror "No ${BASENAME} config file found: /etc/glance/${SVCNAME}.conf)"
-		return 1
-	fi
-	return 0
+    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() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Starting ${SVCNAME}"
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
     if [ ! -d ${PID_PATH} ]; then
         mkdir ${PID_PATH}
     fi
-	
-    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/glance-control ${SERVERNAME} start 
-	
-	eend $? "Failed to start ${SVCNAME}"
+    
+    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}"
 }
 
 stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
-	eend $? "Failed to stop ${SVCNAME}"
+    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}"
 }
 
 #restart() {
 #
-#}
+#}
\ No newline at end of file
diff --git a/app-admin/glance/glance-2013.1.9999.ebuild b/app-admin/glance/glance-2013.1.9999.ebuild
index 567d6c971ee8..a93f88cffb41 100644
--- a/app-admin/glance/glance-2013.1.9999.ebuild
+++ b/app-admin/glance/glance-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.9999.ebuild,v 1.6 2013/09/27 00:47:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.7 2013/12/19 05:20:42 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -62,7 +62,7 @@ PATCHES=(
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-2.initd" glance
+	newinitd "${FILESDIR}/glance.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
diff --git a/app-admin/glance/glance-2013.2-r2.ebuild b/app-admin/glance/glance-2013.2.1.ebuild
index 77d91da25b8c..8fd5f695d13c 100644
--- a/app-admin/glance/glance-2013.2-r2.ebuild
+++ b/app-admin/glance/glance-2013.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.3 2013/12/19 02:08:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.1.ebuild,v 1.1 2013/12/19 05:20:42 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -19,10 +19,9 @@ 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}]
+		dev-python/pbr[${PYTHON_USEDEP}]
 		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.12[${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}]
@@ -35,22 +34,22 @@ DEPEND="dev-python/setuptools[${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/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.7[${PYTHON_USEDEP}]
-			>=dev-python/Babel-0.9.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}] )
-		doc? ( dev-python/oslo-sphinx
-			>=dev-python/sphinx-1.1.2[${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/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.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}] )
@@ -65,11 +64,12 @@ RDEPEND=">=dev-python/pbr-0.5.21[${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.4-r1[${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}]
@@ -80,12 +80,12 @@ RDEPEND=">=dev-python/pbr-0.5.21[${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/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}"/${P}-sphinx_mapping.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2013.2-sphinx_mapping.patch )
 
 pkg_setup() {
 	enewgroup glance
@@ -106,7 +106,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-3.initd" glance
+	newinitd "${FILESDIR}/glance.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
diff --git a/app-admin/glance/glance-2013.2.9999.ebuild b/app-admin/glance/glance-2013.2.9999.ebuild
index f719ec97d0dc..70256bc5f5ab 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-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.4 2013/12/19 02:08:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.5 2013/12/19 05:20:42 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,10 +20,9 @@ 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}]
+		dev-python/pbr[${PYTHON_USEDEP}]
 		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.12[${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}]
@@ -36,22 +35,22 @@ DEPEND="dev-python/setuptools[${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/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.7[${PYTHON_USEDEP}]
-			>=dev-python/Babel-0.9.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}]
-		)
-		doc? ( dev-python/oslo-sphinx
-			>=dev-python/sphinx-1.1.2[${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/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.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}] )
@@ -66,6 +65,7 @@ RDEPEND=">=dev-python/pbr-0.5.21[${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}]
@@ -81,10 +81,10 @@ RDEPEND=">=dev-python/pbr-0.5.21[${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/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${PN}-2013.2-sphinx_mapping.patch )
 
@@ -107,7 +107,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-3.initd" glance
+	newinitd "${FILESDIR}/glance.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
@@ -133,6 +133,7 @@ python_install() {
 
 	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
diff --git a/app-admin/glance/glance-2013.2.ebuild b/app-admin/glance/glance-2013.2.ebuild
deleted file mode 100644
index 2655ebb18abd..000000000000
--- a/app-admin/glance/glance-2013.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.ebuild,v 1.1 2013/10/29 05:02:54 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}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
-}
diff --git a/app-admin/glance/glance-9999.ebuild b/app-admin/glance/glance-9999.ebuild
index ba34d43e0db5..e053846fa61f 100644
--- a/app-admin/glance/glance-9999.ebuild
+++ b/app-admin/glance/glance-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.7 2013/09/27 00:47:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.8 2013/12/19 05:20:42 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-2.initd" glance
+	newinitd "${FILESDIR}/glance.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}