oslo-config, novnc deps, libvirt deps, kvm/xen deps, initscript name change

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

7 files changed, 74 insertions, 42 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 50044aaa3e0d..571b29a752a3 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.29 2013/09/26 00:15:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.30 2013/09/27 01:41:21 prometheanfire Exp $
+
+  27 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
+  nova-2012.2.4-r10.ebuild, nova-2013.1.3-r6.ebuild, nova-2013.1.9999.ebuild,
+  nova-9999.ebuild:
+  oslo-config, novnc deps, libvirt deps, kvm/xen deps, initscript name change
 
 *nova-2012.2.4-r10 (26 Sep 2013)
 *nova-2013.1.3-r6 (26 Sep 2013)
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index ca958f495ccc..8d2eab825524 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -15,26 +15,26 @@ AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087a
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 DIST nova-2012.2.4.tar.gz 6286004 SHA256 883a44282514b484a1187c07875834b9c4648555bf20002aceb1d6731ebd0252 SHA512 c05705c7802035232921e7ca9cdcea05571f4771dae573f9364b740553e470d8e4b4e832bf04120c089bad48a75b8493921eefeb28383f70620495a935ad6ec3 WHIRLPOOL 9e8c56b1a66f15f5f6218413e1cd518a0e73f371baea774023a11ad38abccae3e172ec0894fd77f59848685d1993451499916b94c62289d16f57470005e7c123
 DIST nova-2013.1.3.tar.gz 5780115 SHA256 f7c25186920daccb16867c5fd272318beb8cc076e5a55f79b5906618ef2724f4 SHA512 3de29f1cf0789285c7600796588058f056d4196138584bb5ec13a0ea034bbc0569d116a668db67022e302b29995af5960093af1103996269d73dccd62a5dd238 WHIRLPOOL ebb06733a710764004f99da2a69d5479cdd50e35da6d0992233ab9ca0a7a5854a678c5d184d40f97a66fa3abd052b1e6de4629963dd58292f677707997e56239
