sys-cluster/nova: switch to cdrtools for bug 591784

Package-Manager: portage-2.3.0

sys-cluster/nova/files/nova-compute.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+mkisofs_cmd = /usr/bin/mkisofs

sys-cluster/nova/files/nova.initd

@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Starts ${SVCNAME} service for OpenStack"
@@ -8,10 +8,15 @@ command=/usr/bin/${SVCNAME}
 command_background=yes
 pidfile=/var/run/nova/${SVCNAME}.pid
 required_files=/etc/nova/nova.conf
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}"
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} --config-file /etc/nova/nova.conf"
+if [[ "$SVCNAME" == nova-compute ]]; then
+	required_files="${required_files} /etc/nova/nova-compute.conf"
+	start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf"
+fi
+
 
 depend() {
-    need net 
+	use net
 }
 
 start_pre() {

sys-cluster/nova/nova-2016.1.9999.ebuild

@@ -120,7 +120,7 @@ RDEPEND="
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
 	compute? (
-		app-cdr/cdrkit
+		app-cdr/cdrtools
 		sys-fs/dosfstools
 		app-emulation/qemu
 	)
@@ -170,6 +170,7 @@ python_install() {
 	insinto /etc/nova
 	insopts -m 0640 -o nova -g nova
 	newins "${DISTDIR}/mitaka-nova.conf.sample" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
 	doins "${S}/etc/nova/"*
 	#rootwrap filters
 	insopts -m 0644

sys-cluster/nova/nova-2016.2.9999.ebuild

@@ -132,7 +132,7 @@ RDEPEND="
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
 	compute? (
-		app-cdr/cdrkit
+		app-cdr/cdrtools
 		sys-fs/dosfstools
 		app-emulation/qemu
 	)
@@ -182,6 +182,7 @@ python_install() {
 	insinto /etc/nova
 	insopts -m 0640 -o nova -g nova
 	newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
 	doins "${S}/etc/nova/"*
 	#rootwrap filters
 	insopts -m 0644