Use newconfd/newinitd, add dsmcad init, fix dsmc init

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 51 insertions, 22 deletions

diff --git a/app-backup/tsm/ChangeLog b/app-backup/tsm/ChangeLog
index d1c6c30cb9c3..b38ee4c6d149 100644
--- a/app-backup/tsm/ChangeLog
+++ b/app-backup/tsm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-backup/tsm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/ChangeLog,v 1.1 2010/01/26 19:40:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/ChangeLog,v 1.2 2010/01/27 16:47:05 dertobi123 Exp $
+
+  27 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org> tsm-5.5.2.7.ebuild,
+  files/dsmc.init.d, +files/dsmcad.init.d:
+  Use newconfd/newinitd, add dsmcad init, fix dsmc init
 
 *tsm-5.5.2.7 (26 Jan 2010)
 
diff --git a/app-backup/tsm/files/dsmc.init.d b/app-backup/tsm/files/dsmc.init.d
index 856006c2f3bd..6f4397594738 100644
--- a/app-backup/tsm/files/dsmc.init.d
+++ b/app-backup/tsm/files/dsmc.init.d
@@ -1,29 +1,28 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/files/dsmc.init.d,v 1.1 2010/01/26 19:40:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/files/dsmc.init.d,v 1.2 2010/01/27 16:47:11 dertobi123 Exp $
 
 depend() {
-	use net
-	after dns
+        use net
+        after dns
 }
 
 start() {
-	ebegin "Starting dsmc"
-	source /etc/profile
-	cd /var/log/tivoli
-	start-stop-daemon --start --background --nicelevel 15 \
-		--make-pidfile --pidfile /var/run/dsmc.pid \
-		--exec /opt/tivoli/tsm/client/ba/bin/dsmc sched ${DSMC_OPTS}
-	eend $?
+        ebegin "Starting dsmc"
+        start-stop-daemon --start --background --nicelevel 15 \
+                --make-pidfile --pidfile /var/run/dsmc.pid \
+                --exec /opt/tivoli/tsm/client/ba/bin/dsmc sched ${DSMC_OPTS}
+        eend $?
 }
 
 stop() {
-	ebegin "Stopping dsmc"
-	# For whatever reason SIGTERM doesn't affect the dsmc process, but
-	# SIGHUP makes it exit cleanly
-	start-stop-daemon --stop \
-		--signal 1 \
-		--pidfile /var/run/dsmc.pid
-	eend $?
+        ebegin "Stopping dsmc"
+        # For whatever reason SIGTERM doesn't affect the dsmc process, but
+        # SIGHUP makes it exit cleanly
+        start-stop-daemon --stop \
+                --signal 1 \
+                --pidfile /var/run/dsmc.pid
+        eend $?
 }
+
diff --git a/app-backup/tsm/files/dsmcad.init.d b/app-backup/tsm/files/dsmcad.init.d
new file mode 100644
index 000000000000..7c782e24062c
--- /dev/null
+++ b/app-backup/tsm/files/dsmcad.init.d
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/files/dsmcad.init.d,v 1.1 2010/01/27 16:47:11 dertobi123 Exp $
+
+depend() {
+        use net
+        after dns dsmc
+}
+
+start() {
+        ebegin "Starting dsmcad"
+        start-stop-daemon --start --background --nicelevel 15 \
+                --make-pidfile --pidfile /var/run/dsmcad.pid \
+                --exec /opt/tivoli/tsm/client/ba/bin/dsmcad
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping dsmcad"
+        start-stop-daemon --stop \
+                --signal 1 \
+                --pidfile /var/run/dsmcad.pid
+        eend $?
+}
diff --git a/app-backup/tsm/tsm-5.5.2.7.ebuild b/app-backup/tsm/tsm-5.5.2.7.ebuild
index 0bd1d65db0a3..e49104754ac7 100644
--- a/app-backup/tsm/tsm-5.5.2.7.ebuild
+++ b/app-backup/tsm/tsm-5.5.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-5.5.2.7.ebuild,v 1.1 2010/01/26 19:40:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-5.5.2.7.ebuild,v 1.2 2010/01/27 16:47:05 dertobi123 Exp $
 
 inherit versionator multilib eutils
 
@@ -100,8 +100,9 @@ src_install() {
 	echo 'PATH="/opt/tivoli/tsm/client/admin/bin:/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'ROOTPATH="/opt/tivoli/tsm/client/admin/bin:/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 
-	insinto /etc/conf.d && newins "${FILESDIR}/dsmc.conf.d" dsmc
-	exeinto /etc/init.d && newexe "${FILESDIR}/dsmc.init.d" dsmc
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d" dsmcad
 
 	elog
 	elog "Note that you have to be either root or member of the group tsm to be able to use the"