-EBUILD nova-2012.2.4-r10.ebuild 4689 SHA256 3a2abaaf3611529372b719e31189d9daef826122348f9c4bdfefaa0deb820004 SHA512 491a4f3d8991f5876d3747f47f325fcf102f88ca94ccb3cca19242e3d160273523c369303db25a60ead35916fdaab1e5d6533522f5bede672d24949c036dd7c1 WHIRLPOOL b641ecd59ed358407ce4777f5d455374c7ae401e855a527d92a28092f23502150140923ae46a11b59b4b5e830a4919df78ed075f01437e3dcbe7c1f0a030d034
-EBUILD nova-2013.1.3-r6.ebuild 4825 SHA256 1f6ee4864f11a720404a872a72dade8f0b30266559cfece543d86b96ce0f45e1 SHA512 e05b83efbccb55185da6cc91cdfa749b3f89593edc27152747bc5ef4bf59a0ae59e21ab1774ea40f6e34fb9005844c879b308e256fb14d57848e6516dee4c281 WHIRLPOOL afe3e42f56e5e4657803b605f6a90a71c309118eb6a7e5923d746c1b94cbc4c7c31b0e4f55a9760db6fe59447ee7c967cd519d81466b95d2a32da27a6a9c913c
-EBUILD nova-2013.1.9999.ebuild 4742 SHA256 0f6dae6f9daef5b3d652434af15d7e6dd9f6067e9b5db5f92d7b19c17a0b8d68 SHA512 cd6e3d139e0ed8e98143bc58ed418c727bfdebafb4584ac9b932db34360e75d9273eb2dcfbf59ba026253327f2161b3cd4afc974e1ad3cca73c1b1919e85f0e3 WHIRLPOOL 55b52daf1787e3dc5171e9a3113a35a3202589cdfa7df7f9afce233f0c28fdbf595deaa81340d669fe0434dc803e42c668c2ff9dc9bd4b283fd246401513ffd3
-EBUILD nova-9999.ebuild 5012 SHA256 be8c3fbb67ed5b2a08b2b1741b7e445209458fd927ddef3e22f9248cb29f084b SHA512 2036f8daaf95d75c121ce597d6e3e2dc6e8ef3412a38a10d1eb3f1110f0cc00602aed8c30fa0ae2fb525762dee57168d2ae831f1d4301f8e35b40447899abb0c WHIRLPOOL 3ce00621f30b736f082597073c124af6667aa492a9d740a11273e7cb20d762a41612c194bebafa7a6816cbe6f136b6d26a1469f5d90bcce1a7a9b89595b4dd39
-MISC ChangeLog 6995 SHA256 d6f4a49b3c8938ea7c8de4f1e0b63a7bcb217c713f265a9df8834da7e2442906 SHA512 5f74a5f981bacf7b00645910b2b13b9a48585c72897b9f88f03d1836f35543a46668867fe2fce015c484e956d5fb53bff0da9271fbddecd9c94368e5b60fed9f WHIRLPOOL 9696135be38db87f67de59bb575b7a1ef46c04c2e0dfd013be96a923a3b56bcc592cd85d7ac8ed45aae6eb3809a574ad990541d6e060b00557df23ce1f986495
-MISC metadata.xml 1320 SHA256 62fa65c1ae4717c2cd0340eef975d759710ed33d467c0603a48f23530d1dbdc3 SHA512 028077c33e7788e7825edd29d2506e6580df33d7b471fc7bdc1bf6cce4d01d3a4f1f9bbdbe3f62a9cb19929681dc0d23b6f56e597e2d9eee4140a21c4619e7ec WHIRLPOOL e5be2b277c7ac69fa8bb1696725b67eae3873de8a1d12c7fcf677cae757ff2321b9d2f1170e4cf7f520a58a8e16ca5d439c2d8127dc4178074f26c6883d0e3fd
+EBUILD nova-2012.2.4-r10.ebuild 4881 SHA256 b1853e5756db8d571c44c61074a745ecb20fa7373389978aec8247a39061fae6 SHA512 2b97edd4073c0a551b3b8b74ad9c6d4662c0c59f5fca54adeeaf027e2499d2aaac951e81e45be2bb2d75ececa4085959c8c3e1a356539582e6bace93035144f8 WHIRLPOOL c31370d331d789f19f4ea7a611a2306e3379d3822e97b34ae4ebd1119689673cbbaf593554ed72b6a97bf8c11652a0b1cfe416ea096e0970200abc4c3df1c03f
+EBUILD nova-2013.1.3-r6.ebuild 5067 SHA256 ccd227c595046b7d9cc6f8856ed7d20df3b7145c6fa07c7484cecef60ed55a9f SHA512 b62478aac8cda2032250c1fc737a04738c2df15c5ebdab4ba4f00ed3b7ed89f1224cd9cab4c637dfa65e89ce869ef928a4e52ecfaeffdd08f8e0f7e36772c2ff WHIRLPOOL d6dc24efdbdc2425020d2c6952779a307513a49e3fac858ff2751e0bf19b2f13d498436a16b6114c69796a7fee35031ac7da7e714865f8def42d7bd33b16a49d
+EBUILD nova-2013.1.9999.ebuild 4984 SHA256 bf7a1f22055db9f1f9d958174b5ddf5470838badc2985cb3bef6af7909433daf SHA512 969fa71e6f0829164daf3aeee3c31e7f800ec8e9c9e41af106a00994fb27d7622ed93c697b0acda5343cb45020ec0fffd29447414734714af281413e96d0018a WHIRLPOOL 0dc894111c2729fa37f138afe4e6bf020cd16e59619bc3a398ca5bc39695b09a69f54c60fdcddd379fd85d9fa1f5e4352988c8e6b63bc6a2ac2ba64b608c569b
+EBUILD nova-9999.ebuild 5155 SHA256 06fe7b13fc1828edb3b1b94f83633646ee4522679cc494422f3815881cc5a5b1 SHA512 eb81e3d9384f4fdaf9dee197f254a9358310432d69daeb2bb9c08c376103f3cf9d4b551794a2c5e0a2891e2efee23c2e56c7498f1bb7a338c4f6bed700b1cc98 WHIRLPOOL 540ceab70583273078238220c755183bcf9e4b42cd926622577ac4ff1da7414a1ec6c25161ecdf583f438d9b6da05e927dbf534a687426800c7fad5d30489e48
+MISC ChangeLog 7243 SHA256 132a1865c7e2f5a7fb349360f6c2d31e5ecf665a31d78eb682d6bd375fa7d7b9 SHA512 8d0482f4867ed06b147c171064017e99f88bb2afecba671dc2d3368cf1c0347f3692f6763c849d765e1c8074aefb7fa1004656cc0308f1e36dd9307c98ac436d WHIRLPOOL dff837f578ec14619368e0c000f278e4dd9ea11f7981b36cadecb6d7fe9e87d620e2713156e995a0a8fee6e3f074a1eef37594c481d937d304ba37ae192b43dd
+MISC metadata.xml 1427 SHA256 6796df9be1a67243c07e9bf04435b437dab2928dcbb7a9d6305c4f66e2f92279 SHA512 ee655e387f0e51b25afc3f60aa9c6101a1960e5e736393f2bc1cc27f522325681fa3763d361b1dd333f0a4ff7ef82e66af39d0932d4f2d503d047722350fae27 WHIRLPOOL d95e9bc829d2a5d3f5603eab813f69a663c2495acfe97b091574f375d923ebd65f016718b0ea5ef6dabe9d3c07196a4f48c302d91fe81ec1c9daa33ddcc636e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSQ30KAAoJECRx6z5ArFrDOzYQAKazbTM8bivE0vU2PhAGT57N
-3w8ECb7NB5TKtmOPL+lcQ7ypeK1RN583RNDtgrbm66AaDa6uqrBUEtuMUEBSDYJM
-HmBWQN/IXfTZWopEFPrvr7kXyFRmWI40H01Mz1YZY3DrucnZS9wJRJW/YW+WgmP5
-qDzZXanyBfnS5jgRboWRPVDzdJu7lFd6XwQeEMghuzl/S7TO6s1yW9mAm+TiFsVC
-Dth0yaLENeOkXsaw6ob58IJrO/Hpw6j4bjCsCVHE9AESB+5hX6OPgwFr24kezbCI
-KjOfKHTnWrDfndPN1KDVRqQtF/cjk+pBJskwY0GCbEM3+ryYnqfm52Tnwvfptpmv
-xnnY/vidtqTciKW5oE0oYAMQcl+7nIIqRP/ztlBk+YQWdGOfaBVYeuPJXrW5nj1v
-hv/RyUv/fGesXdsDY6qFj3SL59V6wA2gneIHSsd2xzpUmmikfL1oQ/RZLrDRsajS
-pHM45WUtV+LT7PMZ2eIua5XI3ZbmzCpUdoyoorOqcSYainGelZOLXHJhosqLnmm8
-L4FWoJHBpLDsPpcW5Zpuo5IGvfokoVaDgyK1FD62Xp6RcDDlML0k+YB4I+lcYwaj
-XkR8NM5FM2rQ0gNdoOBu2h5tr06hB8LbHOnG439aAYygCeKcTp+uuPldv1ykRXJE
-aqLV/N5hTCuqh9OQfDs9
-=YWVG
+iQIcBAEBCAAGBQJSROKoAAoJECRx6z5ArFrDhrkP/iDg6pKf30Z5vjmrFQSg2d5N
+Ptot5RUCAidLOkKqD58pWFoCMiYKbfbn1B5f9mtj7Y0UV7VC7/lMa6u9EeW9+YBb
+WZoHMTIPHheJBw1cWZKuyU3ufD93D0FtqtIjEAYB4Z6/xS10mTcgvPaZBohQALEX
+Pn0UndoDIHA+u5KaR7NuHcVCGJO0+gq4DVMEXO4EoF16mDgDgmLh7T3BIvAkL6Nz
+Jy9SjNeEdhXhtCELnWkJgVV+07XllLdlkQwN5TK+UiImdsCQbg0U4PYawx/xVH7z
+uOdn44GBTazVKE/ByQlxhyRWZvIVVeoBm9EmjKXG/+gDOORYTUXLly/56I7t6eRW
+LY8xlP7LlMwZ/WyIApDMsFLl51XrlC/yatT1kQZnO5XgqgED3+zmOIqU+6KYTo9j
+KAFRzUBGdUPXiyK+It3qc3owEwJXXsPD0miCeo9oBfr5YDulEbmXwCjd/yICLbo1
+iXkjABM1zQTqcgrdq/2mV+6iPRS+85cXO5ObFfRqy1kfV1jj8OIBG60ShwilWXhj
+Iph9XuLLp3HeHr+Z3oLKtmhZceeymUg1oKj9C51o8s7JnZfStjYDlDiJWzDlU0TO
+5WIAHhDAczc/rbQHjA2G5UTIk/MVqIpTa8D5H1fQcNxRjBCMkNt2ia9wEwmC9e+U
+cE5dGNLF0MVhJPcpTZyy
+=9lhY
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index e6379ce54911..ead7f52988a3 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -15,10 +15,12 @@
     <flag name="compute">Installs the initscripts for the nova volume service</flag>
     <flag name="conductor">Installs the initscripts for the nova conductor service</flag>
     <flag name="consoleauth">Installs the initscripts for the nova consoleauth service</flag>
