many changes from bug 486568, thanks alonbl

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 24 insertions, 38 deletions

diff --git a/www-apps/novnc/ChangeLog b/www-apps/novnc/ChangeLog
index 08d307d33430..5570edb7e116 100644
--- a/www-apps/novnc/ChangeLog
+++ b/www-apps/novnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/novnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/ChangeLog,v 1.3 2013/10/24 13:01:45 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/ChangeLog,v 1.4 2013/10/29 06:55:05 prometheanfire Exp $
+
+  29 Oct 2013; Matthew Thode <prometheanfire@gentoo.org> files/noVNC.initd,
+  novnc-0.4.ebuild:
+  many changes from bug 486568, thanks alonbl
 
   24 Oct 2013; Alon Bar-Lev <alonbl@gentoo.org> novnc-0.4.ebuild:
   Remove unneeded installation and dependency if not USE nova, partial work of
diff --git a/www-apps/novnc/files/noVNC.initd b/www-apps/novnc/files/noVNC.initd
index fd8c12b1530c..1c35235bd42a 100644
--- a/www-apps/novnc/files/noVNC.initd
+++ b/www-apps/novnc/files/noVNC.initd
@@ -1,10 +1,17 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/files/noVNC.initd,v 1.1 2013/09/27 01:39:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/files/noVNC.initd,v 1.2 2013/10/29 06:55:05 prometheanfire Exp $
 #
 # Author: Cor Cornelisse <corcornelisse@gmail.com>
 
+pidfile="/var/run/${SVCNAME}.pid"
+command="/usr/bin/nova-novncproxy"
+command_args="--flagfile=${FLAG_FILE} --cert=${CERT_FILE} --web ${WEB_ROOT}"
+command_background="yes"
+start_stop_daemon_args="--stdout ${LOG_PATH}/${SVCNAME}.log --stderr ${LOG_PATH}/${SVCNAME}.err"
+
+
 depend() {
 	need net
 }
@@ -18,32 +25,6 @@ checkconfig() {
 }
 
 
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/${SVCNAME}
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --make-pidfile --pidfile \
-					  "/var/run/${SVCNAME}.pid" --background \
-					  --stdout ${LOG_PATH}/${SVCNAME}.log \
-					  --stderr ${LOG_PATH}/${SVCNAME}.err --exec \
-					  /opt/noVNC/utils/nova-novncproxy -- \
-					  --flagfile=${FLAG_FILE} --cert=${CERT_FILE} \
-					  --web ${WEB_ROOT}
-					  
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
+start_pre() {
 	checkconfig || return $?
-	. /etc/conf.d/${SVCNAME}
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "/var/run/${SVCNAME}.pid" \
-					  --exec /opt/noVNC/utils/nova-novncproxy 
-	eend $? "Failed to stop ${SVCNAME}"
 }
-
diff --git a/www-apps/novnc/novnc-0.4.ebuild b/www-apps/novnc/novnc-0.4.ebuild
index 723a4d4332a9..e42e0f990862 100644
--- a/www-apps/novnc/novnc-0.4.ebuild
+++ b/www-apps/novnc/novnc-0.4.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/www-apps/novnc/novnc-0.4.ebuild,v 1.4 2013/10/24 13:01:45 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/novnc-0.4.ebuild,v 1.5 2013/10/29 06:55:05 prometheanfire Exp $
 
 EAPI=5
 
@@ -16,12 +16,10 @@ IUSE="nova"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	nova? (
-		dev-python/websockify
-		sys-cluster/nova
-		dev-python/matplotlib
-		dev-python/numpy
-	)"
+		nova? ( dev-python/websockify
+				sys-cluster/nova
+				dev-python/matplotlib
+				dev-python/numpy )"
 
 src_install() {
 	dodir /usr/share/novnc
@@ -29,9 +27,12 @@ src_install() {
 	doins -r *.html images include
 	dodoc README.md
 
+
 	if use nova; then
-		newconfd "${FILESDIR}/noVNC.confd" noVNC
-		newinitd "${FILESDIR}/noVNC.initd" noVNC
+		dobin utils/nova-novncproxy
+
+		newconfd "${FILESDIR}/noVNC.confd" nova-noVNC
+		newinitd "${FILESDIR}/noVNC.initd" nova-noVNC
 
 		diropts -m 0750
 		dodir /var/log/noVNC