final pass at compute-only

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

4 files changed, 51 insertions, 35 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 00aae7749588..9bc9eb551285 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.93 2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.94 2015/05/15 07:30:26 prometheanfire Exp $
+
+  15 May 2015; Matthew Thode <prometheanfire@gentoo.org>
+  nova-2015.1.0-r1.ebuild, nova-2015.1.9999.ebuild:
+  final pass at compute-only
 
   14 May 2015; Matthew Thode <prometheanfire@gentoo.org>
   nova-2015.1.0-r1.ebuild, nova-2015.1.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 0de00b83643d..ede5412157f5 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,25 +4,26 @@ Hash: SHA256
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
 DIST nova-2014.2.3.tar.gz 4436742 SHA256 5fc1f02c887a4ca9b1968dba71864cdb5e81bfbee3da398c64260be0cf1d7a2b SHA512 320ff0b3d6257834b96629101b0c1d6c4b240004dc8f9775759aa6532d166c8849bc3feef04e001421a75f36bd3516b8df0b595af30d020c3d9c22af843c5099 WHIRLPOOL 653c2485f89df171c03e290ce6cbc61c0a964d64440a0de9ebfda24dec6abac4e1c633d0a0057d7e531590e5bc9d3f048a0fe8b89c8db22007ef72ec24e3ebf7
+DIST nova-2015.1.0.tar.gz 4541653 SHA256 7279d18cee6f13e19443f7cdc6a296566674d66049ee5c9af6d1c973115f16d7 SHA512 a315f7bbb73de4f26645ffed42663af377ab5cd55db82eedbcc1411208e276bc5dc68c2ccef07a35943f6643f3862ca44a9b51f8e259322bb176c74485d98cc5 WHIRLPOOL d885527d6479cd1c760b6291732c5a7e01b472f536d4b2a55cd4b829f32e4d4b213d946870b4e52c47a86973c7d97fd89ebaed752256e5286c91222973c68824
 EBUILD nova-2014.2.3.ebuild 6067 SHA256 b8ea6d84e8bfbf5c5658b10938d4da15b8dfbb9044b4b4b475ebeb3a89a75793 SHA512 38188b2c1e0eed1fe23002ccfaa81f6782b74276b587b21765f83b359ae67f8757e6222b0bc2c1d819f238c2c943c1ebf5fdab5da1b0bb1de08934b04ba16550 WHIRLPOOL 2db61b4f347a886465b29c02901d9ec3ea7f34e0abb49be18e754269032a7aa932221f918d905a1add52d28672d0e28629dd7d55213fec71ba45b318b4edd5e3
 EBUILD nova-2014.2.9999.ebuild 6075 SHA256 eefe8729db7296ca360cddabfde23258be0a908921d94ab25ea585e199ddf9b1 SHA512 6ebfc8afdcfb33aaccf0bc137360c563572c743d3fb937e18805eba5d13f9a6c027311917327a519ee71492070875528d58fff3f1747b35e1f0031f973decf68 WHIRLPOOL 989b23c9d9edd618c6338731b5763f2a258de2241830e934bfbc26f38f105b61206934ee78188eb760fa47f63f1f65b9df8bf7e2279eb3596d8a99089f74f322