+    <flag name="kvm">qemu-kvm hypervisor support</flag>
     <flag name="network">Installs the initscripts for the nova network service</flag>
     <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
     <flag name="scheduler">Installs the initscripts for the nova scheduler service</flag>
     <flag name="spicehtml5proxy">Installs the initscripts for the nova spicehtml5proxy service</flag>
+    <flag name="xen">xen hypervisor support</flag>
     <flag name="xvpvncproxy">Installs the initscripts for the nova xvpvncproxy service</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/nova/nova-2012.2.4-r10.ebuild b/sys-cluster/nova/nova-2012.2.4-r10.ebuild
index 365506624f39..7d49ffcd7385 100644
--- a/sys-cluster/nova/nova-2012.2.4-r10.ebuild
+++ b/sys-cluster/nova/nova-2012.2.4-r10.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/sys-cluster/nova/nova-2012.2.4-r10.ebuild,v 1.1 2013/09/26 00:15:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r10.ebuild,v 1.2 2013/09/27 01:41:21 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,8 +15,9 @@ SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-admin/sudo"
@@ -49,7 +50,12 @@ RDEPEND="~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.1[${PYTHON_USEDEP}]"
+		>=dev-python/python-neutronclient-2.1[${PYTHON_USEDEP}]
+		app-emulation/libvirt[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
 
 PATCHES=(
 	"${FILESDIR}/nova-folsom-4-CVE-2013-2030.patch"
@@ -75,7 +81,7 @@ python_install() {
 	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
 	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
 	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
 	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
 	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
 	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
diff --git a/sys-cluster/nova/nova-2013.1.3-r6.ebuild b/sys-cluster/nova/nova-2013.1.3-r6.ebuild
index 18889d120522..b509a1e2403f 100644
--- a/sys-cluster/nova/nova-2013.1.3-r6.ebuild
+++ b/sys-cluster/nova/nova-2013.1.3-r6.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/sys-cluster/nova/nova-2013.1.3-r6.ebuild,v 1.1 2013/09/26 00:15:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.3-r6.ebuild,v 1.2 2013/09/27 01:41:21 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,8 +15,9 @@ SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy xen sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-admin/sudo"
@@ -57,7 +58,13 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		<dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		app-emulation/libvirt[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
 
 PATCHES=(
 	"${FILESDIR}/2013.1.3-CVE-2013-4261.patch"
@@ -79,7 +86,7 @@ python_install() {
 	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
 	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
 	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
 	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
 	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
 	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
diff --git a/sys-cluster/nova/nova-2013.1.9999.ebuild b/sys-cluster/nova/nova-2013.1.9999.ebuild
index 1aa2da16b064..6b30ed997d7f 100644
--- a/sys-cluster/nova/nova-2013.1.9999.ebuild
+++ b/sys-cluster/nova/nova-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/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.8 2013/09/26 00:15:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.9 2013/09/27 01:41:21 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,8 +16,9 @@ EGIT_BRANCH="stable/grizzly"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-admin/sudo"
@@ -58,7 +59,13 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		<dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		app-emulation/libvirt[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
 
 PATCHES=(
 )
@@ -78,7 +85,7 @@ python_install() {
 	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
 	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
 	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
 	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
 	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
 	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index 8ae9b6dd7845..753cc368d5cb 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-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/sys-cluster/nova/nova-9999.ebuild,v 1.9 2013/09/26 00:15:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.10 2013/09/27 01:41:21 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,8 +15,9 @@ EGIT_REPO_URI="https://github.com/openstack/nova.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-admin/sudo"
@@ -62,9 +63,13 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
 		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
 		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
-#oslo.config-1.2 is required but not released yet
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		app-emulation/libvirt[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
 
 PATCHES=(
 )
@@ -84,7 +89,7 @@ python_install() {
 	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
 	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
 	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
 	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
 	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
 	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy