slot conflicts, bug 508002

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE1DF22D5

5 files changed, 35 insertions, 21 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 48ef25d27b14..1eab02864c41 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,12 @@
 # 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.62 2014/05/05 06:17:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.63 2014/05/11 12:38:13 vadimk Exp $
+
+*nova-2014.1-r2 (11 May 2014)
+
+  11 May 2014; Vadim Kuznetsov vadimk@gentoo.org +files/nova.sudoersd,
+  +nova-2014.1-r2.ebuild, -nova-2014.1.ebuild, files/nova.initd:
+  slot conflicts, bug 508002
 
 *nova-2014.1-r1 (05 May 2014)
 
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 897c62d5ed08..0672514b3e05 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -5,21 +5,22 @@ AUX CVE-2014-0167-2013.2.3.patch 5832 SHA256 b6ec01d6ea62424b0340c7004cef69b0bfe
 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 629 SHA256 c3b0dc4686aeab7aa8fee675a8817baaba59d802af3ed808c8ea0167fbb42142 SHA512 fff31575c12bc4aab0a5a855ba5bf9fd18390c28be19ccdcf4dcc58c705ce74ac1f9eb0b163197cd9510bd9c168c15c10da11afcfa9ea57950fd3829466a509f WHIRLPOOL 0a3877faecc9efb80a489664f2063ca86e4615584421d55b43f2fb94ef41989e7944a6b439ab73376f9a76156b0052631aa207fc6300c6ff624e7a7be9b771db
+AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
+AUX nova.sudoersd 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 DIST nova-2013.2.3.tar.gz 6888463 SHA256 02902cb65b5adb0419c69cdb03ea2a0cfdfe8f7df342be44f3760d66cdecb61e SHA512 fd525e6f3f13e9405d4e53faaf44e88a3a4afe8491d9241edb6b66b61b9d8ec279dd0aead70ee5e6d166caf6879927fc01e57230d1129a7b2e2a794e32054570 WHIRLPOOL d4551136683595fd5ab831d692ab90a1aea177df4266341399726923ce285b6b7852705c89a516c146f88903d9a7fc4b3879419f158a68581144453f0fa36e8b
 DIST nova-2014.1.tar.gz 7951303 SHA256 c8fc0e03a826b2b659c77e24737b267588f2c71e3bea9527c71e55a2c76a54d9 SHA512 0893d1ebbf91798cc737e8df97dd2d44fffe4a6163c99f5e63d0f3f6a9ba1c3d1c9ef38e217b74e8da62dd8d5cd91f3be32da2ec062c642d192e32fd96cdf650 WHIRLPOOL c5fcc88912e5eb21aaa9908759324dd37c3670e37edca8562ba1301431fdf8cc40699152fe3ee3a48a495922f4b11846a804ee990d13d3d037726aa520cc0af0
 EBUILD nova-2013.2.3-r1.ebuild 4544 SHA256 9c53e240ac79e2c77280b82d8146d8b371e6337ca627a6c4be38013718aa5bc8 SHA512 8ddbf49a5b71dae694be8b20e498adc64d85b415470dbb1218c835bb6cb41214b693e56bc4179dd4e68788dc45edb9f17b0372265c0251215386c651d775eaa5 WHIRLPOOL 63d8d1048410b08ef2e184357ba60a5cdf5be6a3be48c86b40940328a65741aad5686f5860d33b26088922c74bf3a0513962675aabc09ad8d0f041816353e13b
 EBUILD nova-2013.2.9999.ebuild 4518 SHA256 2967d09f391e940b6b7a698e84d769aa953c33138df8189fe901aabb8b1b151c SHA512 c92ce4b2f77d119a98d4634228a600bb93c902cb34dd2895377c70957f0f451128fc1079e451235ef6439358476377a0cb863a012e1a265995b57f174e866e66 WHIRLPOOL 0da414d998486d523f84f74b461e5f31dd5123b2dfe3fe5f3337e40b6dcdc78daade0d9af29d097e6ba38f671110e5f52f4bdd0635e4449f209cddf73c27b388
 EBUILD nova-2014.1-r1.ebuild 4827 SHA256 48d093962a50bed849347c7a0aeb64db539e3f2fb579c18be274633e3aa5e37d SHA512 ac21f7ba9aa210daf05e51c8733148477cf944397a00dd25354095b0c73ec68de397b3b9db845a17218a17982510c0873e2e9f6a11dbb6142c4c06a5417874d2 WHIRLPOOL cd65115f1d9b08d3f5bd8197886bc58e82c0c5672410d351b1629163e37110a0e248f1e98bccaf907893173026e8fb273089a6b5c04ce8b484a257022e10dbb7