-EBUILD nova-2015.1.0-r1.ebuild 7005 SHA256 083a9cd5343861f98d8615baedf45966d20ec4e08451320615f01c6db842f7eb SHA512 e48967b0cdc902433e0082a4b07cbdef5e3ff3c30df4dc34bc86b2580eec6077fef429a8a4629dd7c4386d7a1cb9a08c0f42b83f9bf6a8c607137760ddfb7ffd WHIRLPOOL dacca38547daa91aaf719fec87e09055d078c4804e494f3b8a9934534991d3377b8c1088518c975f9b052c8db0e5d5cece880534aecf871c66bdfa217910ab8e
-EBUILD nova-2015.1.9999.ebuild 7000 SHA256 ad6c720da3ecbe99085255b6421ed103aebe6b2246391f512913368416c354e7 SHA512 cc497ca98df9bb50c183c871a07cbd2ded18e44af8be5868334d2b22b484793a5cf2e710c219608a72bbbbca8fbc39158808158dcf1c76f662356c49a8e70550 WHIRLPOOL b5d87e16f161e815e8b07ee4987d60c682e451c21ab60bd1ad18116704b1b4e30fcaaeb6bc88608988f84ef9a59116ec197cbcb100097cdb3a927272cc19b847
-MISC ChangeLog 20123 SHA256 c7502a5263ea69ff19a27ccd94b83834fb1264c5c7a3fc02720d3eef59147963 SHA512 30f0a3328b1d20e9926527d5895541645c1c7905dffd9013aef351bb5af25e5ad889d5887ad8ac321e22ff64954d6a4eba8bb62e7266529e0704d25ce5349b50 WHIRLPOOL 3dfb9d7de721e948713a56c3f12813aa827eb324e260ce967b0234dd852fc3907aaa27add816569f8ba27ebe8884cecaa8d60a0f954a5ed0d51006761662bdcf
+EBUILD nova-2015.1.0-r1.ebuild 7191 SHA256 cd191baa2f1d08bee19fe4d353553b16ed485ca6e52fce0262640484f09ddbe3 SHA512 f55a79910f699673b374de3bb81e3c7ce0442e0d5ebe365b0209923a72e7abf12d472783fbdbd43245982f0b6ae6e2a592f9149bae7578d57257761ae8b876a9 WHIRLPOOL 8fd735b9d889856254c652adee5ac94a9eb0fce7b67b92a1cc1fca7bb82feb1a7568e81b46a18b1ae1eef1b853d3f8822ba9e34901728cf8dbcded1f5323dd1c
+EBUILD nova-2015.1.9999.ebuild 7196 SHA256 675e10130cdcc2868cde5ea4e0d240cc3e63969058709a9f01b63fc29b82987f SHA512 e38e73408da654673dab6a636c219d2191883d9ca18c7c8a2770b162f0fe4549b0b2c322b77c959cbbc46e17c1842d86c2445e1707468a225b0f639e3a935659 WHIRLPOOL 6de948e453f9647e42dfc0b4d708e4360c867790039052c20a056c1800064f09a705e3fcaf69ee377d8cb7fce708038a43e0362a35725047c5c903d242e02f23
+MISC ChangeLog 20262 SHA256 cf6c2889e352cf24c0ec68994fbca1b643bf6745ed7332e7f8fa0c5eb8ce075c SHA512 4e84b70004fd55cdde1d8d158f932cf9ba6f34f49dd54aa9da9c6f0e825c7af74f327e4885e20d4879d891540b1ea04dc5f6f3e86bc8b9cbcfd99814ee939529 WHIRLPOOL 6a0d415b81816de25444d55ebab9381e5ece058665178cdc2232a65473f0c5affeea158e22288db69e0a8d37e75245f57bca0742027c703f0615e6231655aed5
 MISC metadata.xml 1051 SHA256 e99ea9caf3ec3a6003b9006526f2f5b9f24ac5b1c0a11885da0f26d065687fff SHA512 69cbde4ecedadad05a1f575d9cc63f8321a41cc1222517e2497880b072c1f2f734b87549de5c8c28ab490fecd3eea78e7efca90f8a4e417179fcbe9505b73ed7 WHIRLPOOL 39a982e144c029ba2f4a4aa937afb4aca00d87769f92b953847113fed20bef0788830285fb2b56d44076ca779844059d5728cc49ce273ccf900043137d88387b
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVVCLiAAoJEGSje+quGaTo1KoQAMgf72VsZHJRErkaEq3aOlul
-opmHcVZTPPO++qteIIPGXu8Waxm+lqj87X8tjwF/Beesol50+D79rXDBrIQGg9wT
-HslnX2EEt6BbKbMwTGMtuYwZZABgS2IGO7UQZ40DHwvXcUxiZdjKoL8SzwsPBXgA
-y9cjbOjPgKlCjrHv8nLcP7aL3t3Uy2thh0zr4PWUNIfNossmRb87cz82Wpk2/HNi
-JeysmiGXi2qaTC88doEU/4O2zCjBAN+OsC5yVmWPPmjD8KeQ+H4DfZvaG6E7a/gu
-y+6Cptmwn9FRbeTLCKuTYPUQ5yii8PNe4G3tjOkpsO5qAgPTHdqw9oayUsDJB23Z
-UK0c5mwOtg5tA3NuPvV/gR3aCVGTOi82r98kXHI8HccAylrTUR16CL8SM+J9QIHG
-n1SzdENhsbffvJK/uMojo4Lr45lXjzDsaZ2gOPkUUU2uBmqgJ6LJX6yW7nSyJvTn
-gLCr4PxP8ST51wssJfQk6Rw/330hR7IpxwJi43r0w7XcyeoDJj/PJS3flla8HDIZ
-PfBbsohiKjkJwiZiahd3bS9F/h56cdAraYfahtuHtAKcZR7EtIJOijHJaT5Wa/B0
-5m6Zz4/YZlR3YHDDq9AoUryXdaupkCEoa9LHP+6nFlunJhO2a2pQcNWcx+ZmafaB
-cZdIREfvk+XegOs7bq3z
-=5qKO
+iQIcBAEBCAAGBQJVVaCdAAoJEGSje+quGaToNKEQALaTAf6EJW2OwfLc7HPm6XVx
+0coez5UHPGNWRz3gOOKxeORFPq6VqC7bWWPjC9zeB1nBSewzkFMkIKuP/r1m1ha0
+3TCH0pZ7LwXuZVIBZvffNmaImCdyS+MUOJWj7GetVWRfOtLzJwoxtZd8tB2YQZH3
+eSPVKT/PafHAdNgqnV2GBilsg8ei2OuSoHb7wgevIMz0GX4Rl5WJ8PAVCUpnty+g
+E8lTSyUYDYDUUVdtICtQa39tJws/azFCIRXfY/Z6JNm0cjtHs12/SZK3FDT3xo/i
+IixET0FMlFd0QxuiESe7FQ6UiwEYtFx3+lT7FflKeovxJjoyToaxY0XSmm7RcWyQ
+lt570nHGMM/DssOxLcAn9dRzb55ykFs3V0DHk5uA1VT0+E7KJ/SjyJs724HMfcLV
+40Ofglji7KeeWdGBzXckVwDwS/P/4N1OVctQU6EnEXVvDinOaucoZ/tWfgq6GETt
+edpBRhJm9/cqQ9UiyVvFZ/RAmdlKJ+XKhiGdXggHz/c6wqYf/hiBRbnoVNvcGC/B
+24DDUjoCbU2beTZae95WeSZz5Gmbsd20Fy4tSeeSn0wDMVIvRlOE6Vk/6AHphnKm
+6Or393J7pLg1jdC8nsKxQHUf1DFI+su3BIJRFP7ELM6CHfwzJhxEMMsXhfsLu1q5
+qUyyfwu7pDj/eh+XsP5y
+=2AjD
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2015.1.0-r1.ebuild b/sys-cluster/nova/nova-2015.1.0-r1.ebuild
index 3f66477ecc54..f3dc79a4de45 100644
--- a/sys-cluster/nova/nova-2015.1.0-r1.ebuild
+++ b/sys-cluster/nova/nova-2015.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2015.1.0-r1.ebuild,v 1.2 2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r1.ebuild,v 1.3 2015/05/15 07:30:26 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -9,16 +9,15 @@ 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"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="stable/kilo"
+SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-				compute-only? ( compute !novncproxy !rabbitmq )
-			  compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( compute !novncproxy !rabbitmq !mysql !postgres !sqlite )
+						compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -27,6 +26,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 # barbicanclient is in here for doc generation
 RDEPEND="
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
 		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
@@ -133,7 +136,7 @@ pkg_setup() {
 	enewuser nova -1 -1 /var/lib/nova nova
 }
 
-python_repare() {
+python_prepare() {
 	distutils-r1_python_prepare
 	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
 }
@@ -146,9 +149,11 @@ python_compile() {
 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
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
 	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
 	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
 
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 5ae2abde5e91..1327b8f89ce2 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -1,6 +1,6 @@
 # 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-2015.1.9999.ebuild,v 1.7 2015/05/14 04:21:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.8 2015/05/15 07:30:26 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,9 +16,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-				compute-only? ( compute !novncproxy !rabbitmq )
-			  compute? ( ^^ ( kvm xen ) )"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( compute !novncproxy !rabbitmq !mysql !postgres !sqlite )
+						compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
@@ -27,6 +27,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 # barbicanclient is in here for doc generation
 RDEPEND="
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
 		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
@@ -133,7 +137,7 @@ pkg_setup() {
 	enewuser nova -1 -1 /var/lib/nova nova
 }
 
-python_repare() {
+python_prepare() {
 	distutils-r1_python_prepare
 	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
 }
@@ -146,9 +150,11 @@ python_compile() {
 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
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
 	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
 	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"