fixed, all ebuilds use the correct initd bug 507628

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

4 files changed, 72 insertions, 81 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 50f84883f4fa..d49a2cab4791 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2014/06/16 03:35:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.68 2014/06/30 03:59:01 prometheanfire Exp $
+
+  30 Jun 2014; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
+  nova-9999.ebuild:
+  fixed, all ebuilds use the correct initd bug 507628
 
 *nova-2014.1.1 (16 Jun 2014)
 
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 7e7daea9d173..750a7be4e0e0 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -9,23 +9,23 @@ AUX nova.sudoersd 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5
 DIST nova-2014.1.1.tar.gz 7979809 SHA256 3cb3b48c72c39e7637d6016039d353ad33de69bcd6ed04dbfdb0db9313eb9a5b SHA512 6f7b449e09e796c483d93399af24c2cd77042776e1c4d36c3bcd34814b42a252151542b684785ba6c1b28bc0b302cc15f5057da7f90884c73ff6b11ec748323e WHIRLPOOL 0d959b4655d6010825b0ef73b6ce983cd6a0679f5aa5d41ebfbddce26e74d402d9d571c65d26f71e60bb627fc9d4d924d1e4622c1d96d73e3b484f1c68502df7
 EBUILD nova-2014.1.1.ebuild 4833 SHA256 c4d0fd7c0b3b449177b2a3420a75365416eb0dbf724c5c8983dfa438a0f7cbb6 SHA512 2e81153af5bb239c9f4dc9928400c859a3fe00a478490d6596c298b0494a12a9d8d3b9932be1e7cffbd3f4d550b9da2764064a5b220e7da1ed3c4ca67046394e WHIRLPOOL 85c55389ac0e0b68493cc848e99065823f774aa9624fa410555f1195532f297f1b97d43e6f534a064ddf0e6f08f7e844cd0e2c8ae9dff9476882641c32201bee
 EBUILD nova-2014.1.9999.ebuild 4834 SHA256 933e3316d7ee8b1ba7383e79c22a5cb0c21a2706f872afd8ef43edfdbe7ef1d6 SHA512 513c5a2b7d27899195d96c591f1395ff9b1ae1ecb98c55a148d4a096d705a14c0bdb93d5d8ee2963b30e711e9f3abc510bac20ef324fb79c7f1b27c3d1818652 WHIRLPOOL 884c4336348713698dd7da564ff3c05c3915c1bd5b057887614e6e274bf2b39f62a51218ba045b1ee836f742f4c4d0b10493a7cc2f9302271557d65dcb895a3e
-EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 15432 SHA256 c3d96f1b4d8c39efdf8fe41ccdd683d018bd56576fd2442063bc3aaa5f0abdb2 SHA512 b6a494bfc85f05e130f69220d940b327dbd9cf42dc54d549c1953d0ffe812e4706344a3177b28a6dc07ecbb37cb3e5ce7d35841ebe08c687dcc08155cbeeccd0 WHIRLPOOL 713f95a153ba84c20066b9cb61f29fe16c0a5c5a245a80c26b26294ad07dfe226774d11ffe750d5feb6227a9bd7e0b2d1f889449d9f79a6741f38e4295c476ff
-MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
+EBUILD nova-9999.ebuild 4805 SHA256 ed783ed1e76a108a50ec648e1d6e4dab25cba732750da2b8a15367bea0e2ad64 SHA512 0fc9ac2f5aba0129b2876966e57efc556dc30e29e16bddc4d3f7d82ec34d93de5d3688f30f59b602765fb5bf12ba6c7dc892db3b0a93c6f8f7b758faca4b753a WHIRLPOOL 4aae2b692db5265fe285100fa3809cea2fd0648cfa3814fd3629a65d7f42af62dafba6ec7c88bb0fc8860f7d68b58e926b4dc0b0a8b39f5a7cc70ef13ac8efea
+MISC ChangeLog 15578 SHA256 21c8b3dccc82195391b6fe13d3f81dbafde300a4d52cf30855e6f7ecc2954d45 SHA512 f75e84de9c2fa0167a7ab8963f69fba1ccad7f197dd8d4f59f2641fdb2b0baad8abede857b76cad7d9d9dd505cdf70636fa2d1e6caef994f79bb5cd415f4ea49 WHIRLPOOL f7d1f6c2d47c6159eeae5da858118df3f7d871ffbdae969bee1443c3c46f082a190670ef7213f161165cd89f88f32531b68ce6f134c61273065693273b8362ec
+MISC metadata.xml 818 SHA256 2db18087f26467d27436c57cc533ab1dc0e31e643ed2b212a78eaf1e9e4d702b SHA512 cd64b2b5fff76252104a60670edab8a732ea0c6ab5e72b083f988bbc18dcf38e455cadd589e89597fa049009b60a99631306ea61bb02e14f1658a52b22d4c5aa WHIRLPOOL 05cca8681c60b074f53e6874f1e8a5b17a3ebcdd06e552e4ac6a2672f91077ce71e0d343f0db27ba0722a33bc5b1e97d38ad34dbe418e2961ca067d8b863c6db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTnmYeAAoJECRx6z5ArFrDlekQAMhVgjki1r1EK+LcpJbv2ogz
-riILlmi830tfuf6yL+9lM82EMFWYOskFblTOiAajT44RnthG/xuCg6VmT+oh0Auu
-vcQSQiyzY7BITKd2YWDt9e5GVbDg0otBCgmpKHtB/qYgzFd16l78W1ewqzFM0gwk
-0iZhxx0EloZeUq+xQ/OgRtRsyrG7U9yjmllPiOQ1g97eyE5BEr24itPrv9mxHZei
-F749kbln2U0Gmzfn8eE1xcT4kqtB9XeKPvC6RA/0p3wmA2bwdGgbbkLKDTqpcIt1
-eeJKlPMBuZuwtW1rSNAytUqv/4mtP8XBRpiQttugiHKorbmnylqJdjHc6dnfqec5
-sVSZDrtufDyI8/Ax338drB91NW0MHX/p8Qo9IIlNoHUn342tKDydqvw3SENEJTEa
-I96iU07sycOsWpuViCnPgtDrXzHGj7OPoGFEuCJTNZd9XCo9AOKIi0JJXW++IX5I
-93YtKrIhv0TCD7SuXvpZRzfa/SZ88vO7bpS7/j8s+wUfH2RjqTePIYgEiuSzM8ZK
-oQd4M32mzygAXEZXDfBaDeBOnkXKwbQN4Cdlczyp0OjkIURjmkRqbU8wH53KF6Pr
-22Annc+ZE0fbmjc1p9xoyQ+jsl/g0UBMxAhdLlmofAyBD+mZOmBwh3ZdWUs8S99w
-t2QoKKsrg0uh6q4C76PL
-=D4wt
+iQIcBAEBCAAGBQJTsOCNAAoJECRx6z5ArFrDX6sP/jemjJ2AWHZf4l4xgEPX2nkL
+Yke+IwjmPIpOTbkb1QO7TfdcVUcdVjfwCW+44YvfzzztK6KsWSZsrACYVWAbQ8ZI
+BfbW7zA8K4yFJDAv4x/0OgnQdHaJa48f0B5XvidMCPUbprOLZjFGfYJrDHri4L8u
+XCGGeks/S7YL6nN79XrHxVePJSjGMZ1zObcTFQzwxrmsk8XIbKZAZ+ryU06ikxtE
+FEC+VJlLBUfZJJ305qe1M+8IPRR/KwGJztT6aaZ9mLuPSeY5/HBhgiQdzBLgQ7xN
+HBD3PLm5Mk9tldWmqMJ44k5+k2BEjM5NdIJTFCM/vGxLx6DrgKraIUUvrb9g/dM5
+JUewK/Uj751PgrDKGPdLQVVowiB7ZTLugb/uXRTbmJl3RtD96eyFJ/wXwWdjY/Eb
+pmJ2ygy7u3MtaHd+XW+rMtleY5OwU/DmTZAfdsBcGe7xNQNO8/Do1RbV6zczK7vt
+RrrFanBnByPtN8xbiI2ot4tbX9RqMbWHvoixih/OynebFtyZMM00N/BfubJ3W6xc
+cy3fVINKg6466jnS+CyG2DwoblP5z1MUSzufBgGgKUCPHD7f7c4s0REzco+kxl33
+6Li5W355PUrLdrm+SN0LPWRTlkRCQfMnZQYKctoULsU+1d8mWmk+C/7Lf03+G4Oh
+d93N258SYNIwoPnjnmyW
+=AQZg
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index e0397817f1d3..a64713858dea 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -11,18 +11,10 @@
 	(the main part of an IaaS system). It is written in Python.
   </longdescription>
   <use>
-    <flag name="api">Installs the initscripts for the nova api service</flag>
-    <flag name="cert">Installs the initscripts for the nova scheduler service</flag>
     <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-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index ed00d68ba5e6..d2d9fcd21c88 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-9999.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-9999.ebuild,v 1.13 2014/01/08 06:00:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.14 2014/06/30 03:59:01 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,60 +14,61 @@ EGIT_REPO_URI="https://github.com/openstack/nova.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
-			  || ( kvm xen )"
+			  compute? ( || ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo"
 
-RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		dev-python/boto[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
+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.7.10[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.7.10[postgres,${PYTHON_USEDEP}] )
-		>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
-		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2.0[${PYTHON_USEDEP}]
-		<dev-python/jinja-3[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}]
-		!~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.9.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${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/pbr-0.5.16[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${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.7.2[${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[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.0[${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-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${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}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		app-emulation/libvirt[${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 )
@@ -82,49 +83,43 @@ 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
-	newconfd "${FILESDIR}/nova-confd" "nova"
-	newinitd "${FILESDIR}/nova-initd" "nova"
-	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
-	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
-	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
-	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-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
 
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
+	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 0755
-	dodir /var/lib/nova/instances
-	fowners nova:nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+	dodir /var/log/nova /var/lib/nova/instances
 
-	keepdir /etc/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 "isntalling CA files failed"
+	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"
 }