general cleanup and fixing bug 536340

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

9 files changed, 140 insertions, 345 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index ba097361f8eb..da7a7a9c96e6 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/nova
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.81 2014/12/09 01:42:53 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.82 2015/01/13 04:16:16 prometheanfire Exp $
+
+  13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org> -files/nova-confd,
+  -files/nova-initd, -files/nova.sudoersd, -nova-2014.2.ebuild,
+  nova-2014.2.1.ebuild, nova-2014.2.9999.ebuild, nova-9999.ebuild:
+  general cleanup and fixing bug 536340
 
 *nova-2014.2.1 (09 Dec 2014)
 
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 059576b0916e..1f23bdb03b5c 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,33 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nova-confd 101 SHA256 d9013141618d1e8b8ba85297155747d9c8fc362238de7bba3108b9a2539c8c73 SHA512 4c7ec1d123f2cdaf394d1f4824df861bbe309b0b329db44080160d81746cd0fc9d4cc1b35da0f66ab075f1d4e835ababfb7bccaf4a2e931e60f2c0ac572a552e WHIRLPOOL 6a237357a3905d29a96b32c37f6d189e4f5cefc0986bb091e24a79295191332143741c604c2a9fd44484c75b3be89742a5570862cf0cd4ba225425f7f32b5348
-AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087aef172e5edf8 SHA512 cca06baba484d505f3a96643d836204a08e9dde50197531cdab2d95188b992a95a375a386b9c54fcc8e0a4f6167babba975db7510db1087f044afa39effe4eec WHIRLPOOL 4c667a5cc469826063a65879c1beddc98371edf295a273c9b8f679627cabfe2260d8b3bbdf9550d3894fc1525d63b9f98d6e939406f90ac5f2f745daa59311c2
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
-AUX nova.sudoersd 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 DIST nova-2014.2.1.tar.gz 4422203 SHA256 f2a600722e55ba170d756ee54fc20517214865b0521d52ca385336ea311e6d31 SHA512 f04330ecd41548e87ea821d6eb2487644f2ab9f06705b630d9f399bce65fe1abb64dedf37b549efa0ec480b3227c3eec543ee99860205f3b924f18909b202ee0 WHIRLPOOL 436a37b8cba721a5016649b2da40a77270df4608915af49ca18188af80b2d515829a80c620e89baa6138ec20e117fdda1380cf834b8891c73936b671ec8c07c3
-DIST nova-2014.2.tar.gz 4425305 SHA256 6f31b920087d9e961239b0f3b8fb80a0dcbb01f3123226252f52ed30539bcb58 SHA512 63d9d50e25f554a9bb7ea7a6218cfd3da10ce5203060ea39f9a407f2d64d7c9c249cac671c379ccacba940d4207c0434cc18728b67dfff9867f27a2ec08d8319 WHIRLPOOL 7864136cea9038c2e85b0a46dc5e7c7177f6dbc6326b59d8a98290173360afc9e3c1bfa61dcffffc9bf28a058dafb8b84880f0bad1fdb03ec3ed134b279f83bd
-EBUILD nova-2014.2.1.ebuild 6276 SHA256 c8385cf1be2de2cdc4c4fbc6b4db45c39d47c8329c54f4289792ab8a3e772eb6 SHA512 2fa218025fced548317567f8abfbd9075bc0e394e3f1b460c911dbcd38fe0e9c06abe752ab049bfa4437cff5ddc104d9b7e008f70dfad9dbe43f4918da37ecc6 WHIRLPOOL c7cfa4263e69ee7b98741f4b98ca515d7e5e946b0c3f844977eb7027712b9c0a38c27689620041874259612196a0e7b618559b5f4e432a4fcacef370e1241a41
-EBUILD nova-2014.2.9999.ebuild 6284 SHA256 743b74ef5b7cca78f37c18352f4d76a0fa9fc2879191b93a8e1fb67d0dea1fbf SHA512 c6c7b14bcd9dd98683bba5aeab6d0074105b42d10b624e38cce9b659e2c6ba956d23a9e441144b1a22229211a1033af0cb3ef01826e3b96f7248bcbd9ab8251a WHIRLPOOL 68032a9bb86eb723c266b29ac26fc556d097052ae627acc6c90c6f82a928461f7a39d238d5536553900021c219c0ccc9e36adf9db20370ce81cb91cc107a598c
-EBUILD nova-2014.2.ebuild 6221 SHA256 785f51a17fa2f768ef2ac5f6e0f7ce97402365d6d8811fffd31f363401b7c253 SHA512 f5ceb3431add34278b2ed9cd12b46e6623b576df8674c12c4e9817c8fc1505f5bc48d038080c80b9ef4f1741a9c94d37d2b8050ef0b3110156dcd51ca94a47f8 WHIRLPOOL 24966f8ba69a246248dcf7f1dfab66ce01dfbbb6657bf1d9793cb59a3308fa891f64122b6e332e480569e5736d27df3ce4a1997d7d15a24ea312169b3ddfad87
-EBUILD nova-9999.ebuild 5002 SHA256 23733c3e71e51c89f2052dea058e739d948872701aa778211b48f5b7d090fb24 SHA512 908ba7a512531263c0da227814c812a36fb634bf9e62b9a3971315bc64e74d1c8089680c91ae78b2d22981d6ff5fbd9e3f045ce35c85c603ba8ef09a85f42023 WHIRLPOOL a8364da03efe966c411ee598dc25bc6de1ef997cf19ffd06311a2c75c8c5c59cb0bc637315f3045e58d36d35f90ef160f9ec8846e3128aaa599d019e16f6370b
-MISC ChangeLog 18040 SHA256 587156eb0c51aa2705b476b4144b25a66eea6bc42cf2ced0c391bdf00a35f36c SHA512 c9c5b79818ae4ab39fd31b52c501542e066bbc522111af54596e0127b070e5c2fc5eeb62e7c76cac703a99a851ce769ca8687be556ecbb7dd05daedfff54beeb WHIRLPOOL 1e4dafd05375dd6678a8c14aee3693399af52a5a746f92d9fb97198c8b52e227f74d5bcaf98d0a27207c77668442a41007c28eb77629d56048212576a88a5a18
+EBUILD nova-2014.2.1.ebuild 6255 SHA256 4372f7ebe8b6e3a7553f94b6e50f784eba89c39e4989e521577b958123bff306 SHA512 0d72e1c9206f8b70157d06c5c7ae310aa519f3a5f62cc52c9a0fe4eef62dc8296ae8b4480a7639aa8f0f92eac1ecba491bbd9247b8325377a7aeaa9632e8dec4 WHIRLPOOL c823e5c4fad72f300aea9bb977932f1bd3180507c02b526a0ce528690dbc877b13269d3908288d140f0194dc1930a09c28f5feb6b4a3c0aedc9a5fc22d171505
+EBUILD nova-2014.2.9999.ebuild 6263 SHA256 15be77da2856e035815ed4583c48842159652032bd11a07a94021b21cb85d4ab SHA512 0e0181800ba4a70b8f499d5ca6d2b60d0d30b5bcb00ede1b69db7fd18bc20a8969e81e4c714cef223d5ce7b15932e8f58b525aed98aeb1ffaa43afa8e067368c WHIRLPOOL 578850eab991ac28dbd8e88b2a06f2fdd6cfc7113d635b53ecc673c390af3884d38321b1182f85bd35846c8051f60c1742ce3de66eda7dabe3df3bed2db8b5bb
+EBUILD nova-9999.ebuild 6252 SHA256 8ecf78790428fb73700143c8b9c804d86e0a5880b52887474bea0030da0ad762 SHA512 959ea1f3805908bd2b261c3bb5f96081f78c071cc6076069c4406108a468609ec5d32b299887f7b6a22cddec7d8d7af736785c05f352e8b60173f451459fea46 WHIRLPOOL f28f8f7cd9ed7ed02a86c69d6e984d64eb21f193a594937b26add6fe545c584eb6f06455de7b90079a8683c356ca4fff8eedcf4e3e26432bb1c150cf2fac9a58
+MISC ChangeLog 18288 SHA256 929a41dc03e244e615a1082fb4311d86c9c81551f57250b28ab7687a6584aa0f SHA512 1b8a9dbd4fdbe59f74961f8e7dd337799cc9431b4578a1e09444bc9ce976dfec46e00a4a681c0d2e3c5fb212a1ef048a858211eae32f7d81ba800db70ba4dbe1 WHIRLPOOL a9d679773dc97341ffc176628d810e1bd4f89c4b8a903c2738c8b17b26aaec2b95a0a586f8951ee103368ccc1400866ffcc010e28c4b53549682cfbd1fcc3085
 MISC metadata.xml 818 SHA256 2db18087f26467d27436c57cc533ab1dc0e31e643ed2b212a78eaf1e9e4d702b SHA512 cd64b2b5fff76252104a60670edab8a732ea0c6ab5e72b083f988bbc18dcf38e455cadd589e89597fa049009b60a99631306ea61bb02e14f1658a52b22d4c5aa WHIRLPOOL 05cca8681c60b074f53e6874f1e8a5b17a3ebcdd06e552e4ac6a2672f91077ce71e0d343f0db27ba0722a33bc5b1e97d38ad34dbe418e2961ca067d8b863c6db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhlPlAAoJECRx6z5ArFrD9KsQAJKzbCyj9tEJfL66W6vYgWJD
-spwLj4s1XgBVuEbEr86JvKMl4AjRdX/BxC5NYpTgQkZD7zwyb1ng2IRp8DuObVzE
-25cm4Q59zK6Axy6mxzVNQ3DuDSTfA8+ifmJL5miNTGmVYse0vcVI+vmOrJCPPI20
-9z0qS3T2T2mZ3Spqidq7ZPxFir5EickwZVpuSM1eXVkif+q3jo1v8kA8FJDkFDM7
-fxOHd/BOuUlagZwdNyAV7RXHRW24uFTJByInKcavzfYU7tpCHhtJeJFma1nePZWB
-5Yn9VaaoyHjHn+o/85L3sOjkHZYvELppTQNx0jiutszFKV3ukOoE7wR4udJJtEWc
-TWLXO/FAz0qANA0vjH8OiNluaIPeUzIjqxBtDuOMtDtMe7viIxJ8xIHz9WJkkGu1
-f+bxCytw4LNio6KStCR/DOz/vah1WsJNimRHHjC5pbsW5drmRVxY2ZVLoVgmKqTj
-2MKNupZWJz6KsG8DqV/J0TWdgjPHMu9tC8I8pSXIHl1Yh31H49gIl9KtRR9jNVYW
-vM6QqRsEIDmLvAPaGaS2B3VyZNonbBBLFQOHphGVdxPOmQD98sJnT7OMtkVBv6Qk
-j7z+qZS64MmWvTyn+Kv6IsHB+WyEhy78gCyfI6IOONXLFtxFh4nmJm3YogHxdPqS
-NFzyAi2cOka24akBoFi7
-=Rr0s
+iQIcBAEBCAAGBQJUtJwYAAoJEGSje+quGaTo66QP/jA0XrnWmfauctUfy3AxyZ4G
+gIYsxfASJRa+1VVwwzhZmdu5YAriATNx9XS/WwyAwaVOkgkDAquQkmjk4TexvhOn
+0xaEsy8iPIWrAYanYp6KqDeD22oPzoEUMEpB4+B6wa3CCIi0Gh47vXl81lynoF2s
+UjJOln/PqjEZUKKFOxpYpSEjj8/whhBf2jq42ktNBXqI0TBl5D2tMjdkeONx/zPy
+hwH2mALyuIq1WjcHb/pu+j81y1BtI4ZKYX26/xF6MQ7NGe/VCtvZeZUYQMrnJUBc
+mbS0gAwf/MBBWceDBE86buLgj3T2mfr33d2y/I0IBeriMVIQLOUVp7sIAlGWki9R
+focvogyMJ8sZu73B6TokwOeA5tIpK6yecnpx/LLNqHZyIXeSiQzJhjc+PeFAaJQu
+1SnMzd5qxgylpvh2/MoI2HmGCrbcrkjvXeJeFQ8IkOEjmYO4nnTg2uTAj1pyfDtj
+t8XQWJat9Upmqd33tSBIy1EQHaN+gc1gd/2JQe1+xMosdh5V3UQI4SGnp5nHnNQ2
+oIzUTgfsZ2NWGw7rQSNndL+rsFyDseBVqM/Ug0CCinAlizPDLgaZcHBAQO/H8u1Q
+3yr4IijZJB+IPrxo1fuTxQgfuA7XpJRiGW2fMcUiBJp23f4IAHvVktiMM3ZzIgtJ
+5BRQ9Pvjzc32pSvMb4pU
+=SZ89
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/files/nova-confd b/sys-cluster/nova/files/nova-confd
deleted file mode 100644
index e18217ea030f..000000000000
--- a/sys-cluster/nova/files/nova-confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#Don't touch this unless you know what you are doing
-PID_PATH=/run/nova
-LOCKDIR_PATH=/var/lock/nova
-
diff --git a/sys-cluster/nova/files/nova-initd b/sys-cluster/nova/files/nova-initd
deleted file mode 100644
index 952e865493b2..000000000000
--- a/sys-cluster/nova/files/nova-initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
-
-depend() {
-    need net 
-}
-
-checkconfig() {
-    if [ ! -r /etc/conf.d/$BASENAME ]; then
-        eerror "No nova conf.d file found: /etc/conf.d/$BASENAME)"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-        if [ ! -d ${PID_PATH} ]; then
-                mkdir ${PID_PATH}
-        chown nova:root ${PID_PATH}
-        fi
-
-    if [ ! -d ${LOCKDIR_PATH} ]; then
-                mkdir ${LOCKDIR_PATH}
-        chown nova:root ${LOCKDIR_PATH}
-        fi
-
-    start-stop-daemon --start \
-              --quiet \
-              --user nova \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --make-pidfile \
-              --background \
-              --exec /usr/bin/nova-${SERVERNAME} --  --config-file /etc/nova/nova.conf
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Stopping ${SVCNAME}"
-    
-    start-stop-daemon --stop \
-              --quiet \
-              --user nova \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --exec /usr/bin/nova-${SERVERNAME} --  --config-file /etc/nova/nova.conf
-
-    eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/sys-cluster/nova/files/nova.sudoersd b/sys-cluster/nova/files/nova.sudoersd
deleted file mode 100644
index f15b3285b7d4..000000000000
--- a/sys-cluster/nova/files/nova.sudoersd
+++ /dev/null
@@ -1,3 +0,0 @@
-Defaults:nova !requiretty
-
-nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap
diff --git a/sys-cluster/nova/nova-2014.2.1.ebuild b/sys-cluster/nova/nova-2014.2.1.ebuild
index 41600e504f7c..616773d06256 100644
--- a/sys-cluster/nova/nova-2014.2.1.ebuild
+++ b/sys-cluster/nova/nova-2014.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.1.ebuild,v 1.1 2014/12/09 01:42:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.1.ebuild,v 1.2 2015/01/13 04:16:16 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -130,7 +130,7 @@ pkg_setup() {
 	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
 	if linux_config_exists; then
 		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
 		done
 	fi
 	enewgroup nova
diff --git a/sys-cluster/nova/nova-2014.2.9999.ebuild b/sys-cluster/nova/nova-2014.2.9999.ebuild
index c1b2c25ffdb3..be6c4ddba7f7 100644
--- a/sys-cluster/nova/nova-2014.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.9999.ebuild,v 1.3 2014/12/09 01:42:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.9999.ebuild,v 1.4 2015/01/13 04:16:16 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -131,7 +131,7 @@ pkg_setup() {
 	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
 	if linux_config_exists; then
 		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
 		done
 	fi
 	enewgroup nova
diff --git a/sys-cluster/nova/nova-2014.2.ebuild b/sys-cluster/nova/nova-2014.2.ebuild
deleted file mode 100644
index 4a8659f41b0e..000000000000
--- a/sys-cluster/nova/nova-2014.2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.ebuild,v 1.2 2014/11/21 00:18:17 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-			  compute? ( || ( kvm xen ) )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND="
-	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
-	<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	net-misc/openvswitch
-	net-misc/rabbitmq-server
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	kvm? ( app-emulation/qemu )
-	xen? ( app-emulation/xen
-		   app-emulation/xen-tools )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="NBD VHOST_NET IP6TABLE_FILTER IP6_TABLES IPT_REJECT \
-	IPTABLE_MANGLE IPT_MASQUERADE IPTABLE_NAT IPTABLE_FILTER IP_TABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK X_TABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api cert compute conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-	done
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
-	doins "etc/nova/api-paste.ini"
-	doins "etc/nova/logging_sample.conf"
-	doins "etc/nova/policy.json"
-	doins "etc/nova/rootwrap.conf"
-	#rootwrap filters
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-}
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index 5c65a8810fa5..9ec853185595 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.18 2014/09/22 02:15:21 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.19 2015/01/13 04:16:16 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2 multilib user
+inherit distutils-r1 eutils git-2 linux-info multilib user
 
 DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
 HOMEPAGE="https://launchpad.net/nova"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
+EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,78 +20,120 @@ REQUIRED_USE="|| ( mysql postgres sqlite )
 			  compute? ( || ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo
-		dev-python/mox[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]"
+		app-admin/sudo"
 
-RDEPEND="sqlite? (
-			>=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+RDEPEND="
+	sqlite? (
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+			)
 		)
-		mysql? (
-			dev-python/mysql-python
-			>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
 		)
-		postgres? (
-			dev-python/psycopg:2
-			>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
 		)
-		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.12.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.8.2[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-migrate-0.8.4[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
-		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		dev-python/oslo-rootwrap[${PYTHON_USEDEP}]
-		>=dev-python/pycadf-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		novncproxy? ( www-apps/novnc )
-		sys-apps/iproute2
-		net-misc/openvswitch
-		net-misc/rabbitmq-server
-		sys-fs/sysfsutils
-		sys-fs/multipath-tools
-		kvm? ( app-emulation/qemu )
-		xen? ( app-emulation/xen
-			   app-emulation/xen-tools )"
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	dev-python/posix_ipc[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
+	<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	net-misc/openvswitch
+	net-misc/rabbitmq-server
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	kvm? ( app-emulation/qemu )
+	xen? ( app-emulation/xen
+		   app-emulation/xen-tools )"
 
 PATCHES=(
 )
 
 pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="NBD VHOST_NET IP6TABLE_FILTER IP6_TABLES IPT_REJECT \
+	IPTABLE_MANGLE IPT_MASQUERADE IPTABLE_NAT IPTABLE_FILTER IP_TABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK X_TABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
 	enewgroup nova
 	enewuser nova -1 -1 /var/lib/nova nova
 }
@@ -109,8 +152,9 @@ python_install() {
 	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
 	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
 
-	diropts -m 0750 -o nova -g nova
+	diropts -m 0750 -o nova -g qemu
 	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
 
 	insinto /etc/nova
 	insopts -m 0640 -o nova -g nova