+EBUILD nova-2014.1-r2.ebuild 4657 SHA256 e617b75acf03d21492fe834bf89cbd88672a52270923b2ea3ceef9a9163af728 SHA512 6a7eed3e522b0fe772c6805e64c05c34e0cc1796f86d6fe719bd90bbb3b28a63855a84dee859d1e171021529e66a645726831c91b8334b862c6f194732fa2edb WHIRLPOOL 63cfe9cb2c78444bfe1b5b53fb482485cde9da969a09ee8904808a317f659051ebadafc21fc77db631d8e459cff4580fc98d2ef749537453ffc16e12e20c27cf
 EBUILD nova-2014.1.9999.ebuild 4834 SHA256 933e3316d7ee8b1ba7383e79c22a5cb0c21a2706f872afd8ef43edfdbe7ef1d6 SHA512 513c5a2b7d27899195d96c591f1395ff9b1ae1ecb98c55a148d4a096d705a14c0bdb93d5d8ee2963b30e711e9f3abc510bac20ef324fb79c7f1b27c3d1818652 WHIRLPOOL 884c4336348713698dd7da564ff3c05c3915c1bd5b057887614e6e274bf2b39f62a51218ba045b1ee836f742f4c4d0b10493a7cc2f9302271557d65dcb895a3e
-EBUILD nova-2014.1.ebuild 4719 SHA256 3ba8a4f42ea873bcc3ebdaba0461bb9b5ef0d4efae3843685eca25ac6f5b124d SHA512 a23f74c2ee55717c0d9a1b4dc5f1aaf434417c32f80a7ed08d877592e762d1f477e43eeac341db000b89ab5977b7b50491a2619abe9f0e0d739195c2dae68722 WHIRLPOOL 66e6c39cd72043c9f8e75df3326adacbb508ff857bbccd92d93039848d925d8ee0b47f77ed1f27ed56a155b88d846f09917296de1639417e6da1c71a9045150e
 EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 14451 SHA256 335ee9a01ccb1f47b81ef5467f4a83483bfb5ad05b291440849c6816d63932f7 SHA512 8c3f7cd29818612ba45e157946ac7bf5adccde8bf4dee9de8759cec510b2cd4e0489695c7342042e03acfb64ebae3c0de07fb9820ec9c3bc092673b8e573706d WHIRLPOOL da8da9198a38c73f6a2ceb8674445e68dad2dff483b06440e7bd92ac61cbc9188fc00efda21495bd838e4a52f47ac68e07e16017ab26022e3ba3bde0a7099ea0
+MISC ChangeLog 14647 SHA256 04437fc8f1a18ff21ffca962fab5d20f3394956919dbd1355393058c7cca17df SHA512 f8f20b18899f3e531a7f3568db96bfd31f53a62f077478dd605a35f9a10d33b159fe9346da5c00311620afa72f6d2639e86ad7dd582a1922f5d72ec5034c06b5 WHIRLPOOL 7c2a2a5ec12fefd58a293be1d5c6096f23a461f33c0648d1e3a850faee3f199ff475b22b5e73e74d866418e336f4760c20aa61233fbbd13ab1fcf45fa95eccce
 MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNnK1EACgkQso7CE7gHKw3VHgCgpHBryFao+R4aW/J9TQM0k/pa
-yWIAnRnCE1TUTiHmyVFQiu+MXqPVLG5M
-=2DEL
+iEYEAREIAAYFAlNvb18ACgkQiLKviuHfItWo2ACgoliA3SfiRwnhD6fTNtHwgMkX
+UmoAnA6WJE8O52/Q2krzI9ViFmWgKT3y
+=qkdj
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
index fcd2ec292be1..14fae14dd88d 100644
--- a/sys-cluster/nova/files/nova.initd
+++ b/sys-cluster/nova/files/nova.initd
@@ -2,7 +2,7 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-description="Starts ${SVCNAME}  service for OpenStack" 
+description="Starts ${SVCNAME} service for OpenStack"
 
 command=/usr/bin/${SVCNAME}
 command_background=yes
@@ -15,6 +15,6 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0664 ${NOVA_RUN:-/var/run/nova}
-	checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0664 ${NOVA_RUN:-/var/lock/nova}
+	checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova}
+	checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova}
 }
diff --git a/sys-cluster/nova/files/nova.sudoersd b/sys-cluster/nova/files/nova.sudoersd
new file mode 100644
index 000000000000..f15b3285b7d4
--- /dev/null
+++ b/sys-cluster/nova/files/nova.sudoersd
@@ -0,0 +1,3 @@
+Defaults:nova !requiretty
+
+nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap
diff --git a/sys-cluster/nova/nova-2014.1.ebuild b/sys-cluster/nova/nova-2014.1-r2.ebuild
index e4af705be717..ec757fee17d2 100644
--- a/sys-cluster/nova/nova-2014.1.ebuild
+++ b/sys-cluster/nova/nova-2014.1-r2.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/sys-cluster/nova/nova-2014.1.ebuild,v 1.1 2014/04/28 03:03:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.1-r2.ebuild,v 1.1 2014/05/11 12:38:13 vadimk Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -23,12 +23,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo"
 
-RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.9.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.9.99[postgres,${PYTHON_USEDEP}] )
+RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+		sqlite? ( dev-db/sqlite )
 		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
@@ -83,10 +82,15 @@ pkg_setup() {
 	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
+	for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
 		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
 	done
 	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
@@ -97,7 +101,7 @@ python_install() {
 
 	insinto /etc/nova
 	insopts -m 0640 -o nova -g nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
+	#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"
@@ -115,6 +119,6 @@ python_install() {
 
 	#add sudoers definitions for user nova
 	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/nova.sudoersd" nova
 }